New upstream release (6.8p1).

1 files changed, 24 insertions, 24 deletions

diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
index ab64cbed5..5bc70a566 100644
--- a/debian/patches/debian-banner.patch
+++ b/debian/patches/debian-banner.patch
@@ -1,4 +1,4 @@
-From 114c8a8fb488cbe39507edb75c51198a4b9e8b24 Mon Sep 17 00:00:00 2001
+From 2c31a85436f1eac46e185382c2aa15406ae6c0ac 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: 2014-10-07
+Last-Update: 2015-08-19
 
 Patch-Name: debian-banner.patch
 ---
@@ -19,45 +19,45 @@ Patch-Name: debian-banner.patch
  4 files changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/servconf.c b/servconf.c
-index a252487..6c7741a 100644
+index b3a2841..bec53e0 100644
 --- a/servconf.c
 +++ b/servconf.c
-@@ -160,6 +160,7 @@ initialize_server_options(ServerOptions *options)
-        options->ip_qos_interactive = -1;
+@@ -166,6 +166,7 @@ initialize_server_options(ServerOptions *options)
         options->ip_qos_bulk = -1;
         options->version_addendum = NULL;
+        options->fingerprint_hash = -1;
 +       options->debian_banner = -1;
  }
  
- void
-@@ -321,6 +322,8 @@ fill_default_server_options(ServerOptions *options)
-                options->fwd_opts.streamlocal_bind_mask = 0177;
-        if (options->fwd_opts.streamlocal_bind_unlink == -1)
+ /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */
+@@ -342,6 +343,8 @@ fill_default_server_options(ServerOptions *options)
                 options->fwd_opts.streamlocal_bind_unlink = 0;
+        if (options->fingerprint_hash == -1)
+                options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
 +       if (options->debian_banner == -1)
 +               options->debian_banner = 1;
         /* Turn privilege separation on by default */
         if (use_privsep == -1)
                 use_privsep = PRIVSEP_NOSANDBOX;
-@@ -373,6 +376,7 @@ typedef enum {
+@@ -412,6 +415,7 @@ typedef enum {
         sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,
         sStreamLocalBindMask, sStreamLocalBindUnlink,
-        sAllowStreamLocalForwarding,
+        sAllowStreamLocalForwarding, sFingerprintHash,
 +       sDebianBanner,
         sDeprecated, sUnsupported
  } ServerOpCodes;
  
-@@ -514,6 +518,7 @@ static struct {
-        { "streamlocalbindmask", sStreamLocalBindMask, SSHCFG_ALL },
+@@ -556,6 +560,7 @@ static struct {
         { "streamlocalbindunlink", sStreamLocalBindUnlink, SSHCFG_ALL },
         { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL },
+        { "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },
 +       { "debianbanner", sDebianBanner, SSHCFG_GLOBAL },
         { NULL, sBadOption, 0 }
  };
  
-@@ -1697,6 +1702,10 @@ process_server_config_line(ServerOptions *options, char *line,
-                intptr = &options->fwd_opts.streamlocal_bind_unlink;
-                goto parse_flag;
+@@ -1777,6 +1782,10 @@ process_server_config_line(ServerOptions *options, char *line,
+                        options->fingerprint_hash = value;
+                break;
  
 +       case sDebianBanner:
 +               intptr = &options->debian_banner;
@@ -67,23 +67,23 @@ index a252487..6c7741a 100644
                 logit("%s line %d: Deprecated option %s",
                     filename, linenum, arg);
 diff --git a/servconf.h b/servconf.h
-index f8265a8..fa48804 100644
+index d2ed4d7..ed0f171 100644
 --- a/servconf.h
 +++ b/servconf.h
-@@ -188,6 +188,8 @@ typedef struct {
- 
-        u_int   num_auth_methods;
+@@ -192,6 +192,8 @@ typedef struct {
         char   *auth_methods[MAX_AUTH_METHODS];
+ 
+        int     fingerprint_hash;
 +
 +       int     debian_banner;
  }       ServerOptions;
  
  /* Information about the incoming connection as used by Match */
 diff --git a/sshd.c b/sshd.c
-index 1710e71..87331c1 100644
+index c362209..5435968 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -443,7 +443,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
+@@ -442,7 +442,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
         }
  
         xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
@@ -94,10 +94,10 @@ index 1710e71..87331c1 100644
             options.version_addendum, newline);
  
 diff --git a/sshd_config.5 b/sshd_config.5
-index 2843048..58997d3 100644
+index d14576e..ec58635 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -447,6 +447,11 @@ or
+@@ -476,6 +476,11 @@ or
  .Dq no .
  The default is
  .Dq delayed .