Recent changes from 0.9.6-stable.

diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index 47981457ec36911e28457dcb6ac138145361e8ad..7c5ba1b7ba7ff9329840649d910473c2c83b1571 100644 (file)
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -156,11 +156,6 @@ struct rsa_st
 #define RSA_FLAG_CACHE_PUBLIC          0x02
 #define RSA_FLAG_CACHE_PRIVATE         0x04
 #define RSA_FLAG_BLINDING              0x08
-#define RSA_FLAG_NO_BLINDING           0x80 /* new with 0.9.6j and 0.9.7b; the built-in
-                                              * RSA implementation now uses blinding by
-                                              * default (ignoring RSA_FLAG_BLINDING),
-                                              * but other engines might not need it
-                                              */
 #define RSA_FLAG_THREAD_SAFE           0x10
 /* This flag means the private key operations will be handled by rsa_mod_exp
  * and that they do not depend on the private key components being present:
@@ -173,7 +168,11 @@ struct rsa_st
  */
 #define RSA_FLAG_SIGN_VER              0x40
 
-#define RSA_FLAG_NO_BLINDING           0x80
+#define RSA_FLAG_NO_BLINDING           0x80 /* new with 0.9.6j and 0.9.7b; the built-in
+                                              * RSA implementation now uses blinding by
+                                              * default (ignoring RSA_FLAG_BLINDING),
+                                              * but other engines might not need it
+                                              */
 
 #define RSA_PKCS1_PADDING      1
 #define RSA_SSLV23_PADDING     2

diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c
index 0ba50b8e87383ca5bcd6345cd9667a96a65228ad..4480b2516e49126b05399e092906624138b2ed7c 100644 (file)
--- a/crypto/rsa/rsa_eay.c
+++ b/crypto/rsa/rsa_eay.c
@@ -491,6 +491,8 @@ err:
        if (ctx != NULL) BN_CTX_free(ctx);
        BN_clear_free(&f);
        BN_clear_free(&ret);
+       if (local_blinding)
+               BN_BLINDING_free(blinding);
        if (buf != NULL)
                {
                OPENSSL_cleanse(buf,num);

diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index e1419145a774378a4ff5162e207b8063e52de037..ea48087aedce78ad814ecb0669f495f2f96668ee 100644 (file)
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -313,7 +313,7 @@ void RSA_blinding_off(RSA *rsa)
 
 int RSA_blinding_on(RSA *rsa, BN_CTX *p_ctx)
        {
-       BIGNUM *A,*Ai;
+       BIGNUM *A,*Ai = NULL;
        BN_CTX *ctx;
        int ret=0;
 
@@ -324,8 +324,12 @@ int RSA_blinding_on(RSA *rsa, BN_CTX *p_ctx)
        else
                ctx=p_ctx;
 
+       /* XXXXX: Shouldn't this be RSA_blinding_off(rsa)? */
        if (rsa->blinding != NULL)
+               {
                BN_BLINDING_free(rsa->blinding);
+               rsa->blinding = NULL;
+               }
 
        /* NB: similar code appears in setup_blinding (rsa_eay.c);
         * this should be placed in a new function of its own, but for reasons
@@ -354,9 +358,9 @@ int RSA_blinding_on(RSA *rsa, BN_CTX *p_ctx)
        rsa->blinding->thread_id = CRYPTO_thread_id();
        rsa->flags |= RSA_FLAG_BLINDING;
        rsa->flags &= ~RSA_FLAG_NO_BLINDING;
-       BN_free(Ai);
        ret=1;
 err:
+       if (Ai != NULL) BN_free(Ai);
        BN_CTX_end(ctx);
        if (ctx != p_ctx) BN_CTX_free(ctx);
        return(ret);