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