diff options
| author | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
| commit | 9b71add4cecf753c45f5fbd6ff0913bc95b3e95d (patch) | |
| tree | d4ea8fdb30c7949c6433f5277c39548ea579d4dc /entropy.c | |
| parent | ed07bcbea56007ab5b218ddf3aa6a7d4e21966e0 (diff) | |
| parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) | |
Merge 4.2p1 to the trunk.
Diffstat (limited to 'entropy.c')
| -rw-r--r-- | entropy.c | 6 |
1 files changed, 3 insertions, 3 deletions
| @@ -45,7 +45,7 @@ | |||
| 45 | * XXX: we should tell the child how many bytes we need. | 45 | * XXX: we should tell the child how many bytes we need. |
| 46 | */ | 46 | */ |
| 47 | 47 | ||
| 48 | RCSID("$Id: entropy.c,v 1.48 2003/11/21 12:56:47 djm Exp $"); | 48 | RCSID("$Id: entropy.c,v 1.49 2005/07/17 07:26:44 djm Exp $"); |
| 49 | 49 | ||
| 50 | #ifndef OPENSSL_PRNG_ONLY | 50 | #ifndef OPENSSL_PRNG_ONLY |
| 51 | #define RANDOM_SEED_SIZE 48 | 51 | #define RANDOM_SEED_SIZE 48 |
| @@ -114,8 +114,8 @@ seed_rng(void) | |||
| 114 | close(p[0]); | 114 | close(p[0]); |
| 115 | 115 | ||
| 116 | if (waitpid(pid, &ret, 0) == -1) | 116 | if (waitpid(pid, &ret, 0) == -1) |
| 117 | fatal("Couldn't wait for ssh-rand-helper completion: %s", | 117 | fatal("Couldn't wait for ssh-rand-helper completion: %s", |
| 118 | strerror(errno)); | 118 | strerror(errno)); |
| 119 | signal(SIGCHLD, old_sigchld); | 119 | signal(SIGCHLD, old_sigchld); |
| 120 | 120 | ||
| 121 | /* We don't mind if the child exits upon a SIGPIPE */ | 121 | /* We don't mind if the child exits upon a SIGPIPE */ |