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 /sshconnect2.c | |
parent | 788ac799a6efa40517f2ac0d895a610394298ffc (diff) |
upstream commit
remove KEY_RSA1
ok markus@
Upstream-ID: 7408517b077c892a86b581e19f82a163069bf133
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 7e4cde151..393353db5 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.256 2017/04/28 03:24:53 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.257 2017/04/30 23:18:44 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -1317,8 +1317,6 @@ pubkey_prepare(Authctxt *authctxt) | |||
1317 | /* list of keys stored in the filesystem and PKCS#11 */ | 1317 | /* list of keys stored in the filesystem and PKCS#11 */ |
1318 | for (i = 0; i < options.num_identity_files; i++) { | 1318 | for (i = 0; i < options.num_identity_files; i++) { |
1319 | key = options.identity_keys[i]; | 1319 | key = options.identity_keys[i]; |
1320 | if (key && key->type == KEY_RSA1) | ||
1321 | continue; | ||
1322 | if (key && key->cert && key->cert->type != SSH2_CERT_TYPE_USER) | 1320 | if (key && key->cert && key->cert->type != SSH2_CERT_TYPE_USER) |
1323 | continue; | 1321 | continue; |
1324 | options.identity_keys[i] = NULL; | 1322 | options.identity_keys[i] = NULL; |
@@ -1471,7 +1469,7 @@ try_identity(Identity *id) | |||
1471 | key_type(id->key), id->filename); | 1469 | key_type(id->key), id->filename); |
1472 | return (0); | 1470 | return (0); |
1473 | } | 1471 | } |
1474 | return (id->key->type != KEY_RSA1); | 1472 | return 1; |
1475 | } | 1473 | } |
1476 | 1474 | ||
1477 | int | 1475 | int |
@@ -1764,7 +1762,6 @@ userauth_hostbased(Authctxt *authctxt) | |||
1764 | private = NULL; | 1762 | private = NULL; |
1765 | for (i = 0; i < authctxt->sensitive->nkeys; i++) { | 1763 | for (i = 0; i < authctxt->sensitive->nkeys; i++) { |
1766 | if (authctxt->sensitive->keys[i] == NULL || | 1764 | if (authctxt->sensitive->keys[i] == NULL || |
1767 | authctxt->sensitive->keys[i]->type == KEY_RSA1 || | ||
1768 | authctxt->sensitive->keys[i]->type == KEY_UNSPEC) | 1765 | authctxt->sensitive->keys[i]->type == KEY_UNSPEC) |
1769 | continue; | 1766 | continue; |
1770 | if (match_pattern_list( | 1767 | if (match_pattern_list( |