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

BN_rand_range() as in main branch.

Browse Source
This commit is contained in:
Ulf Möller 2001-02-21 15:54:31 +00:00
parent 0069dbc4a5
commit a39ded513a
3 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/dh/dh_key.c
View File

@ -99,7 +99,6 @@ DH_METHOD *DH_OpenSSL(void)
static int generate_key(DH *dh) static int generate_key(DH *dh)
{ {
int ok=0; int ok=0;
unsigned int i;
BN_CTX ctx; BN_CTX ctx;
BN_MONT_CTX *mont; BN_MONT_CTX *mont;
BIGNUM *pub_key=NULL,*priv_key=NULL; BIGNUM *pub_key=NULL,*priv_key=NULL;
@ -108,15 +107,11 @@ static int generate_key(DH *dh)
if (dh->priv_key == NULL) if (dh->priv_key == NULL)
{ {
i=dh->length;
if (i == 0)
{
/* Make the number p-1 bits long */
i=BN_num_bits(dh->p)-1;
}
priv_key=BN_new(); priv_key=BN_new();
if (priv_key == NULL) goto err; if (priv_key == NULL) goto err;
if (!BN_rand(priv_key,i,0,0)) goto err; do
if (!BN_rand_range(priv_key, dh->p)) goto err;
while (BN_is_zero(priv_key));
} }
else else
priv_key=dh->priv_key; priv_key=dh->priv_key;

13
crypto/dsa/dsa_key.c
View File

@ -68,7 +68,6 @@
int DSA_generate_key(DSA *dsa) int DSA_generate_key(DSA *dsa)
{ {
int ok=0; int ok=0;
unsigned int i;
BN_CTX *ctx=NULL; BN_CTX *ctx=NULL;
BIGNUM *pub_key=NULL,*priv_key=NULL; BIGNUM *pub_key=NULL,*priv_key=NULL;
@ -81,15 +80,9 @@ int DSA_generate_key(DSA *dsa)
else else
priv_key=dsa->priv_key; priv_key=dsa->priv_key;
i=BN_num_bits(dsa->q); do
for (;;) if (!BN_rand_range(priv_key,dsa->q)) goto err;
{ while (BN_is_zero(priv_key));
if (!BN_rand(priv_key,i,0,0))
goto err;
if (BN_cmp(priv_key,dsa->q) >= 0)
BN_sub(priv_key,priv_key,dsa->q);
if (!BN_is_zero(priv_key)) break;
}
if (dsa->pub_key == NULL) if (dsa->pub_key == NULL)
{ {

2
crypto/rsa/rsa_lib.c
View File

@ -272,7 +272,7 @@ int RSA_blinding_on(RSA *rsa, BN_CTX *p_ctx)
BN_CTX_start(ctx); BN_CTX_start(ctx);
A = BN_CTX_get(ctx); A = BN_CTX_get(ctx);
if (!BN_rand(A,BN_num_bits(rsa->n)-1,1,0)) goto err; if (!BN_rand_range(A,rsa->n)) goto err;
if ((Ai=BN_mod_inverse(NULL,A,rsa->n,ctx)) == NULL) goto err; if ((Ai=BN_mod_inverse(NULL,A,rsa->n,ctx)) == NULL) goto err;
if (!rsa->meth->bn_mod_exp(A,A,rsa->e,rsa->n,ctx,rsa->_method_mod_n)) if (!rsa->meth->bn_mod_exp(A,A,rsa->e,rsa->n,ctx,rsa->_method_mod_n))