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