summaryrefslogtreecommitdiff
path: root/kex.c
diff options
context:
space:
mode:
authorKees Cook <kees@debian.org>2014-02-09 16:10:06 +0000
committerColin Watson <cjwatson@debian.org>2019-06-05 13:11:52 +0100
commit085c44daefaee16df97e1b2a0967b2140cc86de0 (patch)
tree4db0ecfc67c71202126eda6812fac6e49fa20f97 /kex.c
parent85e700a732e9a308eeee67f5a284e19fd6befbb8 (diff)
Add DebianBanner server configuration option
Setting this to "no" causes sshd to omit the Debian revision from its initial protocol handshake, for those scared by package-versioning.patch. Bug-Debian: http://bugs.debian.org/562048 Forwarded: not-needed Last-Update: 2019-06-05 Patch-Name: debian-banner.patch
Diffstat (limited to 'kex.c')
-rw-r--r--kex.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kex.c b/kex.c
index be354206d..bbb7a2340 100644
--- a/kex.c
+++ b/kex.c
@@ -1168,7 +1168,7 @@ send_error(struct ssh *ssh, char *msg)
1168 */ 1168 */
1169int 1169int
1170kex_exchange_identification(struct ssh *ssh, int timeout_ms, 1170kex_exchange_identification(struct ssh *ssh, int timeout_ms,
1171 const char *version_addendum) 1171 int debian_banner, const char *version_addendum)
1172{ 1172{
1173 int remote_major, remote_minor, mismatch; 1173 int remote_major, remote_minor, mismatch;
1174 size_t len, i, n; 1174 size_t len, i, n;
@@ -1186,7 +1186,8 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
1186 if (version_addendum != NULL && *version_addendum == '\0') 1186 if (version_addendum != NULL && *version_addendum == '\0')
1187 version_addendum = NULL; 1187 version_addendum = NULL;
1188 if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n", 1188 if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n",
1189 PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, 1189 PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2,
1190 debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM,
1190 version_addendum == NULL ? "" : " ", 1191 version_addendum == NULL ? "" : " ",
1191 version_addendum == NULL ? "" : version_addendum)) != 0) { 1192 version_addendum == NULL ? "" : version_addendum)) != 0) {
1192 error("%s: sshbuf_putf: %s", __func__, ssh_err(r)); 1193 error("%s: sshbuf_putf: %s", __func__, ssh_err(r));