Reviewed-by: Rich Salz <rsalz@openssl.org> GH: #3829
Reviewed-by: Rich Salz <rsalz@openssl.org> GH: #2182
Reviewed-by: Rich Salz <rsalz@openssl.org> MR: #2986