diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ssh-keygen.1 | 11 | ||||
-rw-r--r-- | ssh-keygen.c | 11 |
3 files changed, 17 insertions, 11 deletions
@@ -9,6 +9,10 @@ | |||
9 | - Add OpenSSL sanity check: verify that header version matches version | 9 | - Add OpenSSL sanity check: verify that header version matches version |
10 | reported by library | 10 | reported by library |
11 | - (djm) Fix some bugs I introduced into ssh-rand-helper yesterday | 11 | - (djm) Fix some bugs I introduced into ssh-rand-helper yesterday |
12 | - OpenBSD CVS Sync | ||
13 | - djm@cvs.openbsd.org 2001/12/21 08:52:22 | ||
14 | [ssh-keygen.1 ssh-keygen.c] | ||
15 | Remove default (rsa1) key type; ok markus@ | ||
12 | 16 | ||
13 | 20020121 | 17 | 20020121 |
14 | - (djm) Rework ssh-rand-helper: | 18 | - (djm) Rework ssh-rand-helper: |
@@ -7156,4 +7160,4 @@ | |||
7156 | - Wrote replacements for strlcpy and mkdtemp | 7160 | - Wrote replacements for strlcpy and mkdtemp |
7157 | - Released 1.0pre1 | 7161 | - Released 1.0pre1 |
7158 | 7162 | ||
7159 | $Id: ChangeLog,v 1.1724 2002/01/22 11:16:03 djm Exp $ | 7163 | $Id: ChangeLog,v 1.1725 2002/01/22 12:05:08 djm Exp $ |
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index d8baa43bc..afecb2f07 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.51 2001/11/21 18:49:14 stevesk Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.52 2001/12/21 08:52:22 djm Exp $ |
2 | .\" | 2 | .\" |
3 | .\" -*- nroff -*- | 3 | .\" -*- nroff -*- |
4 | .\" | 4 | .\" |
@@ -86,10 +86,11 @@ | |||
86 | generates, manages and converts authentication keys for | 86 | generates, manages and converts authentication keys for |
87 | .Xr ssh 1 . | 87 | .Xr ssh 1 . |
88 | .Nm | 88 | .Nm |
89 | defaults to generating a RSA1 key for use by SSH protocol version 1. | 89 | can create RSA keys for use by SSH protocol version 1 and RSA or DSA |
90 | Specifying the | 90 | keys for use by SSH protocol version 2. The type of key to be generated |
91 | is specified with the | ||
91 | .Fl t | 92 | .Fl t |
92 | option instead creates a key for use by SSH protocol version 2. | 93 | option. |
93 | .Pp | 94 | .Pp |
94 | Normally each user wishing to use SSH | 95 | Normally each user wishing to use SSH |
95 | with RSA or DSA authentication runs this once to create the authentication | 96 | with RSA or DSA authentication runs this once to create the authentication |
@@ -202,8 +203,6 @@ for protocol version 1 and | |||
202 | or | 203 | or |
203 | .Dq dsa | 204 | .Dq dsa |
204 | for protocol version 2. | 205 | for protocol version 2. |
205 | The default is | ||
206 | .Dq rsa1 . | ||
207 | .It Fl B | 206 | .It Fl B |
208 | Show the bubblebabble digest of specified private or public key file. | 207 | Show the bubblebabble digest of specified private or public key file. |
209 | .It Fl C Ar comment | 208 | .It Fl C Ar comment |
diff --git a/ssh-keygen.c b/ssh-keygen.c index ccd737781..9e3a12a54 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.86 2001/12/19 07:18:56 deraadt Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.87 2001/12/21 08:52:22 djm Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -73,8 +73,7 @@ int convert_to_ssh2 = 0; | |||
73 | int convert_from_ssh2 = 0; | 73 | int convert_from_ssh2 = 0; |
74 | int print_public = 0; | 74 | int print_public = 0; |
75 | 75 | ||
76 | /* default to RSA for SSH-1 */ | 76 | char *key_type_name = NULL; |
77 | char *key_type_name = "rsa1"; | ||
78 | 77 | ||
79 | /* argv0 */ | 78 | /* argv0 */ |
80 | #ifdef HAVE___PROGNAME | 79 | #ifdef HAVE___PROGNAME |
@@ -835,7 +834,7 @@ usage(void) | |||
835 | int | 834 | int |
836 | main(int ac, char **av) | 835 | main(int ac, char **av) |
837 | { | 836 | { |
838 | char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2; | 837 | char dotsshdir[MAXPATHLEN], comment[1024], *passphrase1, *passphrase2; |
839 | char *reader_id = NULL; | 838 | char *reader_id = NULL; |
840 | Key *private, *public; | 839 | Key *private, *public; |
841 | struct passwd *pw; | 840 | struct passwd *pw; |
@@ -937,6 +936,10 @@ main(int ac, char **av) | |||
937 | printf("Too many arguments.\n"); | 936 | printf("Too many arguments.\n"); |
938 | usage(); | 937 | usage(); |
939 | } | 938 | } |
939 | if (key_type_name == NULL) { | ||
940 | printf("You must specify a key type (-t).\n"); | ||
941 | usage(); | ||
942 | } | ||
940 | if (change_passphrase && change_comment) { | 943 | if (change_passphrase && change_comment) { |
941 | printf("Can only have one of -p and -c.\n"); | 944 | printf("Can only have one of -p and -c.\n"); |
942 | usage(); | 945 | usage(); |