Reviewed-by: Rich Salz <rsalz@openssl.org> GH: #3829
Reviewed-by: Richard Levitte <levitte@openssl.org> GH: #2090