Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 376e2ca3e3525290619602dc6013c97c9653c037)
(cherry picked from commit c3eb33763bf2999843fe4124f3f39dea6edc26e6)