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

RAND_load_file(..., -1) now means "read the complete file";

Browse Source 
this is what we now use to read $RANDFILE / $HOME/.rnd.
(Previously, after 'cat'ting lots of stuff into .rnd
only the first MB would be looked at.)

Bugfix for apps/enc.c: Continue if RAND_pseudo_bytes returns 0
(only -1 is an error).
This commit is contained in:
Bodo Möller
2000-01-24 10:03:24 +00:00
parent f13b93d3b4
commit 05ccd698b9
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
crypto/rand/randfile.c
View File

@@ -82,6 +82,9 @@
int RAND_load_file(const char *file, long bytes)
{
/* If bytes >= 0, read up to 'bytes' bytes.
* if bytes == -1, read complete file. */
MS_STATIC unsigned char buf[BUFSIZE];
struct stat sb;
int i,ret=0,n;
@@ -93,20 +96,26 @@ int RAND_load_file(const char *file, long bytes)
/* If the state fails, put some crap in anyway */
RAND_add(&sb,sizeof(sb),0);
if (i < 0) return(0);
if (bytes <= 0) return(ret);
if (bytes == 0) return(ret);
in=fopen(file,"rb");
if (in == NULL) goto err;
for (;;)
{
n=(bytes < BUFSIZE)?(int)bytes:BUFSIZE;
if (bytes > 0)
n = (bytes < BUFSIZE)?(int)bytes:BUFSIZE;
else
n = BUFSIZE;
i=fread(buf,1,n,in);
if (i <= 0) break;
/* even if n != i, use the full array */
RAND_add(buf,n,i);
ret+=i;
bytes-=n;
if (bytes <= 0) break;
if (bytes > 0)
{
bytes-=n;
if (bytes == 0) break;
}
}
fclose(in);
memset(buf,0,BUFSIZE);