Reviewed-by: Rich Salz <rsalz@openssl.org> GH: #1174
Reviewed-by: Ben Laurie <ben@links.org> MR: #2740