Reviewed-by: Tim Hudson <tjh@openssl.org> GH: #7033
Reviewed-by: Richard Levitte <levitte@openssl.org> GH: #4653
Reviewed-by: Richard Levitte <levitte@openssl.org>