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

Don't hold CRYPTO_LOCK_RSA during time-consuming operations.

Browse Source
This commit is contained in:
Bodo Möller 2000-12-19 12:19:16 +00:00
parent bb617a9646
commit cbfa030de7
2 changed files with 77 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@ -10,13 +10,13 @@
[Bodo Moeller; problem reported by Eric Day <eday@concentric.net>] [Bodo Moeller; problem reported by Eric Day <eday@concentric.net>]
*) In RSA_eay_public_{en,ed}crypt and RSA_eay_mod_exp (rsa_eay.c), *) 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 obtain lock CRYPTO_LOCK_RSA before setting rsa->_method_mod_{n,p,q}.
structures and setting rsa->_method_mod_{n,p,q}.
(RSA objects have a reference count access to which is protected (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], 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.) so they are meant to be shared between threads.)
[patch submitted by "Reddie, Steven" <Steven.Reddie@ca.com>] [Bodo Moeller, Geoff Thorpe; original patch submitted by
"Reddie, Steven" <Steven.Reddie@ca.com>]
*) rand_win.c fix for Borland C. *) rand_win.c fix for Borland C.
[Ulf Möller] [Ulf Möller]

139
crypto/rsa/rsa_eay.c
View File

@ -138,26 +138,28 @@ 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 == NULL) && (rsa->flags & RSA_FLAG_CACHE_PUBLIC))
{ {
CRYPTO_w_lock(CRYPTO_LOCK_RSA); BN_MONT_CTX* bn_mont_ctx;
if (rsa->_method_mod_n == NULL) 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; BN_MONT_CTX_free(bn_mont_ctx);
if ((bn_mont_ctx=BN_MONT_CTX_new()) == NULL) goto err;
{
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->_method_mod_n == NULL) /* other thread may have finished first */
{
CRYPTO_w_lock(CRYPTO_LOCK_RSA);
if (rsa->_method_mod_n == NULL)
{
rsa->_method_mod_n = bn_mont_ctx;
bn_mont_ctx = NULL;
}
CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
}
if (bn_mont_ctx)
BN_MONT_CTX_free(bn_mont_ctx);
} }
if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx, if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
rsa->_method_mod_n)) goto err; rsa->_method_mod_n)) goto err;
@ -384,26 +386,28 @@ static int RSA_eay_public_decrypt(int flen, 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))
{ {
CRYPTO_w_lock(CRYPTO_LOCK_RSA); BN_MONT_CTX* bn_mont_ctx;
if (rsa->_method_mod_n == NULL) 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; BN_MONT_CTX_free(bn_mont_ctx);
if ((bn_mont_ctx=BN_MONT_CTX_new()) == NULL) goto err;
{
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->_method_mod_n == NULL) /* other thread may have finished first */
{
CRYPTO_w_lock(CRYPTO_LOCK_RSA);
if (rsa->_method_mod_n == NULL)
{
rsa->_method_mod_n = bn_mont_ctx;
bn_mont_ctx = NULL;
}
CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
}
if (bn_mont_ctx)
BN_MONT_CTX_free(bn_mont_ctx);
} }
if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx, if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
rsa->_method_mod_n)) goto err; rsa->_method_mod_n)) goto err;
@ -451,48 +455,53 @@ static int RSA_eay_mod_exp(BIGNUM *r0, BIGNUM *I, RSA *rsa)
{ {
if (rsa->_method_mod_p == NULL) if (rsa->_method_mod_p == NULL)
{ {
CRYPTO_w_lock(CRYPTO_LOCK_RSA); BN_MONT_CTX* bn_mont_ctx;
if (rsa->_method_mod_p == NULL) 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; BN_MONT_CTX_free(bn_mont_ctx);
if ((bn_mont_ctx=BN_MONT_CTX_new()) == NULL) goto err;
{
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;
} }
if (rsa->_method_mod_p == NULL) /* other thread may have finished first */
{
CRYPTO_w_lock(CRYPTO_LOCK_RSA);
if (rsa->_method_mod_p == NULL)
{
rsa->_method_mod_p = bn_mont_ctx;
bn_mont_ctx = NULL;
}
CRYPTO_w_unlock(CRYPTO_LOCK_RSA); CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
}
if (bn_mont_ctx)
BN_MONT_CTX_free(bn_mont_ctx);
} }
if (rsa->_method_mod_q == NULL) if (rsa->_method_mod_q == NULL)
{ {
CRYPTO_w_lock(CRYPTO_LOCK_RSA); BN_MONT_CTX* bn_mont_ctx;
if (rsa->_method_mod_q == NULL) 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; BN_MONT_CTX_free(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); if (rsa->_method_mod_q == NULL) /* other thread may have finished first */
{
CRYPTO_w_lock(CRYPTO_LOCK_RSA);
if (rsa->_method_mod_q == NULL)
{
rsa->_method_mod_q = bn_mont_ctx;
bn_mont_ctx = NULL;
}
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 (!BN_mod(&r1,I,rsa->q,ctx)) goto err;
if (!rsa->meth->bn_mod_exp(&m1,&r1,rsa->dmq1,rsa->q,ctx, if (!rsa->meth->bn_mod_exp(&m1,&r1,rsa->dmq1,rsa->q,ctx,
rsa->_method_mod_q)) goto err; rsa->_method_mod_q)) goto err;