diff options
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 93818c991..0b13530ce 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1491,8 +1491,6 @@ pubkey_prepare(Authctxt *authctxt) | |||
1491 | 1491 | ||
1492 | /* list of keys stored in the filesystem and PKCS#11 */ | 1492 | /* list of keys stored in the filesystem and PKCS#11 */ |
1493 | for (i = 0; i < options.num_identity_files; i++) { | 1493 | for (i = 0; i < options.num_identity_files; i++) { |
1494 | if (options.identity_files[i] == NULL) | ||
1495 | continue; | ||
1496 | key = options.identity_keys[i]; | 1494 | key = options.identity_keys[i]; |
1497 | if (key && key->type == KEY_RSA1) | 1495 | if (key && key->type == KEY_RSA1) |
1498 | continue; | 1496 | continue; |
@@ -1610,7 +1608,7 @@ userauth_pubkey(Authctxt *authctxt) | |||
1610 | debug("Offering %s public key: %s", key_type(id->key), | 1608 | debug("Offering %s public key: %s", key_type(id->key), |
1611 | id->filename); | 1609 | id->filename); |
1612 | sent = send_pubkey_test(authctxt, id); | 1610 | sent = send_pubkey_test(authctxt, id); |
1613 | } else if (id->key == NULL && id->filename) { | 1611 | } else if (id->key == NULL) { |
1614 | debug("Trying private key: %s", id->filename); | 1612 | debug("Trying private key: %s", id->filename); |
1615 | id->key = load_identity_file(id->filename, | 1613 | id->key = load_identity_file(id->filename, |
1616 | id->userprovided); | 1614 | id->userprovided); |