mirror of
https://github.com/openssl/openssl.git
synced 2024-11-21 01:15:20 +08:00
Do not poll DEVRANDOM if weäre building without an file pointer API.
Spotted by "David Schwartz" <davids@webmaster.com>.
This commit is contained in:
parent
7522254b48
commit
3a3ca1d474
@ -692,10 +692,13 @@ int RAND_poll(void)
|
||||
{
|
||||
unsigned long l;
|
||||
pid_t curr_pid = getpid();
|
||||
#ifndef NO_FP_API
|
||||
#ifdef DEVRANDOM
|
||||
FILE *fh;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef NO_FP_API
|
||||
#ifdef DEVRANDOM
|
||||
/* Use a random entropy pool device. Linux, FreeBSD and OpenBSD
|
||||
* have this. Use /dev/urandom if you can as /dev/random may block
|
||||
@ -712,6 +715,7 @@ int RAND_poll(void)
|
||||
RAND_add(tmpbuf,sizeof tmpbuf,n);
|
||||
memset(tmpbuf,0,n);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* put in some default random data, we need more than just this */
|
||||
@ -723,8 +727,10 @@ int RAND_poll(void)
|
||||
l=time(NULL);
|
||||
RAND_add(&l,sizeof(l),0);
|
||||
|
||||
#ifndef NO_FP_API
|
||||
#ifdef DEVRANDOM
|
||||
return 1;
|
||||
#endif
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user