Reviewed-by: Rich Salz <rsalz@openssl.org> MR: #2986
Reviewed-by: Rich Salz <rsalz@openssl.org> MR: #2949
Reviewed-by: Richard Levitte <levitte@openssl.org>