1 files changed, 26 insertions, 27 deletions

diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
index 0d998fdd4..47a2fe372 100644
--- a/debian/patches/debian-banner.patch
+++ b/debian/patches/debian-banner.patch
@@ -1,4 +1,4 @@
-From 7d20d00ea24ec0c3fffacc80ab271d0699d198c6 Mon Sep 17 00:00:00 2001
+From 90c1c8771b61dd3ee0eacb4e1cfac404dc42f4b0 Mon Sep 17 00:00:00 2001
 From: Kees Cook <kees@debian.org>
 Date: Sun, 9 Feb 2014 16:10:06 +0000
 Subject: Add DebianBanner server configuration option
@@ -8,7 +8,7 @@ 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
+Last-Update: 2020-06-07
 
 Patch-Name: debian-banner.patch
 ---
@@ -17,24 +17,24 @@ Patch-Name: debian-banner.patch
  servconf.c    | 9 +++++++++
  servconf.h    | 2 ++
  sshconnect.c  | 2 +-
- sshd.c        | 3 ++-
+ sshd.c        | 2 +-
  sshd_config.5 | 5 +++++
- 7 files changed, 23 insertions(+), 5 deletions(-)
+ 7 files changed, 22 insertions(+), 5 deletions(-)
 
 diff --git a/kex.c b/kex.c
-index f638942d3..2abfbb95a 100644
+index 0e64bf760..aa5acaac3 100644
 --- a/kex.c
 +++ b/kex.c
-@@ -1226,7 +1226,7 @@ send_error(struct ssh *ssh, char *msg)
+@@ -1225,7 +1225,7 @@ send_error(struct ssh *ssh, char *msg)
   */
  int
  kex_exchange_identification(struct ssh *ssh, int timeout_ms,
 -    const char *version_addendum)
 +    int debian_banner, const char *version_addendum)
  {
-        int remote_major, remote_minor, mismatch;
+        int remote_major, remote_minor, mismatch, oerrno = 0;
         size_t len, i, n;
-@@ -1244,7 +1244,8 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
+@@ -1243,7 +1243,8 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
         if (version_addendum != NULL && *version_addendum == '\0')
                 version_addendum = NULL;
         if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n",
@@ -43,7 +43,7 @@ index f638942d3..2abfbb95a 100644
 +           debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM,
             version_addendum == NULL ? "" : " ",
             version_addendum == NULL ? "" : version_addendum)) != 0) {
-                error("%s: sshbuf_putf: %s", __func__, ssh_err(r));
+                oerrno = errno;
 diff --git a/kex.h b/kex.h
 index fe7141414..938dca03b 100644
 --- a/kex.h
@@ -58,7 +58,7 @@ index fe7141414..938dca03b 100644
  struct kex *kex_new(void);
  int     kex_ready(struct ssh *, char *[PROPOSAL_MAX]);
 diff --git a/servconf.c b/servconf.c
-index bf3cd84a4..7bbc25c2e 100644
+index ff5b9436c..cf4e52f3b 100644
 --- a/servconf.c
 +++ b/servconf.c
 @@ -194,6 +194,7 @@ initialize_server_options(ServerOptions *options)
@@ -94,7 +94,7 @@ index bf3cd84a4..7bbc25c2e 100644
         { NULL, sBadOption, 0 }
  };
  
-@@ -2382,6 +2387,10 @@ process_server_config_line_depth(ServerOptions *options, char *line,
+@@ -2393,6 +2398,10 @@ process_server_config_line_depth(ServerOptions *options, char *line,
                         *charptr = xstrdup(arg);
                 break;
  
@@ -106,10 +106,10 @@ index bf3cd84a4..7bbc25c2e 100644
         case sIgnore:
         case sUnsupported:
 diff --git a/servconf.h b/servconf.h
-index 3f47ea25e..3fa05fcac 100644
+index 253cad97e..5a2b60512 100644
 --- a/servconf.h
 +++ b/servconf.h
-@@ -221,6 +221,8 @@ typedef struct {
+@@ -226,6 +226,8 @@ typedef struct {
         int     expose_userauth_info;
         u_int64_t timing_secret;
         char   *sk_provider;
@@ -119,37 +119,36 @@ index 3f47ea25e..3fa05fcac 100644
  
  /* Information about the incoming connection as used by Match */
 diff --git a/sshconnect.c b/sshconnect.c
-index b796d3c8a..9f2412e0d 100644
+index f20d3e792..1e5b8ea5a 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
-@@ -1292,7 +1292,7 @@ ssh_login(struct ssh *ssh, Sensitive *sensitive, const char *orighost,
+@@ -1293,7 +1293,7 @@ ssh_login(struct ssh *ssh, Sensitive *sensitive, const char *orighost,
         lowercase(host);
  
         /* Exchange protocol version identification strings with the server. */
--       if (kex_exchange_identification(ssh, timeout_ms, NULL) != 0)
-+       if (kex_exchange_identification(ssh, timeout_ms, 1, NULL) != 0)
-                cleanup_exit(255); /* error already logged */
+-       if ((r = kex_exchange_identification(ssh, timeout_ms, NULL)) != 0)
++       if ((r = kex_exchange_identification(ssh, timeout_ms, 1, NULL)) != 0)
+                sshpkt_fatal(ssh, r, "banner exchange");
  
         /* Put the connection into non-blocking mode. */
 diff --git a/sshd.c b/sshd.c
-index 65916fc6d..da876a900 100644
+index e8b332ca4..baee13506 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -2187,7 +2187,8 @@ main(int ac, char **av)
+@@ -2181,7 +2181,7 @@ main(int ac, char **av)
         if (!debug_flag)
                 alarm(options.login_grace_time);
  
--       if (kex_exchange_identification(ssh, -1, options.version_addendum) != 0)
-+       if (kex_exchange_identification(ssh, -1, options.debian_banner,
-+           options.version_addendum) != 0)
-                cleanup_exit(255); /* error already logged */
+-       if ((r = kex_exchange_identification(ssh, -1,
++       if ((r = kex_exchange_identification(ssh, -1, options.debian_banner,
+            options.version_addendum)) != 0)
+                sshpkt_fatal(ssh, r, "banner exchange");
  
-        ssh_packet_set_nonblocking(ssh);
 diff --git a/sshd_config.5 b/sshd_config.5
-index ebd09f891..c926f584c 100644
+index 9f093be1f..753ceda10 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -542,6 +542,11 @@ or
+@@ -540,6 +540,11 @@ or
  .Cm no .
  The default is
  .Cm yes .