diff options
author | Bodo Möller <bodo@openssl.org> | 2000-12-19 12:31:41 +0000 |
---|---|---|
committer | Bodo Möller <bodo@openssl.org> | 2000-12-19 12:31:41 +0000 |
commit | 126fe085db74d512260dd042d1f9dfe816f819dc (patch) | |
tree | 6b310b3e8fd725590efe70243c4ab72b12ac4801 /crypto/rsa | |
parent | 123d24d6003796375b5742f5274b3c69e27f9008 (diff) | |
download | openssl-126fe085db74d512260dd042d1f9dfe816f819dc.tar.gz |
Don't hold CRYPTO_LOCK_RSA during time-consuming operations.
Diffstat (limited to 'crypto/rsa')
-rw-r--r-- | crypto/rsa/rsa_eay.c | 125 |
1 files changed, 67 insertions, 58 deletions
diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c index f92a3022cb..35db9e5687 100644 --- a/crypto/rsa/rsa_eay.c +++ b/crypto/rsa/rsa_eay.c @@ -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; @@ -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; @@ -462,48 +466,53 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa) { 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); + BN_MONT_CTX_free(bn_mont_ctx); goto err; - } - if (!BN_MONT_CTX_set(bn_mont_ctx,rsa->q,ctx)) + } + 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; |