Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 2d540402aac7a05af9c99b58864d53c0201a0b42)
Reviewed-by: Tim Hudson <tjh@openssl.org>