Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit a724e79ed761ea535a6c7457c90da5ff4b1cea69)