Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 717cc8589540b95122a652dee68e6a75b6262d93)