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>2020-02-21 12:08:02 +0000
commit7d20d00ea24ec0c3fffacc80ab271d0699d198c6 (patch)
tree2a59419afa18a01c9f1982fad485111e1d4fd6ac /kex.c
parenta4f868858c3395cacb59c58786b501317b9a3d03 (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: 2020-02-21 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 f638942d3..2abfbb95a 100644
--- a/kex.c
+++ b/kex.c
@@ -1226,7 +1226,7 @@ send_error(struct ssh *ssh, char *msg)
1226 */ 1226 */
1227int 1227int
1228kex_exchange_identification(struct ssh *ssh, int timeout_ms, 1228kex_exchange_identification(struct ssh *ssh, int timeout_ms,
1229 const char *version_addendum) 1229 int debian_banner, const char *version_addendum)
1230{ 1230{
1231 int remote_major, remote_minor, mismatch; 1231 int remote_major, remote_minor, mismatch;
1232 size_t len, i, n; 1232 size_t len, i, n;
@@ -1244,7 +1244,8 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
1244 if (version_addendum != NULL && *version_addendum == '\0') 1244 if (version_addendum != NULL && *version_addendum == '\0')
1245 version_addendum = NULL; 1245 version_addendum = NULL;
1246 if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n", 1246 if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n",
1247 PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, 1247 PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2,
1248 debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM,
1248 version_addendum == NULL ? "" : " ", 1249 version_addendum == NULL ? "" : " ",
1249 version_addendum == NULL ? "" : version_addendum)) != 0) { 1250 version_addendum == NULL ? "" : version_addendum)) != 0) {
1250 error("%s: sshbuf_putf: %s", __func__, ssh_err(r)); 1251 error("%s: sshbuf_putf: %s", __func__, ssh_err(r));