tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 16:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng().

Browse Source
This commit is contained in:
Kevin Steves 2002-07-20 19:05:40 +00:00
parent f028f1e460
commit 3a8819102c
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,6 @@
20020720
- (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng().
20020719 20020719
- (tim) [contrib/solaris/buildpkg.sh] create privsep user/group if needed. - (tim) [contrib/solaris/buildpkg.sh] create privsep user/group if needed.
Patch by dtucker@zip.com.au Patch by dtucker@zip.com.au
@ -205,7 +208,7 @@
- (bal) FreeBSD needs <sys/types.h> to detect if mmap() is supported. - (bal) FreeBSD needs <sys/types.h> to detect if mmap() is supported.
Bug #303 Bug #303
200206027 20020627
- OpenBSD CVS Sync - OpenBSD CVS Sync
- deraadt@cvs.openbsd.org 2002/06/26 14:49:36 - deraadt@cvs.openbsd.org 2002/06/26 14:49:36
[monitor.c] [monitor.c]
@ -1394,4 +1397,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2379 2002/07/19 19:41:10 tim Exp $ $Id: ChangeLog,v 1.2380 2002/07/20 19:05:40 stevesk Exp $

13
ssh-keygen.c
View File

@ -761,6 +761,8 @@ main(int ac, char **av)
__progname = get_progname(av[0]); __progname = get_progname(av[0]);
SSLeay_add_all_algorithms(); SSLeay_add_all_algorithms();
init_rng();
seed_rng();
/* we need this for the home * directory. */ /* we need this for the home * directory. */
pw = getpwuid(getuid()); pw = getpwuid(getuid());
@ -855,10 +857,12 @@ main(int ac, char **av)
do_fingerprint(pw); do_fingerprint(pw);
if (change_passphrase) if (change_passphrase)
do_change_passphrase(pw); do_change_passphrase(pw);
if (convert_to_ssh2)
do_convert_to_ssh2(pw);
if (change_comment) if (change_comment)
do_change_comment(pw); do_change_comment(pw);
if (convert_to_ssh2)
do_convert_to_ssh2(pw);
if (convert_from_ssh2)
do_convert_from_ssh2(pw);
if (print_public) if (print_public)
do_print_public(pw); do_print_public(pw);
if (reader_id != NULL) { if (reader_id != NULL) {
@ -872,13 +876,8 @@ main(int ac, char **av)
#endif /* SMARTCARD */ #endif /* SMARTCARD */
} }
init_rng();
seed_rng();
arc4random_stir(); arc4random_stir();
if (convert_from_ssh2)
do_convert_from_ssh2(pw);
if (key_type_name == NULL) { if (key_type_name == NULL) {
printf("You must specify a key type (-t).\n"); printf("You must specify a key type (-t).\n");
usage(); usage();