diff options
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -422,7 +422,8 @@ sshd_exchange_identification(int sock_in, int sock_out) | |||
422 | minor = PROTOCOL_MINOR_1; | 422 | minor = PROTOCOL_MINOR_1; |
423 | } | 423 | } |
424 | snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor, | 424 | snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor, |
425 | SSH_VERSION, newline); | 425 | options.debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM, |
426 | newline); | ||
426 | server_version_string = xstrdup(buf); | 427 | server_version_string = xstrdup(buf); |
427 | 428 | ||
428 | /* Send our protocol version identification. */ | 429 | /* Send our protocol version identification. */ |
@@ -1576,6 +1577,11 @@ main(int ac, char **av) | |||
1576 | sensitive_data.host_keys[i] = NULL; | 1577 | sensitive_data.host_keys[i] = NULL; |
1577 | continue; | 1578 | continue; |
1578 | } | 1579 | } |
1580 | if (auth_key_is_revoked(key, 1)) { | ||
1581 | key_free(key); | ||
1582 | sensitive_data.host_keys[i] = NULL; | ||
1583 | continue; | ||
1584 | } | ||
1579 | switch (key->type) { | 1585 | switch (key->type) { |
1580 | case KEY_RSA1: | 1586 | case KEY_RSA1: |
1581 | sensitive_data.ssh1_host_key = key; | 1587 | sensitive_data.ssh1_host_key = key; |