Reviewed-by: Rich Salz <rsalz@openssl.org> GH: #1276
Reviewed-by: Rich Salz <rsalz@openssl.org> GH: #1229