nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-04 21:12:47 -05:00
Code Issues Projects Releases Wiki Activity

Improve the noise collection for the internal random pool.

Browse Source 
[originally from svn r2182]
This commit is contained in:
Simon Tatham
2002-11-02 15:23:20 +00:00
parent 93e9fadc75
commit 53eb272766
4 changed files with 98 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
unix/uxstore.c
View File

@ -156,7 +156,7 @@ void enum_settings_finish(void *handle)
}
enum {
INDEX_DIR, INDEX_HOSTKEYS
INDEX_DIR, INDEX_HOSTKEYS, INDEX_RANDSEED
};
static void make_filename(char *filename, int index)
@ -169,6 +169,7 @@ static void make_filename(char *filename, int index)
strncpy(filename + len,
index == INDEX_DIR ? "/.putty" :
index == INDEX_HOSTKEYS ? "/.putty/sshhostkeys" :
index == INDEX_RANDSEED ? "/.putty/randomseed" :
"/.putty/ERROR", FILENAME_MAX - len);
filename[FILENAME_MAX-1] = '\0';
}
@ -297,10 +298,43 @@ void store_host_key(char *hostname, int port, char *keytype, char *key)
void read_random_seed(noise_consumer_t consumer)
{
int fd;
char fname[FILENAME_MAX];
make_filename(fname, INDEX_RANDSEED);
fd = open(fname, O_RDONLY);
if (fd) {
char buf[512];
int ret;
while ( (ret = read(fd, buf, sizeof(buf))) > 0)
consumer(buf, ret);
close(fd);
}
}
void write_random_seed(void *data, int len)
{
int fd;
char fname[FILENAME_MAX];
make_filename(fname, INDEX_RANDSEED);
fd = open(fname, O_CREAT | O_TRUNC | O_WRONLY, 0600);
if (fd < 0) {
char dir[FILENAME_MAX];
make_filename(dir, INDEX_DIR);
mkdir(dir, 0700);
fd = open(fname, O_CREAT | O_TRUNC | O_WRONLY, 0600);
}
while (len > 0) {
int ret = write(fd, data, len);
if (ret <= 0) break;
len -= ret;
data = (char *)data + len;
}
close(fd);
}
void cleanup_all(void)