Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 2fc52c912a79eefe8610984bac5eed3a2589ee85)
Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 77672802a665b26a44524a7a8091e56ee84bdf39)