generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Obtain lock CRYPTO_LOCK_RSA before creating BN_MONT_CTX

Browse Source 
structures and setting rsa->_method_mod_{n,p,q}.

Submitted by: "Reddie, Steven" <Steven.Reddie@ca.com>
This commit is contained in:
Bodo Möller 2000-12-18 09:00:48 +00:00
parent 09f4278d25
commit f640ee90c3
2 changed files with 79 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES
View File

@ -3,6 +3,15 @@
Changes between 0.9.6 and 0.9.7 [xx XXX 2000] Changes between 0.9.6 and 0.9.7 [xx XXX 2000]
*) In RSA_eay_public_{en,ed}crypt and RSA_eay_mod_exp (rsa_eay.c),
obtain lock CRYPTO_LOCK_RSA before creating BN_MONT_CTX
structures and setting rsa->_method_mod_{n,p,q}.
(RSA objects have a reference count access to which is protected
by CRYPTO_LOCK_RSA [see rsa_lib.c, s3_srvr.c, ssl_cert.c, ssl_rsa.c],
so they are meant to be shared between threads.)
[patch submitted by "Reddie, Steven" <Steven.Reddie@ca.com>]
*) Make mkdef.pl parse some of the ASN1 macros and add apropriate *) Make mkdef.pl parse some of the ASN1 macros and add apropriate
entries for variables. entries for variables.

82
crypto/rsa/rsa_eay.c
View File

@ -141,9 +141,24 @@ static int RSA_eay_public_encrypt(int flen, const unsigned char *from,
if ((rsa->_method_mod_n == NULL) && (rsa->flags & RSA_FLAG_CACHE_PUBLIC)) if ((rsa->_method_mod_n == NULL) && (rsa->flags & RSA_FLAG_CACHE_PUBLIC))
{ {
if ((rsa->_method_mod_n=BN_MONT_CTX_new()) != NULL) CRYPTO_w_lock(CRYPTO_LOCK_RSA);
if (!BN_MONT_CTX_set(rsa->_method_mod_n,rsa->n,ctx)) if (rsa->_method_mod_n == NULL)
goto err; {
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, if (!meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
@ -378,9 +393,24 @@ static int RSA_eay_public_decrypt(int flen, const unsigned char *from,
/* do the decrypt */ /* do the decrypt */
if ((rsa->_method_mod_n == NULL) && (rsa->flags & RSA_FLAG_CACHE_PUBLIC)) if ((rsa->_method_mod_n == NULL) && (rsa->flags & RSA_FLAG_CACHE_PUBLIC))
{ {
if ((rsa->_method_mod_n=BN_MONT_CTX_new()) != NULL) CRYPTO_w_lock(CRYPTO_LOCK_RSA);
if (!BN_MONT_CTX_set(rsa->_method_mod_n,rsa->n,ctx)) if (rsa->_method_mod_n == NULL)
goto err; {
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, if (!meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
@ -432,17 +462,45 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
{ {
if (rsa->_method_mod_p == NULL) if (rsa->_method_mod_p == NULL)
{ {
if ((rsa->_method_mod_p=BN_MONT_CTX_new()) != NULL) CRYPTO_w_lock(CRYPTO_LOCK_RSA);
if (!BN_MONT_CTX_set(rsa->_method_mod_p,rsa->p, if (rsa->_method_mod_p == NULL)
ctx)) {
BN_MONT_CTX* bn_mont_ctx;
if ((bn_mont_ctx=BN_MONT_CTX_new()) == NULL)
{
CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
goto err; 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 == NULL)
{ {
if ((rsa->_method_mod_q=BN_MONT_CTX_new()) != NULL) CRYPTO_w_lock(CRYPTO_LOCK_RSA);
if (!BN_MONT_CTX_set(rsa->_method_mod_q,rsa->q, if (rsa->_method_mod_q == NULL)
ctx)) {
BN_MONT_CTX* bn_mont_ctx;
if ((bn_mont_ctx=BN_MONT_CTX_new()) == NULL)
{
CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
goto err; 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);
} }
} }