Obtain lock CRYPTO_LOCK_RSA before creating BN_MONT_CTX

[openssl.git] / crypto / rsa / rsa_eay.c

diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c
index 8b8a1e279a7e359f8fa263d6cf937046553b4a18..e675d0a7b80fcb46ff4dac6baa5edf3ff3844431 100644 (file)
--- a/crypto/rsa/rsa_eay.c
+++ b/crypto/rsa/rsa_eay.c
@@ -65,15 +65,15 @@
 
 #ifndef RSA_NULL
 
-static int RSA_eay_public_encrypt(int flen, unsigned char *from,
+static int RSA_eay_public_encrypt(int flen, const unsigned char *from,
                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_private_encrypt(int flen, unsigned char *from,
+static int RSA_eay_private_encrypt(int flen, const unsigned char *from,
                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_public_decrypt(int flen, unsigned char *from,
+static int RSA_eay_public_decrypt(int flen, const unsigned char *from,
                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_private_decrypt(int flen, unsigned char *from,
+static int RSA_eay_private_decrypt(int flen, const unsigned char *from,
                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_mod_exp(BIGNUM *r0, BIGNUM *i, RSA *rsa);
+static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *i, RSA *rsa);
 static int RSA_eay_init(RSA *rsa);
 static int RSA_eay_finish(RSA *rsa);
 static RSA_METHOD rsa_pkcs1_eay_meth={
@@ -90,12 +90,12 @@ static RSA_METHOD rsa_pkcs1_eay_meth={
        NULL,
        };
 
-RSA_METHOD *RSA_PKCS1_SSLeay(void)
+const RSA_METHOD *RSA_PKCS1_SSLeay(void)
        {
        return(&rsa_pkcs1_eay_meth);
        }
 
-static int RSA_eay_public_encrypt(int flen, unsigned char *from,
+static int RSA_eay_public_encrypt(int flen, const unsigned char *from,
             unsigned char *to, RSA *rsa, int padding)
        {
        const RSA_METHOD *meth;
@@ -141,9 +141,24 @@ static int RSA_eay_public_encrypt(int flen, unsigned char *from,
        
        if ((rsa->_method_mod_n == NULL) && (rsa->flags & RSA_FLAG_CACHE_PUBLIC))
                {
-               if ((rsa->_method_mod_n=BN_MONT_CTX_new()) != NULL)
-                       if (!BN_MONT_CTX_set(rsa->_method_mod_n,rsa->n,ctx))
-                           goto err;
+               CRYPTO_w_lock(CRYPTO_LOCK_RSA);
+               if (rsa->_method_mod_n == NULL)
+                       {
+                       BN_MONT_CTX* bn_mont_ctx;
+                       if ((bn_mont_ctx=BN_MONT_CTX_new()) == NULL)
+                               {
+                               CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
+                               goto err;
+                               }
+                       if (!BN_MONT_CTX_set(bn_mont_ctx,rsa->n,ctx))
+                               {
+                               BN_MONT_CTX_free(bn_mont_ctx);
+                               CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
+                               goto err;
+                               }
+                       rsa->_method_mod_n = bn_mont_ctx;
+                       }
+               CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
                }
 
        if (!meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
@@ -169,7 +184,7 @@ err:
        return(r);
        }
 
-static int RSA_eay_private_encrypt(int flen, unsigned char *from,
+static int RSA_eay_private_encrypt(int flen, const unsigned char *from,
             unsigned char *to, RSA *rsa, int padding)
        {
        const RSA_METHOD *meth;
@@ -247,7 +262,7 @@ err:
        return(r);
        }
 
-static int RSA_eay_private_decrypt(int flen, unsigned char *from,
+static int RSA_eay_private_decrypt(int flen, const unsigned char *from,
             unsigned char *to, RSA *rsa, int padding)
        {
        const RSA_METHOD *meth;
@@ -342,7 +357,7 @@ err:
        return(r);
        }
 
-static int RSA_eay_public_decrypt(int flen, unsigned char *from,
+static int RSA_eay_public_decrypt(int flen, const unsigned char *from,
             unsigned char *to, RSA *rsa, int padding)
        {
        const RSA_METHOD *meth;
@@ -378,9 +393,24 @@ static int RSA_eay_public_decrypt(int flen, unsigned char *from,
        /* do the decrypt */
        if ((rsa->_method_mod_n == NULL) && (rsa->flags & RSA_FLAG_CACHE_PUBLIC))
                {
-               if ((rsa->_method_mod_n=BN_MONT_CTX_new()) != NULL)
-                       if (!BN_MONT_CTX_set(rsa->_method_mod_n,rsa->n,ctx))
-                           goto err;
+               CRYPTO_w_lock(CRYPTO_LOCK_RSA);
+               if (rsa->_method_mod_n == NULL)
+                       {
+                       BN_MONT_CTX* bn_mont_ctx;
+                       if ((bn_mont_ctx=BN_MONT_CTX_new()) == NULL)
+                               {
+                               CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
+                               goto err;
+                               }
+                       if (!BN_MONT_CTX_set(bn_mont_ctx,rsa->n,ctx))
+                               {
+                               BN_MONT_CTX_free(bn_mont_ctx);
+                               CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
+                               goto err;
+                               }
+                       rsa->_method_mod_n = bn_mont_ctx;
+                       }
+               CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
                }
 
        if (!meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
@@ -416,7 +446,7 @@ err:
        return(r);
        }
 
-static int RSA_eay_mod_exp(BIGNUM *r0, BIGNUM *I, RSA *rsa)
+static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
        {
        const RSA_METHOD *meth;
        BIGNUM r1,m1;
@@ -432,17 +462,45 @@ static int RSA_eay_mod_exp(BIGNUM *r0, BIGNUM *I, RSA *rsa)
                {
                if (rsa->_method_mod_p == NULL)
                        {
-                       if ((rsa->_method_mod_p=BN_MONT_CTX_new()) != NULL)
-                               if (!BN_MONT_CTX_set(rsa->_method_mod_p,rsa->p,
-                                                    ctx))
+                       CRYPTO_w_lock(CRYPTO_LOCK_RSA);
+                       if (rsa->_method_mod_p == NULL)
+                               {
+                               BN_MONT_CTX* bn_mont_ctx;
+                               if ((bn_mont_ctx=BN_MONT_CTX_new()) == NULL)
+                                       {
+                                       CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
+                                       goto err;
+                                       }
+                               if (!BN_MONT_CTX_set(bn_mont_ctx,rsa->p,ctx))
+                                       {
+                                       BN_MONT_CTX_free(bn_mont_ctx);
+                                       CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
                                        goto err;
+                                       }
+                               rsa->_method_mod_p = bn_mont_ctx;
+                               }
+                               CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
                        }
                if (rsa->_method_mod_q == NULL)
                        {
-                       if ((rsa->_method_mod_q=BN_MONT_CTX_new()) != NULL)
-                               if (!BN_MONT_CTX_set(rsa->_method_mod_q,rsa->q,
-                                                    ctx))
+                       CRYPTO_w_lock(CRYPTO_LOCK_RSA);
+                       if (rsa->_method_mod_q == NULL)
+                               {
+                               BN_MONT_CTX* bn_mont_ctx;
+                               if ((bn_mont_ctx=BN_MONT_CTX_new()) == NULL)
+                                       {
+                                       CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
+                                       goto err;
+                                       }
+                               if (!BN_MONT_CTX_set(bn_mont_ctx,rsa->q,ctx))
+                                       {
+                                       BN_MONT_CTX_free(bn_mont_ctx);
+                                       CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
                                        goto err;
+                                       }
+                               rsa->_method_mod_q = bn_mont_ctx;
+                               }
+                       CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
                        }
                }