update to official patch from openssl.org; ok deraadt@, millert@

1 files changed, 7 insertions, 5 deletions

diff --git a/src/lib/libcrypto/rsa/rsa_lib.c b/src/lib/libcrypto/rsa/rsa_lib.c
index f71870a338..37fff8bce3 100644
--- a/src/lib/libcrypto/rsa/rsa_lib.c
+++ b/src/lib/libcrypto/rsa/rsa_lib.c
@@ -70,7 +70,13 @@ static const RSA_METHOD *default_RSA_meth=NULL;
 
 RSA *RSA_new(void)
         {
-        return(RSA_new_method(NULL));
+        RSA *r=RSA_new_method(NULL);
+
+#ifndef OPENSSL_NO_FORCE_RSA_BLINDING
+        r->flags|=RSA_FLAG_BLINDING;
+#endif
+
+        return r;
         }
 
 void RSA_set_default_method(const RSA_METHOD *meth)
@@ -181,10 +187,6 @@ RSA *RSA_new_method(ENGINE *engine)
                 OPENSSL_free(ret);
                 ret=NULL;
                 }
-
-        /* Enforce blinding. */
-        ret->flags |= RSA_FLAG_BLINDING;
-
         return(ret);
         }