oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

access private functions though the RAND_METHOD switch, don't truncate

Browse Source 
the seed-file, move global egd function to rand-egd.c


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20026 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-01-21 09:53:02 +00:00
parent 75d0b8416e
commit 0381676ae8
1 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/des/rand.c
View File

@@ -57,7 +57,7 @@ init_method(void)
if (selected_meth != NULL) if (selected_meth != NULL)
return; return;
if (_hc_rand_unix_status() == 1) if ((*hc_rand_unix_method.status)() == 1)
selected_meth = &hc_rand_unix_method; selected_meth = &hc_rand_unix_method;
else else
selected_meth = &hc_rand_fortuna_method; selected_meth = &hc_rand_fortuna_method;
@@ -158,7 +158,7 @@ RAND_write_file(const char *filename)
size_t len; size_t len;
int res, fd; int res, fd;
fd = open(filename, O_WRONLY | O_CREAT | O_BINARY | O_TRUNC, 0600); fd = open(filename, O_WRONLY | O_CREAT | O_BINARY, 0600);
if (fd < 0) if (fd < 0)
return 0; return 0;
@@ -178,36 +178,3 @@ RAND_write_file(const char *filename)
return res; return res;
} }
int
RAND_egd(const char *filename)
{
return RAND_egd_bytes(filename, 128);
}
int
RAND_egd_bytes(const char *filename, int size)
{
void *data;
int ret;
if (size <= 0)
return 0;
data = malloc(size);
if (data == NULL)
return 0;
ret = _hc_rand_egd_bytes(filename, data, size);
if (ret != 1) {
free(data);
return ret;
}
RAND_seed(data, size);
memset(data, 0, sizeof(data));
free(data);
return 1;
}