diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ssh-keygen.c | 13 |
2 files changed, 11 insertions, 9 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20020720 | ||
2 | - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng(). | ||
3 | |||
1 | 20020719 | 4 | 20020719 |
2 | - (tim) [contrib/solaris/buildpkg.sh] create privsep user/group if needed. | 5 | - (tim) [contrib/solaris/buildpkg.sh] create privsep user/group if needed. |
3 | Patch by dtucker@zip.com.au | 6 | Patch by dtucker@zip.com.au |
@@ -205,7 +208,7 @@ | |||
205 | - (bal) FreeBSD needs <sys/types.h> to detect if mmap() is supported. | 208 | - (bal) FreeBSD needs <sys/types.h> to detect if mmap() is supported. |
206 | Bug #303 | 209 | Bug #303 |
207 | 210 | ||
208 | 200206027 | 211 | 20020627 |
209 | - OpenBSD CVS Sync | 212 | - OpenBSD CVS Sync |
210 | - deraadt@cvs.openbsd.org 2002/06/26 14:49:36 | 213 | - deraadt@cvs.openbsd.org 2002/06/26 14:49:36 |
211 | [monitor.c] | 214 | [monitor.c] |
@@ -1394,4 +1397,4 @@ | |||
1394 | - (stevesk) entropy.c: typo in debug message | 1397 | - (stevesk) entropy.c: typo in debug message |
1395 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1398 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1396 | 1399 | ||
1397 | $Id: ChangeLog,v 1.2379 2002/07/19 19:41:10 tim Exp $ | 1400 | $Id: ChangeLog,v 1.2380 2002/07/20 19:05:40 stevesk Exp $ |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 4273c1132..3478e3723 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -761,6 +761,8 @@ main(int ac, char **av) | |||
761 | __progname = get_progname(av[0]); | 761 | __progname = get_progname(av[0]); |
762 | 762 | ||
763 | SSLeay_add_all_algorithms(); | 763 | SSLeay_add_all_algorithms(); |
764 | init_rng(); | ||
765 | seed_rng(); | ||
764 | 766 | ||
765 | /* we need this for the home * directory. */ | 767 | /* we need this for the home * directory. */ |
766 | pw = getpwuid(getuid()); | 768 | pw = getpwuid(getuid()); |
@@ -855,10 +857,12 @@ main(int ac, char **av) | |||
855 | do_fingerprint(pw); | 857 | do_fingerprint(pw); |
856 | if (change_passphrase) | 858 | if (change_passphrase) |
857 | do_change_passphrase(pw); | 859 | do_change_passphrase(pw); |
858 | if (convert_to_ssh2) | ||
859 | do_convert_to_ssh2(pw); | ||
860 | if (change_comment) | 860 | if (change_comment) |
861 | do_change_comment(pw); | 861 | do_change_comment(pw); |
862 | if (convert_to_ssh2) | ||
863 | do_convert_to_ssh2(pw); | ||
864 | if (convert_from_ssh2) | ||
865 | do_convert_from_ssh2(pw); | ||
862 | if (print_public) | 866 | if (print_public) |
863 | do_print_public(pw); | 867 | do_print_public(pw); |
864 | if (reader_id != NULL) { | 868 | if (reader_id != NULL) { |
@@ -872,13 +876,8 @@ main(int ac, char **av) | |||
872 | #endif /* SMARTCARD */ | 876 | #endif /* SMARTCARD */ |
873 | } | 877 | } |
874 | 878 | ||
875 | init_rng(); | ||
876 | seed_rng(); | ||
877 | arc4random_stir(); | 879 | arc4random_stir(); |
878 | 880 | ||
879 | if (convert_from_ssh2) | ||
880 | do_convert_from_ssh2(pw); | ||
881 | |||
882 | if (key_type_name == NULL) { | 881 | if (key_type_name == NULL) { |
883 | printf("You must specify a key type (-t).\n"); | 882 | printf("You must specify a key type (-t).\n"); |
884 | usage(); | 883 | usage(); |