diff options
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 20 |
1 files changed, 18 insertions, 2 deletions
@@ -680,7 +680,7 @@ main(int ac, char **av) | |||
680 | /* Do not allocate a tty if stdin is not a tty. */ | 680 | /* Do not allocate a tty if stdin is not a tty. */ |
681 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && | 681 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && |
682 | options.request_tty != REQUEST_TTY_FORCE) { | 682 | options.request_tty != REQUEST_TTY_FORCE) { |
683 | if (tty_flag) | 683 | if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET) |
684 | logit("Pseudo-terminal will not be allocated because " | 684 | logit("Pseudo-terminal will not be allocated because " |
685 | "stdin is not a terminal."); | 685 | "stdin is not a terminal."); |
686 | tty_flag = 0; | 686 | tty_flag = 0; |
@@ -1492,7 +1492,7 @@ ssh_session2(void) | |||
1492 | static void | 1492 | static void |
1493 | load_public_identity_files(void) | 1493 | load_public_identity_files(void) |
1494 | { | 1494 | { |
1495 | char *filename, *cp, thishost[NI_MAXHOST]; | 1495 | char *filename, *cp, thishost[NI_MAXHOST], *fp; |
1496 | char *pwdir = NULL, *pwname = NULL; | 1496 | char *pwdir = NULL, *pwname = NULL; |
1497 | int i = 0; | 1497 | int i = 0; |
1498 | Key *public; | 1498 | Key *public; |
@@ -1549,6 +1549,22 @@ load_public_identity_files(void) | |||
1549 | public = key_load_public(filename, NULL); | 1549 | public = key_load_public(filename, NULL); |
1550 | debug("identity file %s type %d", filename, | 1550 | debug("identity file %s type %d", filename, |
1551 | public ? public->type : -1); | 1551 | public ? public->type : -1); |
1552 | if (public && blacklisted_key(public, &fp) == 1) { | ||
1553 | if (options.use_blacklisted_keys) | ||
1554 | logit("Public key %s blacklisted (see " | ||
1555 | "ssh-vulnkey(1)); continuing anyway", fp); | ||
1556 | else | ||
1557 | logit("Public key %s blacklisted (see " | ||
1558 | "ssh-vulnkey(1)); refusing to send it", | ||
1559 | fp); | ||
1560 | xfree(fp); | ||
1561 | if (!options.use_blacklisted_keys) { | ||
1562 | key_free(public); | ||
1563 | xfree(filename); | ||
1564 | filename = NULL; | ||
1565 | public = NULL; | ||
1566 | } | ||
1567 | } | ||
1552 | xfree(options.identity_files[i]); | 1568 | xfree(options.identity_files[i]); |
1553 | identity_files[n_ids] = filename; | 1569 | identity_files[n_ids] = filename; |
1554 | identity_keys[n_ids] = public; | 1570 | identity_keys[n_ids] = public; |