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

(seed_something): avoid poking at memory that is uninitialized, make

Browse Source 
valgrind unhappy. Pointd out by abartlet@samba.org. While where, plug
the fd leak.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14193 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-09-06 06:45:12 +00:00
parent e8f03a0d3a
commit 6af75bb33b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/krb5/crypto.c
View File

@@ -3723,17 +3723,19 @@ krb5_decrypt_EncryptedData(krb5_context context,
static int static int
seed_something(void) seed_something(void)
{ {
int fd = -1;
char buf[1024], seedfile[256]; char buf[1024], seedfile[256];
/* If there is a seed file, load it. But such a file cannot be trusted, /* If there is a seed file, load it. But such a file cannot be trusted,
so use 0 for the entropy estimate */ so use 0 for the entropy estimate */
if (RAND_file_name(seedfile, sizeof(seedfile))) { if (RAND_file_name(seedfile, sizeof(seedfile))) {
int fd;
fd = open(seedfile, O_RDONLY); fd = open(seedfile, O_RDONLY);
if (fd >= 0) { if (fd >= 0) {
read(fd, buf, sizeof(buf)); ssize_t ret;
/* Use the full buffer anyway */ ret = read(fd, buf, sizeof(buf));
RAND_add(buf, sizeof(buf), 0.0); if (ret > 0)
RAND_add(buf, ret, 0.0);
close(fd);
} else } else
seedfile[0] = '\0'; seedfile[0] = '\0';
} else } else