mirror of https://github.com/openssl/openssl.git
				
				
				
			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; | 	unsigned long l; | ||||||
| 	pid_t curr_pid = getpid(); | 	pid_t curr_pid = getpid(); | ||||||
|  | #ifndef NO_FP_API | ||||||
| #ifdef DEVRANDOM | #ifdef DEVRANDOM | ||||||
| 	FILE *fh; | 	FILE *fh; | ||||||
| #endif | #endif | ||||||
|  | #endif | ||||||
| 
 | 
 | ||||||
|  | #ifndef NO_FP_API | ||||||
| #ifdef DEVRANDOM | #ifdef DEVRANDOM | ||||||
| 	/* Use a random entropy pool device. Linux, FreeBSD and OpenBSD
 | 	/* Use a random entropy pool device. Linux, FreeBSD and OpenBSD
 | ||||||
| 	 * have this. Use /dev/urandom if you can as /dev/random may block | 	 * 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); | 		RAND_add(tmpbuf,sizeof tmpbuf,n); | ||||||
| 		memset(tmpbuf,0,n); | 		memset(tmpbuf,0,n); | ||||||
| 		} | 		} | ||||||
|  | #endif | ||||||
| #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 */ | ||||||
|  | @ -723,8 +727,10 @@ int RAND_poll(void) | ||||||
| 	l=time(NULL); | 	l=time(NULL); | ||||||
| 	RAND_add(&l,sizeof(l),0); | 	RAND_add(&l,sizeof(l),0); | ||||||
| 
 | 
 | ||||||
|  | #ifndef NO_FP_API | ||||||
| #ifdef DEVRANDOM | #ifdef DEVRANDOM | ||||||
| 	return 1; | 	return 1; | ||||||
|  | #endif | ||||||
| #endif | #endif | ||||||
| 	return 0; | 	return 0; | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue