2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 1be6498d9..3ce14070f 100644
--- 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
@@ -3379,4 +3383,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4013 2005/11/29 01:45:32 tim Exp $
+$Id: ChangeLog,v 1.4014 2005/11/29 02:10:24 dtucker Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 3a6174ac1..64fadc7a1 100644
--- 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");