Reviewed-by: Tim Hudson <tjh@openssl.org>
RT: 3149 Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 4d3fa06fce)
4d3fa06fce