Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 740b2b9a6cf31b02916a4d18f868e8a95934c083)