projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
check CRT
[openssl.git] / crypto / rsa / rsa_eay.c
diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c
index e675d0a7b80fcb46ff4dac6baa5edf3ff3844431..ba530b8f00a63825244d9731365ca97b377c6345 100644 (file)
--- a/crypto/rsa/rsa_eay.c
+++ b/crypto/rsa/rsa_eay.c
@@ -83,7 +83,7 @@ static RSA_METHOD rsa_pkcs1_eay_meth={
        RSA_eay_private_encrypt,
        RSA_eay_private_decrypt,
        RSA_eay_mod_exp,
-       BN_mod_exp_mont,
+       BN_mod_exp_mont, /* XXX probably we should not use Montgomery if  e == 3 */
        RSA_eay_init,
        RSA_eay_finish,
        0,
@@ -120,7 +120,7 @@ static int RSA_eay_public_encrypt(int flen, const unsigned char *from,
        case RSA_PKCS1_PADDING:
                i=RSA_padding_add_PKCS1_type_2(buf,num,from,flen);
                break;
-#ifndef NO_SHA
+#ifndef OPENSSL_NO_SHA
        case RSA_PKCS1_OAEP_PADDING:
                i=RSA_padding_add_PKCS1_OAEP(buf,num,from,flen,NULL,0);
                break;
@@ -141,26 +141,28 @@ static int RSA_eay_public_encrypt(int flen, const unsigned char *from,
        
        if ((rsa->_method_mod_n == NULL) && (rsa->flags & RSA_FLAG_CACHE_PUBLIC))
                {
-               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)
+                       goto err;
+               if (!BN_MONT_CTX_set(bn_mont_ctx,rsa->n,ctx))
                        {
-                       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);
+                       goto err;
+                       }
+               if (rsa->_method_mod_n == NULL) /* other thread may have finished first */
+                       {
+                       CRYPTO_w_lock(CRYPTO_LOCK_RSA);
+                       if (rsa->_method_mod_n == NULL)
                                {
-                               BN_MONT_CTX_free(bn_mont_ctx);
-                               CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
-                               goto err;
+                               rsa->_method_mod_n = bn_mont_ctx;
+                               bn_mont_ctx = NULL;
                                }
-                       rsa->_method_mod_n = bn_mont_ctx;
+                       CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
                        }
-               CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
+               if (bn_mont_ctx)
+                       BN_MONT_CTX_free(bn_mont_ctx);
                }
-
+               
        if (!meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
                rsa->_method_mod_n)) goto err;
 
@@ -327,7 +329,7 @@ static int RSA_eay_private_decrypt(int flen, const unsigned char *from,
        case RSA_PKCS1_PADDING:
                r=RSA_padding_check_PKCS1_type_2(to,num,buf,j,num);
                break;
-#ifndef NO_SHA
+#ifndef OPENSSL_NO_SHA
         case RSA_PKCS1_OAEP_PADDING:
                r=RSA_padding_check_PKCS1_OAEP(to,num,buf,j,num,NULL,0);
                 break;
@@ -393,26 +395,28 @@ static int RSA_eay_public_decrypt(int flen, const unsigned char *from,
        /* do the decrypt */
        if ((rsa->_method_mod_n == NULL) && (rsa->flags & RSA_FLAG_CACHE_PUBLIC))
                {
-               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)
+                       goto err;
+               if (!BN_MONT_CTX_set(bn_mont_ctx,rsa->n,ctx))
                        {
-                       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);
+                       goto err;
+                       }
+               if (rsa->_method_mod_n == NULL) /* other thread may have finished first */
+                       {
+                       CRYPTO_w_lock(CRYPTO_LOCK_RSA);
+                       if (rsa->_method_mod_n == NULL)
                                {
-                               BN_MONT_CTX_free(bn_mont_ctx);
-                               CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
-                               goto err;
+                               rsa->_method_mod_n = bn_mont_ctx;
+                               bn_mont_ctx = NULL;
                                }
-                       rsa->_method_mod_n = bn_mont_ctx;
+                       CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
                        }
-               CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
+               if (bn_mont_ctx)
+                       BN_MONT_CTX_free(bn_mont_ctx);
                }
