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