RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-27 11:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) Fix some bugs I introduced into ssh-rand-helper yesterday

Browse Source
This commit is contained in:
Damien Miller 2002-01-22 21:58:27 +11:00
parent 6c21c51c48
commit c46cc5445d
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -6,6 +6,7 @@
the ssh-rand-helper program. You can force the use of ssh-rand-helper the ssh-rand-helper program. You can force the use of ssh-rand-helper
using the --with-rand-helper configure argument using the --with-rand-helper configure argument
- Simplify and clean up ssh-rand-helper configuration - Simplify and clean up ssh-rand-helper configuration
- (djm) Fix some bugs I introduced into ssh-rand-helper yesterday
20020121 20020121
- (djm) Rework ssh-rand-helper: - (djm) Rework ssh-rand-helper:
@ -7153,4 +7154,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1722 2002/01/22 10:57:53 djm Exp $ $Id: ChangeLog,v 1.1723 2002/01/22 10:58:27 djm Exp $

14
ssh-rand-helper.c
View File

@ -39,7 +39,7 @@
#include "pathnames.h" #include "pathnames.h"
#include "log.h" #include "log.h"
RCSID("$Id: ssh-rand-helper.c,v 1.3 2002/01/21 12:44:12 djm Exp $"); RCSID("$Id: ssh-rand-helper.c,v 1.4 2002/01/22 10:58:28 djm Exp $");
/* Number of bytes we write out */ /* Number of bytes we write out */
#define OUTPUT_SEED_SIZE 48 #define OUTPUT_SEED_SIZE 48
@ -83,9 +83,7 @@ char *__progname;
# define RUSAGE_CHILDREN 0 # define RUSAGE_CHILDREN 0
#endif #endif
#if defined(PRNGD_SOCKET) || defined(PRNGD_PORT) #if !defined(PRNGD_SOCKET) && !defined(PRNGD_PORT)
# define USE_PRNGD
#else
# define USE_SEED_FILES # define USE_SEED_FILES
#endif #endif
@ -774,13 +772,11 @@ main(int argc, char **argv)
(int)stir_from_system()); (int)stir_from_system());
#ifdef PRNGD_PORT #ifdef PRNGD_PORT
if (get_random_bytes_prngd(buf, sizeof(buf), PRNGD_PORT, if (get_random_bytes_prngd(buf, sizeof(buf), PRNGD_PORT, NULL) == -1)
NULL) == -1)
fatal("Entropy collection failed"); fatal("Entropy collection failed");
RAND_add(buf, sizeof(buf), sizeof(buf)); RAND_add(buf, sizeof(buf), sizeof(buf));
#elif PRNGD_SOCKET #elif defined(PRNGD_SOCKET)
if (get_random_bytes_prngd(buf, sizeof(buf), PRNGD_SOCKET, if (get_random_bytes_prngd(buf, sizeof(buf), 0, PRNGD_SOCKET) == -1)
NULL) == -1)
fatal("Entropy collection failed"); fatal("Entropy collection failed");
RAND_add(buf, sizeof(buf), sizeof(buf)); RAND_add(buf, sizeof(buf), sizeof(buf));
#else #else