OpenSSL: Reduce diff with the upstream
(cherry picked from commit 649ccdd753790069623e192185d133fd26a03bf9)