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

Avoid shadowing variables,

Browse Source 
and re-enable seeding with more data than read from DEVRANDOM -- just
don't pretend it contains entropy.
This commit is contained in:
Bodo Möller 2000-01-14 09:08:39 +00:00
parent f2b86c955c
commit 2f878669b7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/rand/md_rand.c
View File

@ -144,7 +144,7 @@ const char *RAND_version="RAND" OPENSSL_VERSION_PTEXT;
static void ssleay_rand_cleanup(void); static void ssleay_rand_cleanup(void);
static void ssleay_rand_seed(const void *buf, int num); static void ssleay_rand_seed(const void *buf, int num);
static void ssleay_rand_add(const void *buf, int num, int entropy); static void ssleay_rand_add(const void *buf, int num, int add_entropy);
static int ssleay_rand_bytes(unsigned char *buf, int num); static int ssleay_rand_bytes(unsigned char *buf, int num);
RAND_METHOD rand_ssleay_meth={ RAND_METHOD rand_ssleay_meth={
@ -361,12 +361,12 @@ static int ssleay_rand_bytes(unsigned char *buf, int num)
if ((fh = fopen(DEVRANDOM, "r")) != NULL) if ((fh = fopen(DEVRANDOM, "r")) != NULL)
{ {
unsigned char tmpbuf[ENTROPY_NEEDED]; unsigned char tmpbuf[ENTROPY_NEEDED];
int i; int n;
i=fread((unsigned char *)tmpbuf,1,ENTROPY_NEEDED,fh); n=fread((unsigned char *)tmpbuf,1,ENTROPY_NEEDED,fh);
fclose(fh); fclose(fh);
RAND_seed(tmpbuf,i); RAND_add(tmpbuf,sizeof tmpbuf,n);
memset(tmpbuf,0,i); memset(tmpbuf,0,n);
} }
#endif #endif
#ifdef PURIFY #ifdef PURIFY