- deraadt@cvs.openbsd.org 2001/02/22 08:03:51

     [ssh-keygen.1 ssh-keygen.c]
     bye bye -d

diff --git a/ChangeLog b/ChangeLog
index 8943bd624556a2d9828758febb1860abdb28fd9c..2fb274385703e83c0d35e0f27eb9ab9e7b0e6f21 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
    - deraadt@cvs.openbsd.org 2001/02/22 06:43:55
      [ssh-keygen.1 ssh-keygen.c]
      document -d, and -t defaults to rsa1
+   - deraadt@cvs.openbsd.org 2001/02/22 08:03:51
+     [ssh-keygen.1 ssh-keygen.c]
+     bye bye -d
 
 20010304
  - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.

diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 516e05ed4f19a9eff121136efeec4754216a7426..caaf0b1502a7b6bd41c6f3c3d5a07bcf5cff759d 100644 (file)
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: ssh-keygen.1,v 1.31 2001/02/22 06:43:55 deraadt Exp $
+.\"    $OpenBSD: ssh-keygen.1,v 1.32 2001/02/22 08:03:51 deraadt Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -166,11 +166,6 @@ or
 for protocol version 2.
 The default is
 .Dq rsa1 .
-.It Fl d
-Specifies
-.Dq dsa
-key type (shortcut for
-.Fl t Ar dsa)
 .It Fl C Ar comment
 Provides the new comment.
 .It Fl N Ar new_passphrase

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 3fd0e3df5eb0c3a2491292388b857a86a6e6251a..e5e34cb2f1c0f01dfdcd386481e3544b1cd2218f 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.44 2001/02/22 06:43:55 deraadt Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.45 2001/02/22 08:03:51 deraadt Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -605,7 +605,7 @@ do_change_comment(struct passwd *pw)
 void
 usage(void)
 {
-       printf("Usage: %s [-lpqxXycd] [-t type] [-b bits] [-f file] [-C comment] "
+       printf("Usage: %s [-lpqxXyc] [-t type] [-b bits] [-f file] [-C comment] "
            "[-N new-pass] [-P pass]\n", __progname);
        exit(1);
 }