Reviewed-by: Stephen Henson <steve@openssl.org> (cherry picked from commit 7cfab40f43afac2f46652886e260d1c4de058806)