New upstream release (7.8p1)

Closes: #907534

1 files changed, 13 insertions, 13 deletions

diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
index 9062918f6..98d97dce8 100644
--- a/debian/patches/debian-banner.patch
+++ b/debian/patches/debian-banner.patch
@@ -1,4 +1,4 @@
-From 9ec4db016a0510c449f9cefeb3299c2e755698c7 Mon Sep 17 00:00:00 2001
+From 905ffae23105d59b013aac809da6195d231b0395 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: 2018-04-03
+Last-Update: 2018-08-24
 
 Patch-Name: debian-banner.patch
 ---
@@ -19,10 +19,10 @@ Patch-Name: debian-banner.patch
  4 files changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/servconf.c b/servconf.c
-index 3fff3d531..0a8f6fd62 100644
+index e49984a81..bb43a649c 100644
 --- a/servconf.c
 +++ b/servconf.c
-@@ -177,6 +177,7 @@ initialize_server_options(ServerOptions *options)
+@@ -181,6 +181,7 @@ initialize_server_options(ServerOptions *options)
         options->fingerprint_hash = -1;
         options->disable_forwarding = -1;
         options->expose_userauth_info = -1;
@@ -30,7 +30,7 @@ index 3fff3d531..0a8f6fd62 100644
  }
  
  /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */
-@@ -393,6 +394,8 @@ fill_default_server_options(ServerOptions *options)
+@@ -413,6 +414,8 @@ fill_default_server_options(ServerOptions *options)
                 options->disable_forwarding = 0;
         if (options->expose_userauth_info == -1)
                 options->expose_userauth_info = 0;
@@ -39,7 +39,7 @@ index 3fff3d531..0a8f6fd62 100644
  
         assemble_algorithms(options);
  
-@@ -480,6 +483,7 @@ typedef enum {
+@@ -500,6 +503,7 @@ typedef enum {
         sStreamLocalBindMask, sStreamLocalBindUnlink,
         sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,
         sExposeAuthInfo, sRDomain,
@@ -47,7 +47,7 @@ index 3fff3d531..0a8f6fd62 100644
         sDeprecated, sIgnore, sUnsupported
  } ServerOpCodes;
  
-@@ -634,6 +638,7 @@ static struct {
+@@ -656,6 +660,7 @@ static struct {
         { "disableforwarding", sDisableForwarding, SSHCFG_ALL },
         { "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL },
         { "rdomain", sRDomain, SSHCFG_ALL },
@@ -55,7 +55,7 @@ index 3fff3d531..0a8f6fd62 100644
         { NULL, sBadOption, 0 }
  };
  
-@@ -2056,6 +2061,10 @@ process_server_config_line(ServerOptions *options, char *line,
+@@ -2164,6 +2169,10 @@ process_server_config_line(ServerOptions *options, char *line,
                         *charptr = xstrdup(arg);
                 break;
  
@@ -67,20 +67,20 @@ index 3fff3d531..0a8f6fd62 100644
         case sIgnore:
         case sUnsupported:
 diff --git a/servconf.h b/servconf.h
-index 5dfc9bc02..b0fa70455 100644
+index 9b117fe27..76098119b 100644
 --- a/servconf.h
 +++ b/servconf.h
 @@ -211,6 +211,8 @@ typedef struct {
- 
         int     fingerprint_hash;
         int     expose_userauth_info;
+        u_int64_t timing_secret;
 +
 +       int     debian_banner;
  }       ServerOptions;
  
  /* Information about the incoming connection as used by Match */
 diff --git a/sshd.c b/sshd.c
-index 9a7f5495c..1d645a170 100644
+index ffd3dad6a..698593605 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -384,7 +384,8 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
@@ -94,10 +94,10 @@ index 9a7f5495c..1d645a170 100644
             options.version_addendum);
  
 diff --git a/sshd_config.5 b/sshd_config.5
-index 1a1c6dd09..45044a70f 100644
+index 0fbbccbde..96a69ab55 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -531,6 +531,11 @@ or
+@@ -532,6 +532,11 @@ or
  .Cm no .
  The default is
  .Cm yes .