Reviewed-by: Steve Marquess <marquess@openssl.com> (cherry picked from commit ab29c82a55f3583a490733dd521ea6c486e8e2fb)
(cherry picked from commit 351f0a124bffaa94d2a8abdec2e7dde5ae9c457d)