sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

use /dev/urandom not /dev/random in head branch.

Browse Source 
also got rid of /tmp time based random source. I saw a system with a
huge number of files in /tmp and logging in was taking a _long_ time.
(This used to be commit d48e452915)
This commit is contained in:
Andrew Tridgell 1999-04-28 02:00:38 +00:00
parent be552ca350
commit 4d24845de6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source3/lib/genrand.c
View File

@ -99,13 +99,17 @@ static void do_dirrand(char *name, unsigned char *buf, int buf_len)
/**************************************************************
Try and get a good random number seed. Try a number of
different factors. Firstly, try /dev/random and try and
different factors. Firstly, try /dev/urandom and try and
read from this. If this fails iterate through /tmp and
/dev and XOR all the file timestamps. Next add in
a hash of the contents of /etc/shadow and the smb passwd
file and a combination of pid and time of day (yes I know this
sucks :-). Finally md4 the result.
We use /dev/urandom as a read of /dev/random can block if
the entropy pool dries up. This leads clients to timeout
or be very slow on connect.
The result goes in a 16 byte buffer passed from the caller
**************************************************************/
@ -121,23 +125,22 @@ static uint32 do_reseed(unsigned char *md4_outbuf)
memset(md4_inbuf, '\0', sizeof(md4_inbuf));
fd = sys_open( "/dev/random", O_RDONLY,0);
fd = sys_open( "/dev/urandom", O_RDONLY,0);
if(fd >= 0) {
/*
* We can use /dev/random !
* We can use /dev/urandom !
*/
if(read(fd, md4_inbuf, 40) == 40) {
got_random = True;
DEBUG(10,("do_reseed: got 40 bytes from /dev/random.\n"));
DEBUG(10,("do_reseed: got 40 bytes from /dev/urandom.\n"));
}
close(fd);
}
if(!got_random) {
/*
* /dev/random failed - try /tmp and /dev for timestamps.
* /dev/urandom failed - try /dev for timestamps.
*/
do_dirrand("/tmp", md4_inbuf, sizeof(md4_inbuf));
do_dirrand("/dev", md4_inbuf, sizeof(md4_inbuf));
}