Make sure that the last argument to RAND_add() is a float, or some
compilers may complain.
This commit is contained in:
parent
560f7abb7e
commit
fd836aeee0
4 changed files with 7 additions and 7 deletions
|
@ -315,7 +315,7 @@ static void ssleay_rand_add(const void *buf, int num, double add)
|
||||||
|
|
||||||
static void ssleay_rand_seed(const void *buf, int num)
|
static void ssleay_rand_seed(const void *buf, int num)
|
||||||
{
|
{
|
||||||
ssleay_rand_add(buf, num, num);
|
ssleay_rand_add(buf, num, (float)num);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ssleay_rand_bytes(unsigned char *buf, int num)
|
static int ssleay_rand_bytes(unsigned char *buf, int num)
|
||||||
|
|
|
@ -233,19 +233,19 @@ int RAND_poll(void)
|
||||||
#if defined(DEVRANDOM) || defined(DEVRANDOM_EGD)
|
#if defined(DEVRANDOM) || defined(DEVRANDOM_EGD)
|
||||||
if (n > 0)
|
if (n > 0)
|
||||||
{
|
{
|
||||||
RAND_add(tmpbuf,sizeof tmpbuf,n);
|
RAND_add(tmpbuf,sizeof tmpbuf,(float)n);
|
||||||
OPENSSL_cleanse(tmpbuf,n);
|
OPENSSL_cleanse(tmpbuf,n);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* put in some default random data, we need more than just this */
|
/* put in some default random data, we need more than just this */
|
||||||
l=curr_pid;
|
l=curr_pid;
|
||||||
RAND_add(&l,sizeof(l),0);
|
RAND_add(&l,sizeof(l),0.0);
|
||||||
l=getuid();
|
l=getuid();
|
||||||
RAND_add(&l,sizeof(l),0);
|
RAND_add(&l,sizeof(l),0.0);
|
||||||
|
|
||||||
l=time(NULL);
|
l=time(NULL);
|
||||||
RAND_add(&l,sizeof(l),0);
|
RAND_add(&l,sizeof(l),0.0);
|
||||||
|
|
||||||
#if defined(DEVRANDOM) || defined(DEVRANDOM_EGD)
|
#if defined(DEVRANDOM) || defined(DEVRANDOM_EGD)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
|
@ -243,7 +243,7 @@ static BN_BLINDING *setup_blinding(RSA *rsa, BN_CTX *ctx)
|
||||||
if ((RAND_status() == 0) && rsa->d != NULL && rsa->d->d != NULL)
|
if ((RAND_status() == 0) && rsa->d != NULL && rsa->d->d != NULL)
|
||||||
{
|
{
|
||||||
/* if PRNG is not properly seeded, resort to secret exponent as unpredictable seed */
|
/* if PRNG is not properly seeded, resort to secret exponent as unpredictable seed */
|
||||||
RAND_add(rsa->d->d, rsa->d->dmax * sizeof rsa->d->d[0], 0);
|
RAND_add(rsa->d->d, rsa->d->dmax * sizeof rsa->d->d[0], 0.0);
|
||||||
if (!BN_pseudo_rand_range(A,rsa->n)) goto err;
|
if (!BN_pseudo_rand_range(A,rsa->n)) goto err;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -343,7 +343,7 @@ int RSA_blinding_on(RSA *rsa, BN_CTX *p_ctx)
|
||||||
if ((RAND_status() == 0) && rsa->d != NULL && rsa->d->d != NULL)
|
if ((RAND_status() == 0) && rsa->d != NULL && rsa->d->d != NULL)
|
||||||
{
|
{
|
||||||
/* if PRNG is not properly seeded, resort to secret exponent as unpredictable seed */
|
/* if PRNG is not properly seeded, resort to secret exponent as unpredictable seed */
|
||||||
RAND_add(rsa->d->d, rsa->d->dmax * sizeof rsa->d->d[0], 0);
|
RAND_add(rsa->d->d, rsa->d->dmax * sizeof rsa->d->d[0], 0.0);
|
||||||
if (!BN_pseudo_rand_range(A,rsa->n)) goto err;
|
if (!BN_pseudo_rand_range(A,rsa->n)) goto err;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue