- dtucker@cvs.openbsd.org 2005/11/29 02:04:55

     [ssh-keygen.c]
     Populate default key sizes before checking them; from & ok tim@

diff --git a/ChangeLog b/ChangeLog
index 4cf1e8420a703bd8aa011af076581b76d4a019cd..55e9f7f403f9aba583b83ccf5d70f8d5f581618d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 20051129
  - (tim) [ssh-keygen.c] Move DSA length test after setting default when
    bits == 0.
+ - (dtucker) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2005/11/29 02:04:55
+     [ssh-keygen.c]
+     Populate default key sizes before checking them; from & ok tim@
 
 20051128
  - (dtucker) [regress/yes-head.sh] Work around breakage caused by some

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 3a6174ac1fc2ef8df07526a4302fb17f6f162ce5..64fadc7a1d7fdb65a93ba3bacaaa80aa1c96d3d1 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.134 2005/11/28 05:16:53 dtucker Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.135 2005/11/29 02:04:55 dtucker Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -1259,12 +1259,12 @@ main(int ac, char **av)
                fprintf(stderr, "unknown key type %s\n", key_type_name);
                exit(1);
        }
-       if (!quiet)
-               printf("Generating public/private %s key pair.\n", key_type_name);
        if (bits == 0)
                bits = (type == KEY_DSA) ? DEFAULT_BITS_DSA : DEFAULT_BITS;
        if (type == KEY_DSA && bits != 1024)
                fatal("DSA keys must be 1024 bits");
+       if (!quiet)
+               printf("Generating public/private %s key pair.\n", key_type_name);
        private = key_generate(type, bits);
        if (private == NULL) {
                fprintf(stderr, "key_generate failed");