summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keygen.c9
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3770aca85..fd9831d05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
4 - (djm) Add Markus' patch for compat wih OpenSSL < 0.9.6. 4 - (djm) Add Markus' patch for compat wih OpenSSL < 0.9.6.
5 Known issue: Blowfish for SSH1 does not work 5 Known issue: Blowfish for SSH1 does not work
6 - (stevesk) entropy.c: typo in debug message 6 - (stevesk) entropy.c: typo in debug message
7 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
7 8
820020307 920020307
9 - (djm) OpenBSD CVS Sync 10 - (djm) OpenBSD CVS Sync
@@ -7827,4 +7828,4 @@
7827 - Wrote replacements for strlcpy and mkdtemp 7828 - Wrote replacements for strlcpy and mkdtemp
7828 - Released 1.0pre1 7829 - Released 1.0pre1
7829 7830
7830$Id: ChangeLog,v 1.1919 2002/03/11 00:16:34 stevesk Exp $ 7831$Id: ChangeLog,v 1.1920 2002/03/11 11:53:29 djm Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 6aff4a444..2de87167e 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -947,12 +947,10 @@ main(int ac, char **av)
947 do_fingerprint(pw); 947 do_fingerprint(pw);
948 if (change_passphrase) 948 if (change_passphrase)
949 do_change_passphrase(pw); 949 do_change_passphrase(pw);
950 if (change_comment)
951 do_change_comment(pw);
952 if (convert_to_ssh2) 950 if (convert_to_ssh2)
953 do_convert_to_ssh2(pw); 951 do_convert_to_ssh2(pw);
954 if (convert_from_ssh2) 952 if (change_comment)
955 do_convert_from_ssh2(pw); 953 do_change_comment(pw);
956 if (print_public) 954 if (print_public)
957 do_print_public(pw); 955 do_print_public(pw);
958 if (reader_id != NULL) { 956 if (reader_id != NULL) {
@@ -970,6 +968,9 @@ main(int ac, char **av)
970 seed_rng(); 968 seed_rng();
971 arc4random_stir(); 969 arc4random_stir();
972 970
971 if (convert_from_ssh2)
972 do_convert_from_ssh2(pw);
973
973 if (key_type_name == NULL) { 974 if (key_type_name == NULL) {
974 printf("You must specify a key type (-t).\n"); 975 printf("You must specify a key type (-t).\n");
975 usage(); 976 usage();