summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/ssh.c b/ssh.c
index 219a46677..550288919 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1525,7 +1525,7 @@ ssh_session2(void)
1525static void 1525static void
1526load_public_identity_files(void) 1526load_public_identity_files(void)
1527{ 1527{
1528 char *filename, *cp, thishost[NI_MAXHOST], *fp; 1528 char *filename, *cp, thishost[NI_MAXHOST];
1529 char *pwdir = NULL, *pwname = NULL; 1529 char *pwdir = NULL, *pwname = NULL;
1530 int i = 0; 1530 int i = 0;
1531 Key *public; 1531 Key *public;
@@ -1583,22 +1583,6 @@ load_public_identity_files(void)
1583 public = key_load_public(filename, NULL); 1583 public = key_load_public(filename, NULL);
1584 debug("identity file %s type %d", filename, 1584 debug("identity file %s type %d", filename,
1585 public ? public->type : -1); 1585 public ? public->type : -1);
1586 if (public && blacklisted_key(public, &fp) == 1) {
1587 if (options.use_blacklisted_keys)
1588 logit("Public key %s blacklisted (see "
1589 "ssh-vulnkey(1)); continuing anyway", fp);
1590 else
1591 logit("Public key %s blacklisted (see "
1592 "ssh-vulnkey(1)); refusing to send it",
1593 fp);
1594 free(fp);
1595 if (!options.use_blacklisted_keys) {
1596 key_free(public);
1597 free(filename);
1598 filename = NULL;
1599 public = NULL;
1600 }
1601 }
1602 free(options.identity_files[i]); 1586 free(options.identity_files[i]);
1603 identity_files[n_ids] = filename; 1587 identity_files[n_ids] = filename;
1604 identity_keys[n_ids] = public; 1588 identity_keys[n_ids] = public;