- (tim) [ssh-keygen.c] Move DSA length test after setting default when

   bits == 0.

diff --git a/ChangeLog b/ChangeLog
index 08c200e1a0d08f897e1814c6d93bb6763b125998..4cf1e8420a703bd8aa011af076581b76d4a019cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20051129
+ - (tim) [ssh-keygen.c] Move DSA length test after setting default when
+   bits == 0.
+
 20051128
  - (dtucker) [regress/yes-head.sh] Work around breakage caused by some
    versions of GNU head.  Based on patch from zappaman at buraphalinux.org

diff --git a/ssh-keygen.c b/ssh-keygen.c
index b4c651d22de6ed56db3d98f3f0814ce7860781ae..3a6174ac1fc2ef8df07526a4302fb17f6f162ce5 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1259,12 +1259,12 @@ main(int ac, char **av)
                fprintf(stderr, "unknown key type %s\n", key_type_name);
                exit(1);
        }
-       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);
        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");
        private = key_generate(type, bits);
        if (private == NULL) {
                fprintf(stderr, "key_generate failed");