-
+               
        if (!meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
                rsa->_method_mod_n)) goto err;
 
@@ -449,7 +453,7 @@ err:
 static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
        {
        const RSA_METHOD *meth;
-       BIGNUM r1,m1;
+       BIGNUM r1,m1,vrfy;
        int ret=0;
        BN_CTX *ctx;
 
@@ -457,53 +461,59 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
        if ((ctx=BN_CTX_new()) == NULL) goto err;
        BN_init(&m1);
        BN_init(&r1);
+       BN_init(&vrfy);
 
        if (rsa->flags & RSA_FLAG_CACHE_PRIVATE)
                {
                if (rsa->_method_mod_p == NULL)
                        {
-                       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)
+                               goto err;
+                       if (!BN_MONT_CTX_set(bn_mont_ctx,rsa->p,ctx))
                                {
-                               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);
+                               goto err;
+                               }
+                       if (rsa->_method_mod_p == NULL) /* other thread may have finished first */
+                               {
+                               CRYPTO_w_lock(CRYPTO_LOCK_RSA);
+                               if (rsa->_method_mod_p == NULL)
                                        {
-                                       BN_MONT_CTX_free(bn_mont_ctx);
-                                       CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
-                                       goto err;
+                                       rsa->_method_mod_p = bn_mont_ctx;
+                                       bn_mont_ctx = NULL;
                                        }
-                               rsa->_method_mod_p = bn_mont_ctx;
-                               }
                                CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
+                               }
+                       if (bn_mont_ctx)
+                               BN_MONT_CTX_free(bn_mont_ctx);
                        }
+
                if (rsa->_method_mod_q == NULL)
                        {
-                       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)
+                               goto err;
+                       if (!BN_MONT_CTX_set(bn_mont_ctx,rsa->q,ctx))
                                {
-                               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);
+                               goto err;
+                               }
+                       if (rsa->_method_mod_q == NULL) /* other thread may have finished first */
+                               {
+                               CRYPTO_w_lock(CRYPTO_LOCK_RSA);
+                               if (rsa->_method_mod_q == NULL)
                                        {
-                                       BN_MONT_CTX_free(bn_mont_ctx);
-                                       CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
-                                       goto err;
+                                       rsa->_method_mod_q = bn_mont_ctx;
+                                       bn_mont_ctx = NULL;
                                        }
-                               rsa->_method_mod_q = bn_mont_ctx;
+                               CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
                                }
-                       CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
+                       if (bn_mont_ctx)
+                               BN_MONT_CTX_free(bn_mont_ctx);
                        }
                }
-
+               
        if (!BN_mod(&r1,I,rsa->q,ctx)) goto err;
        if (!meth->bn_mod_exp(&m1,&r1,rsa->dmq1,rsa->q,ctx,
                rsa->_method_mod_q)) goto err;
@@ -532,10 +542,19 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
        if (!BN_mul(&r1,r0,rsa->q,ctx)) goto err;
        if (!BN_add(r0,&r1,&m1)) goto err;
 
+       if (rsa->e && rsa->n)
+               {
+               if (!rsa->meth->bn_mod_exp(&vrfy,r0,rsa->e,rsa->n,ctx,NULL)) goto err;
+               if (BN_cmp(I, &vrfy) != 0)
+                       {
+                       if (!rsa->meth->bn_mod_exp(r0,I,rsa->d,rsa->n,ctx,NULL)) goto err;
+                       }
+               }
        ret=1;
 err:
        BN_clear_free(&m1);
        BN_clear_free(&r1);
+       BN_clear_free(&vrfy);
        BN_CTX_free(ctx);
        return(ret);
        }
Unnamed repository; edit this file 'description' to name the repository.