Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 7b68c30da01b4eedcd546f81844156646387cacb)