projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 c882738bf2f2803556b181f0f5f0edf8e12bdf04..e675d0a7b80fcb46ff4dac6baa5edf3ff3844431 100644 (file)
--- a/crypto/rsa/rsa_eay.c
+++ b/crypto/rsa/rsa_eay.c
@@ -58,32 +58,24 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bn.h"
-#include "rsa.h"
-#include "rand.h"
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/rand.h>
+#include <openssl/engine.h>
 
-#ifndef NOPROTO
-static int RSA_eay_public_encrypt(int flen, unsigned char *from,
+#ifndef RSA_NULL
+
+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);
-#else
-static int RSA_eay_public_encrypt();
-static int RSA_eay_private_encrypt();
-static int RSA_eay_public_decrypt();
-static int RSA_eay_private_decrypt();
-static int RSA_eay_mod_exp();
-static int RSA_eay_init();
-static int RSA_eay_finish();
-#endif
-
 static RSA_METHOD rsa_pkcs1_eay_meth={
        "Eric Young's PKCS#1 RSA",
        RSA_eay_public_encrypt,
@@ -98,24 +90,26 @@ 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;
        BIGNUM f,ret;
        int i,j,k,num=0,r= -1;
        unsigned char *buf=NULL;
        BN_CTX *ctx=NULL;
 
+       meth = ENGINE_get_RSA(rsa->engine);
        BN_init(&f);
        BN_init(&ret);
        if ((ctx=BN_CTX_new()) == NULL) goto err;
        num=BN_num_bytes(rsa->n);
-       if ((buf=(unsigned char *)Malloc(num)) == NULL)
+       if ((buf=(unsigned char *)OPENSSL_malloc(num)) == NULL)
                {
                RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT,ERR_R_MALLOC_FAILURE);
                goto err;
@@ -126,9 +120,11 @@ static int RSA_eay_public_encrypt(int flen, unsigned char *from,
        case RSA_PKCS1_PADDING:
                i=RSA_padding_add_PKCS1_type_2(buf,num,from,flen);
                break;
+#ifndef NO_SHA
        case RSA_PKCS1_OAEP_PADDING:
                i=RSA_padding_add_PKCS1_OAEP(buf,num,from,flen,NULL,0);
                break;
+#endif
        case RSA_SSLV23_PADDING:
                i=RSA_padding_add_SSLv23(buf,num,from,flen);
                break;
@@ -145,12 +141,27 @@ 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 (!rsa->meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
+       if (!meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
                rsa->_method_mod_n)) goto err;
 
        /* put in leading 0 bytes if the number is less than the
@@ -168,25 +179,27 @@ err:
        if (buf != NULL) 
                {
                memset(buf,0,num);
-               Free(buf);
+               OPENSSL_free(buf);
                }
        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;
        BIGNUM f,ret;
        int i,j,k,num=0,r= -1;
        unsigned char *buf=NULL;
        BN_CTX *ctx=NULL;
 
+       meth = ENGINE_get_RSA(rsa->engine);
        BN_init(&f);
        BN_init(&ret);
 
        if ((ctx=BN_CTX_new()) == NULL) goto err;
        num=BN_num_bytes(rsa->n);
-       if ((buf=(unsigned char *)Malloc(num)) == NULL)
+       if ((buf=(unsigned char *)OPENSSL_malloc(num)) == NULL)
                {
                RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT,ERR_R_MALLOC_FAILURE);
                goto err;
@@ -214,15 +227,16 @@ static int RSA_eay_private_encrypt(int flen, unsigned char *from,
        if (rsa->flags & RSA_FLAG_BLINDING)
                if (!BN_BLINDING_convert(&f,rsa->blinding,ctx)) goto err;
 
-       if (    (rsa->p != NULL) &&
+       if ( (rsa->flags & RSA_FLAG_EXT_PKEY) ||
+               ((rsa->p != NULL) &&
                (rsa->q != NULL) &&
                (rsa->dmp1 != NULL) &&
                (rsa->dmq1 != NULL) &&
-               (rsa->iqmp != NULL))
-               { if (!rsa->meth->rsa_mod_exp(&ret,&f,rsa)) goto err; }
+               (rsa->iqmp != NULL)) )
+               { if (!meth->rsa_mod_exp(&ret,&f,rsa)) goto err; }
        else
                {
-               if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->d,rsa->n,ctx,NULL)) goto err;
+               if (!meth->bn_mod_exp(&ret,&f,rsa->d,rsa->n,ctx,NULL)) goto err;
                }
 
        if (rsa->flags & RSA_FLAG_BLINDING)
@@ -243,20 +257,22 @@ err:
        if (buf != NULL)
                {
                memset(buf,0,num);
-               Free(buf);
+               OPENSSL_free(buf);
                }
        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;
        BIGNUM f,ret;
        int j,num=0,r= -1;
        unsigned char *p;
        unsigned char *buf=NULL;
        BN_CTX *ctx=NULL;
 
+       meth = ENGINE_get_RSA(rsa->engine);
        BN_init(&f);
        BN_init(&ret);
        ctx=BN_CTX_new();
@@ -264,13 +280,13 @@ static int RSA_eay_private_decrypt(int flen, unsigned char *from,
 
        num=BN_num_bytes(rsa->n);
 
-       if ((buf=(unsigned char *)Malloc(num)) == NULL)
+       if ((buf=(unsigned char *)OPENSSL_malloc(num)) == NULL)
                {
                RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT,ERR_R_MALLOC_FAILURE);
                goto err;
                }
 
-       /* This check was for equallity but PGP does evil things
+       /* This check was for equality but PGP does evil things
         * and chops off the top '0' bytes */
        if (flen > num)
                {
@@ -287,15 +303,16 @@ static int RSA_eay_private_decrypt(int flen, unsigned char *from,
                if (!BN_BLINDING_convert(&f,rsa->blinding,ctx)) goto err;
 
        /* do the decrypt */
-       if (    (rsa->p != NULL) &&
+       if ( (rsa->flags & RSA_FLAG_EXT_PKEY) ||
+               ((rsa->p != NULL) &&
                (rsa->q != NULL) &&
                (rsa->dmp1 != NULL) &&
                (rsa->dmq1 != NULL) &&
-               (rsa->iqmp != NULL))
-               { if (!rsa->meth->rsa_mod_exp(&ret,&f,rsa)) goto err; }
+               (rsa->iqmp != NULL)) )
+               { if (!meth->rsa_mod_exp(&ret,&f,rsa)) goto err; }
        else
                {
-               if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->d,rsa->n,ctx,NULL))
+               if (!meth->bn_mod_exp(&ret,&f,rsa->d,rsa->n,ctx,NULL))
                        goto err;
                }
 
@@ -310,9 +327,11 @@ static int RSA_eay_private_decrypt(int flen, unsigned char *from,
        case RSA_PKCS1_PADDING:
                r=RSA_padding_check_PKCS1_type_2(to,num,buf,j,num);
                break;
+#ifndef NO_SHA
         case RSA_PKCS1_OAEP_PADDING:
                r=RSA_padding_check_PKCS1_OAEP(to,num,buf,j,num,NULL,0);
                 break;
+#endif
        case RSA_SSLV23_PADDING:
                r=RSA_padding_check_SSLv23(to,num,buf,j,num);
                break;
@@ -333,34 +352,36 @@ err:
        if (buf != NULL)
                {
                memset(buf,0,num);
-               Free(buf);
+               OPENSSL_free(buf);
                }
        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;
        BIGNUM f,ret;
        int i,num=0,r= -1;
        unsigned char *p;
        unsigned char *buf=NULL;
        BN_CTX *ctx=NULL;
 
+       meth = ENGINE_get_RSA(rsa->engine);
        BN_init(&f);
        BN_init(&ret);
        ctx=BN_CTX_new();
        if (ctx == NULL) goto err;
 
        num=BN_num_bytes(rsa->n);
-       buf=(unsigned char *)Malloc(num);
+       buf=(unsigned char *)OPENSSL_malloc(num);
        if (buf == NULL)
                {
                RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT,ERR_R_MALLOC_FAILURE);
                goto err;
                }
 
-       /* This check was for equallity but PGP does evil things
+       /* This check was for equality but PGP does evil things
         * and chops off the top '0' bytes */
        if (flen > num)
                {
@@ -372,12 +393,27 @@ 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 (!rsa->meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
+       if (!meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
                rsa->_method_mod_n)) goto err;
 
        p=buf;
@@ -405,17 +441,19 @@ err:
        if (buf != NULL)
                {
                memset(buf,0,num);
-               Free(buf);
+               OPENSSL_free(buf);
                }
        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;
        int ret=0;
        BN_CTX *ctx;
 
+       meth = ENGINE_get_RSA(rsa->engine);
        if ((ctx=BN_CTX_new()) == NULL) goto err;
        BN_init(&m1);
        BN_init(&r1);
@@ -424,26 +462,54 @@ 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);
                        }
                }
 
        if (!BN_mod(&r1,I,rsa->q,ctx)) goto err;
-       if (!rsa->meth->bn_mod_exp(&m1,&r1,rsa->dmq1,rsa->q,ctx,
+       if (!meth->bn_mod_exp(&m1,&r1,rsa->dmq1,rsa->q,ctx,
                rsa->_method_mod_q)) goto err;
 
        if (!BN_mod(&r1,I,rsa->p,ctx)) goto err;
-       if (!rsa->meth->bn_mod_exp(r0,&r1,rsa->dmp1,rsa->p,ctx,
+       if (!meth->bn_mod_exp(r0,&r1,rsa->dmp1,rsa->p,ctx,
                rsa->_method_mod_p)) goto err;
 
        if (!BN_sub(r0,r0,&m1)) goto err;
@@ -491,4 +557,4 @@ static int RSA_eay_finish(RSA *rsa)
        return(1);
        }
 
-
+#endif
Unnamed repository; edit this file 'description' to name the repository.