diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-04-30 23:18:44 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-01 10:05:01 +1000 |
commit | 873d3e7d9a4707d0934fb4c4299354418f91b541 (patch) | |
tree | 4fd961131c84ad1626f11ffdcdc4316a26febacb /ssh-keygen.c | |
parent | 788ac799a6efa40517f2ac0d895a610394298ffc (diff) |
upstream commit
remove KEY_RSA1
ok markus@
Upstream-ID: 7408517b077c892a86b581e19f82a163069bf133
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 70d421844..51c24bc55 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.301 2017/04/30 23:10:43 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.302 2017/04/30 23:18:44 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -246,9 +246,6 @@ ask_filename(struct passwd *pw, const char *prompt) | |||
246 | name = _PATH_SSH_CLIENT_ID_RSA; | 246 | name = _PATH_SSH_CLIENT_ID_RSA; |
247 | else { | 247 | else { |
248 | switch (sshkey_type_from_name(key_type_name)) { | 248 | switch (sshkey_type_from_name(key_type_name)) { |
249 | case KEY_RSA1: | ||
250 | name = _PATH_SSH_CLIENT_IDENTITY; | ||
251 | break; | ||
252 | case KEY_DSA_CERT: | 249 | case KEY_DSA_CERT: |
253 | case KEY_DSA: | 250 | case KEY_DSA: |
254 | name = _PATH_SSH_CLIENT_ID_DSA; | 251 | name = _PATH_SSH_CLIENT_ID_DSA; |
@@ -320,8 +317,6 @@ do_convert_to_ssh2(struct passwd *pw, struct sshkey *k) | |||
320 | char comment[61]; | 317 | char comment[61]; |
321 | int r; | 318 | int r; |
322 | 319 | ||
323 | if (k->type == KEY_RSA1) | ||
324 | fatal("version 1 keys are not supported"); | ||
325 | if ((r = sshkey_to_blob(k, &blob, &len)) != 0) | 320 | if ((r = sshkey_to_blob(k, &blob, &len)) != 0) |
326 | fatal("key_to_blob failed: %s", ssh_err(r)); | 321 | fatal("key_to_blob failed: %s", ssh_err(r)); |
327 | /* Comment + surrounds must fit into 72 chars (RFC 4716 sec 3.3) */ | 322 | /* Comment + surrounds must fit into 72 chars (RFC 4716 sec 3.3) */ |
@@ -343,7 +338,6 @@ static void | |||
343 | do_convert_to_pkcs8(struct sshkey *k) | 338 | do_convert_to_pkcs8(struct sshkey *k) |
344 | { | 339 | { |
345 | switch (sshkey_type_plain(k->type)) { | 340 | switch (sshkey_type_plain(k->type)) { |
346 | case KEY_RSA1: | ||
347 | case KEY_RSA: | 341 | case KEY_RSA: |
348 | if (!PEM_write_RSA_PUBKEY(stdout, k->rsa)) | 342 | if (!PEM_write_RSA_PUBKEY(stdout, k->rsa)) |
349 | fatal("PEM_write_RSA_PUBKEY failed"); | 343 | fatal("PEM_write_RSA_PUBKEY failed"); |
@@ -368,7 +362,6 @@ static void | |||
368 | do_convert_to_pem(struct sshkey *k) | 362 | do_convert_to_pem(struct sshkey *k) |
369 | { | 363 | { |
370 | switch (sshkey_type_plain(k->type)) { | 364 | switch (sshkey_type_plain(k->type)) { |
371 | case KEY_RSA1: | ||
372 | case KEY_RSA: | 365 | case KEY_RSA: |
373 | if (!PEM_write_RSAPublicKey(stdout, k->rsa)) | 366 | if (!PEM_write_RSAPublicKey(stdout, k->rsa)) |
374 | fatal("PEM_write_RSAPublicKey failed"); | 367 | fatal("PEM_write_RSAPublicKey failed"); |
@@ -825,13 +818,6 @@ try_read_key(char **cpp) | |||
825 | struct sshkey *ret; | 818 | struct sshkey *ret; |
826 | int r; | 819 | int r; |
827 | 820 | ||
828 | if ((ret = sshkey_new(KEY_RSA1)) == NULL) | ||
829 | fatal("sshkey_new failed"); | ||
830 | /* Try RSA1 */ | ||
831 | if ((r = sshkey_read(ret, cpp)) == 0) | ||
832 | return ret; | ||
833 | /* Try modern */ | ||
834 | sshkey_free(ret); | ||
835 | if ((ret = sshkey_new(KEY_UNSPEC)) == NULL) | 821 | if ((ret = sshkey_new(KEY_UNSPEC)) == NULL) |
836 | fatal("sshkey_new failed"); | 822 | fatal("sshkey_new failed"); |
837 | if ((r = sshkey_read(ret, cpp)) == 0) | 823 | if ((r = sshkey_read(ret, cpp)) == 0) |
@@ -1442,9 +1428,8 @@ do_change_comment(struct passwd *pw) | |||
1442 | } | 1428 | } |
1443 | } | 1429 | } |
1444 | 1430 | ||
1445 | if (private->type != KEY_RSA1 && private->type != KEY_ED25519 && | 1431 | if (private->type != KEY_ED25519 && !use_new_format) { |
1446 | !use_new_format) { | 1432 | error("Comments are only supported for keys stored in " |
1447 | error("Comments are only supported for RSA1 or keys stored in " | ||
1448 | "the new format (-o)."); | 1433 | "the new format (-o)."); |
1449 | explicit_bzero(passphrase, strlen(passphrase)); | 1434 | explicit_bzero(passphrase, strlen(passphrase)); |
1450 | sshkey_free(private); | 1435 | sshkey_free(private); |
@@ -2241,13 +2226,11 @@ do_check_krl(struct passwd *pw, int argc, char **argv) | |||
2241 | exit(ret); | 2226 | exit(ret); |
2242 | } | 2227 | } |
2243 | 2228 | ||
2244 | # define RSA1_USAGE "" | ||
2245 | |||
2246 | static void | 2229 | static void |
2247 | usage(void) | 2230 | usage(void) |
2248 | { | 2231 | { |
2249 | fprintf(stderr, | 2232 | fprintf(stderr, |
2250 | "usage: ssh-keygen [-q] [-b bits] [-t dsa | ecdsa | ed25519 | rsa%s]\n" | 2233 | "usage: ssh-keygen [-q] [-b bits] [-t dsa | ecdsa | ed25519 | rsa]\n" |
2251 | " [-N new_passphrase] [-C comment] [-f output_keyfile]\n" | 2234 | " [-N new_passphrase] [-C comment] [-f output_keyfile]\n" |
2252 | " ssh-keygen -p [-P old_passphrase] [-N new_passphrase] [-f keyfile]\n" | 2235 | " ssh-keygen -p [-P old_passphrase] [-N new_passphrase] [-f keyfile]\n" |
2253 | " ssh-keygen -i [-m key_format] [-f input_keyfile]\n" | 2236 | " ssh-keygen -i [-m key_format] [-f input_keyfile]\n" |
@@ -2255,7 +2238,7 @@ usage(void) | |||
2255 | " ssh-keygen -y [-f input_keyfile]\n" | 2238 | " ssh-keygen -y [-f input_keyfile]\n" |
2256 | " ssh-keygen -c [-P passphrase] [-C comment] [-f keyfile]\n" | 2239 | " ssh-keygen -c [-P passphrase] [-C comment] [-f keyfile]\n" |
2257 | " ssh-keygen -l [-v] [-E fingerprint_hash] [-f input_keyfile]\n" | 2240 | " ssh-keygen -l [-v] [-E fingerprint_hash] [-f input_keyfile]\n" |
2258 | " ssh-keygen -B [-f input_keyfile]\n", RSA1_USAGE); | 2241 | " ssh-keygen -B [-f input_keyfile]\n"); |
2259 | #ifdef ENABLE_PKCS11 | 2242 | #ifdef ENABLE_PKCS11 |
2260 | fprintf(stderr, | 2243 | fprintf(stderr, |
2261 | " ssh-keygen -D pkcs11\n"); | 2244 | " ssh-keygen -D pkcs11\n"); |