New upstream release (7.6p1)

author: Colin Watson <cjwatson@debian.org> 2017-10-04 11:23:58 +0100
committer: Colin Watson <cjwatson@debian.org> 2017-10-05 23:58:12 +0100
commit: 0556ea972b15607b7e13ff31bc05840881c91dd3 (patch)
tree: d6b8d48062d0278b5ae0eeff42d0e9afa9f26860 /debian/patches
parent: db2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92 (diff)
parent: 801a62eedaaf47b20dbf4b426dc3e084bf0c8d49 (diff)
34 files changed, 352 insertions, 570 deletions
diff --git a/debian/patches/auth-log-verbosity.patch b/debian/patches/auth-log-verbosity.patch
index fb3855f9a..ba7642d83 100644
--- a/debian/patches/auth-log-verbosity.patch
+++ b/debian/patches/auth-log-verbosity.patch
@@ -1,11 +1,11 @@
-From e08f96cf1105a3ee9a23de7102d593443e031e0c Mon Sep 17 00:00:00 2001
+From 50e9edb57b6808cbbf63fe3433febb103baac1e8 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:02 +0000
 Subject: Quieten logs when multiple from= restrictions are used
 Bug-Debian: http://bugs.debian.org/630606
 Forwarded: no
-Last-Update: 2013-09-14
+Last-Update: 2017-10-04
 Patch-Name: auth-log-verbosity.patch
 ---
@@ -15,10 +15,10 @@ Patch-Name: auth-log-verbosity.patch
 3 files changed, 30 insertions(+), 9 deletions(-)
 diff --git a/auth-options.c b/auth-options.c
-index 57b49f7f..7eb87b35 100644
+index bed00eef..ccdd0b20 100644
 --- a/auth-options.c
 +++ b/auth-options.c
-@@ -59,8 +59,19 @@ int forced_tun_device = -1;
+@@ -59,10 +59,21 @@ int forced_tun_device = -1;
 /* "principals=" option. */
 char *authorized_principals = NULL;
 
@@ -28,6 +28,8 @@ index 57b49f7f..7eb87b35 100644
 +
 extern ServerOptions options;
 
+ /* XXX refactor to be stateless */
+ 
 +void
 +auth_start_parse_options(void)
 +{
@@ -38,7 +40,7 @@ index 57b49f7f..7eb87b35 100644
 void
 auth_clear_options(void)
 {
-@@ -316,10 +327,13 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
+@@ -322,10 +333,13 @@ auth_parse_options(struct passwd *pw, char *opts, const char *file,
                                /* FALLTHROUGH */
                        case 0:
                                free(patterns);
@@ -56,7 +58,7 @@ index 57b49f7f..7eb87b35 100644
                                auth_debug_add("Your host '%.200s' is not "
                                    "permitted to use this key for login.",
                                    remote_host);
-@@ -543,11 +557,14 @@ parse_option_list(struct sshbuf *oblob, struct passwd *pw,
+@@ -549,11 +563,14 @@ parse_option_list(struct sshbuf *oblob, struct passwd *pw,
                                        break;
                                case 0:
                                        /* no match */
@@ -77,7 +79,7 @@ index 57b49f7f..7eb87b35 100644
                                            "is not permitted to use this "
                                            "certificate for login.",
 diff --git a/auth-options.h b/auth-options.h
-index 52cbb42a..82355276 100644
+index 547f0163..4de0f14d 100644
 --- a/auth-options.h
 +++ b/auth-options.h
 @@ -33,6 +33,7 @@ extern int forced_tun_device;
@@ -85,14 +87,14 @@ index 52cbb42a..82355276 100644
 extern char *authorized_principals;
 
 +void   auth_start_parse_options(void);
- int    auth_parse_options(struct passwd *, char *, char *, u_long);
+ int    auth_parse_options(struct passwd *, char *, const char *, u_long);
 void   auth_clear_options(void);
 int    auth_cert_options(struct sshkey *, struct passwd *, const char **);
 diff --git a/auth2-pubkey.c b/auth2-pubkey.c
-index 3e5706f4..6dc5076e 100644
+index 169839b0..43f880b6 100644
 --- a/auth2-pubkey.c
 +++ b/auth2-pubkey.c
-@@ -566,6 +566,7 @@ process_principals(FILE *f, char *file, struct passwd *pw,
+@@ -269,6 +269,7 @@ process_principals(FILE *f, const char *file, struct passwd *pw,
        u_long linenum = 0;
        u_int i, found_principal = 0;
 
@@ -100,16 +102,16 @@ index 3e5706f4..6dc5076e 100644
        while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
                /* Always consume entire input */
                if (found_principal)
-@@ -771,6 +772,7 @@ check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw)
+@@ -471,6 +472,7 @@ check_authkeys_file(FILE *f, char *file, struct sshkey *key, struct passwd *pw)
-        found_key = 0;
+        u_long linenum = 0;
+        struct sshkey *found = NULL;
 
-        found = NULL;
 +       auth_start_parse_options();
        while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
                char *cp, *key_options = NULL, *fp = NULL;
                const char *reason = NULL;
-@@ -921,6 +923,7 @@ user_cert_trusted_ca(struct passwd *pw, Key *key)
+@@ -624,6 +626,7 @@ user_cert_trusted_ca(struct passwd *pw, struct sshkey *key)
-        if (key_cert_check_authority(key, 0, 1,
+        if (sshkey_cert_check_authority(key, 0, 1,
            use_authorized_principals ? NULL : pw->pw_name, &reason) != 0)
                goto fail_reason;
 +       auth_start_parse_options();
diff --git a/debian/patches/authorized-keys-man-symlink.patch b/debian/patches/authorized-keys-man-symlink.patch
index 9287f84e2..56f6de37f 100644
--- a/debian/patches/authorized-keys-man-symlink.patch
+++ b/debian/patches/authorized-keys-man-symlink.patch
@@ -1,4 +1,4 @@
-From 603fd07727100d4d95d4ac2853a160878cf16b66 Mon Sep 17 00:00:00 2001
+From 312eb64a9faf4e8cdb95f2ae147ecbfa6c0efd83 Mon Sep 17 00:00:00 2001
 From: Tomas Pospisek <tpo_deb@sourcepole.ch>
 Date: Sun, 9 Feb 2014 16:10:07 +0000
 Subject: Install authorized_keys(5) as a symlink to sshd(8)
@@ -13,10 +13,10 @@ Patch-Name: authorized-keys-man-symlink.patch
 1 file changed, 1 insertion(+)
 diff --git a/Makefile.in b/Makefile.in
-index 6b774c1a..0577a6c4 100644
+index f6e9fe4c..08b989a4 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -339,6 +339,7 @@ install-files:
+@@ -340,6 +340,7 @@ install-files:
        $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
        $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
        $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
index 0939035cd..8134afba4 100644
--- a/debian/patches/debian-banner.patch
+++ b/debian/patches/debian-banner.patch
@@ -1,4 +1,4 @@
-From 0eb0f49c5c32940fd192ef98e0d13bf5407da27b Mon Sep 17 00:00:00 2001
+From ae96c03ce51af2c529bfa2f2de57f4fa938ea552 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: 2015-11-29
+Last-Update: 2017-10-04
 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 ca73f7c5..a391cf4b 100644
+index 9889fb0a..b0146405 100644
 --- a/servconf.c
 +++ b/servconf.c
-@@ -166,6 +166,7 @@ initialize_server_options(ServerOptions *options)
+@@ -167,6 +167,7 @@ initialize_server_options(ServerOptions *options)
-        options->version_addendum = NULL;
        options->fingerprint_hash = -1;
        options->disable_forwarding = -1;
+        options->expose_userauth_info = -1;
 +       options->debian_banner = -1;
 }
 
 /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */
-@@ -339,6 +340,8 @@ fill_default_server_options(ServerOptions *options)
+@@ -342,6 +343,8 @@ fill_default_server_options(ServerOptions *options)
-                options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
-        if (options->disable_forwarding == -1)
                options->disable_forwarding = 0;
+        if (options->expose_userauth_info == -1)
+                options->expose_userauth_info = 0;
 +       if (options->debian_banner == -1)
 +               options->debian_banner = 1;
 
        assemble_algorithms(options);
 
-@@ -425,6 +428,7 @@ typedef enum {
+@@ -429,6 +432,7 @@ typedef enum {
-        sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,
        sStreamLocalBindMask, sStreamLocalBindUnlink,
        sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,
+        sExposeAuthInfo,
 +       sDebianBanner,
        sDeprecated, sIgnore, sUnsupported
 } ServerOpCodes;
 
-@@ -577,6 +581,7 @@ static struct {
+@@ -582,6 +586,7 @@ static struct {
-        { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL },
        { "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },
        { "disableforwarding", sDisableForwarding, SSHCFG_ALL },
+        { "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL },
 +       { "debianbanner", sDebianBanner, SSHCFG_GLOBAL },
        { NULL, sBadOption, 0 }
 };
 
-@@ -1866,6 +1871,10 @@ process_server_config_line(ServerOptions *options, char *line,
+@@ -1907,6 +1912,10 @@ process_server_config_line(ServerOptions *options, char *line,
-                        options->fingerprint_hash = value;
+                intptr = &options->expose_userauth_info;
-                break;
+                goto parse_flag;
 
 +       case sDebianBanner:
 +               intptr = &options->debian_banner;
@@ -67,20 +67,20 @@ index ca73f7c5..a391cf4b 100644
        case sIgnore:
        case sUnsupported:
 diff --git a/servconf.h b/servconf.h
-index 90dfa4c2..913a21b3 100644
+index 641e93c8..410c4275 100644
 --- a/servconf.h
 +++ b/servconf.h
-@@ -191,6 +191,8 @@ typedef struct {
+@@ -200,6 +200,8 @@ typedef struct {
-        char   *auth_methods[MAX_AUTH_METHODS];
 
        int     fingerprint_hash;
+        int     expose_userauth_info;
 +
 +       int     debian_banner;
 }       ServerOptions;
 
 /* Information about the incoming connection as used by Match */
 diff --git a/sshd.c b/sshd.c
-index 602f4740..f2f54b51 100644
+index eccf81bb..a5a1193d 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -378,7 +378,8 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
@@ -94,7 +94,7 @@ index 602f4740..f2f54b51 100644
            options.version_addendum);
 
 diff --git a/sshd_config.5 b/sshd_config.5
-index 41ec6688..5f316481 100644
+index 7db25552..41e8c939 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
 @@ -530,6 +530,11 @@ or
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index d65ed45fa..a3f595752 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,4 +1,4 @@
-From cf60afd3438c444e20b114fbd799168002c74aae Mon Sep 17 00:00:00 2001
+From 4847e512c0b94c615b838904a5f139a761bee284 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:18 +0000
 Subject: Various Debian-specific configuration changes
@@ -26,7 +26,7 @@ Document all of this.
 Author: Russ Allbery <rra@debian.org>
 Forwarded: not-needed
-Last-Update: 2016-12-26
+Last-Update: 2017-10-04
 Patch-Name: debian-config.patch
 ---
@@ -39,10 +39,10 @@ Patch-Name: debian-config.patch
 6 files changed, 77 insertions(+), 9 deletions(-)
 diff --git a/readconf.c b/readconf.c
-index 70fac682..4d92d174 100644
+index be3d5873..41f36aa8 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -1950,7 +1950,7 @@ fill_default_options(Options * options)
+@@ -1940,7 +1940,7 @@ fill_default_options(Options * options)
        if (options->forward_x11 == -1)
                options->forward_x11 = 0;
        if (options->forward_x11_trusted == -1)
@@ -52,10 +52,10 @@ index 70fac682..4d92d174 100644
                options->forward_x11_timeout = 1200;
        /*
 diff --git a/ssh.1 b/ssh.1
-index 22e56a7b..6aa57c46 100644
+index 711fe608..f1b01c56 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -785,6 +785,16 @@ directive in
+@@ -764,6 +764,16 @@ directive in
 .Xr ssh_config 5
 for more information.
 .Pp
@@ -72,7 +72,7 @@ index 22e56a7b..6aa57c46 100644
 .It Fl x
 Disables X11 forwarding.
 .Pp
-@@ -793,6 +803,17 @@ Enables trusted X11 forwarding.
+@@ -772,6 +782,17 @@ Enables trusted X11 forwarding.
 Trusted X11 forwardings are not subjected to the X11 SECURITY extension
 controls.
 .Pp
@@ -91,7 +91,7 @@ index 22e56a7b..6aa57c46 100644
 Send log information using the
 .Xr syslog 3
 diff --git a/ssh_config b/ssh_config
-index 4e879cd2..093c8366 100644
+index bcb9f153..1b676fb2 100644
 --- a/ssh_config
 +++ b/ssh_config
 @@ -17,9 +17,10 @@
@@ -103,10 +103,10 @@ index 4e879cd2..093c8366 100644
 #   ForwardAgent no
 #   ForwardX11 no
 +#   ForwardX11Trusted yes
- #   RhostsRSAAuthentication no
- #   RSAAuthentication yes
 #   PasswordAuthentication yes
-@@ -50,3 +51,6 @@
+ #   HostbasedAuthentication no
+ #   GSSAPIAuthentication no
+@@ -46,3 +47,6 @@
 #   VisualHostKey no
 #   ProxyCommand ssh -q -W %h:%p gateway.example.com
 #   RekeyLimit 1G 1h
@@ -114,10 +114,10 @@ index 4e879cd2..093c8366 100644
 +    HashKnownHosts yes
 +    GSSAPIAuthentication yes
 diff --git a/ssh_config.5 b/ssh_config.5
-index 093ea8a7..fc13fa51 100644
+index 1edfe761..2da7029a 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -74,6 +74,22 @@ Since the first obtained value for each parameter is used, more
+@@ -71,6 +71,22 @@ Since the first obtained value for each parameter is used, more
 host-specific declarations should be given near the beginning of the
 file, and general defaults at the end.
 .Pp
@@ -140,7 +140,7 @@ index 093ea8a7..fc13fa51 100644
 The file contains keyword-argument pairs, one per line.
 Lines starting with
 .Ql #
-@@ -715,11 +731,12 @@ elapsed.
+@@ -683,11 +699,12 @@ elapsed.
 .It Cm ForwardX11Trusted
 If this option is set to
 .Cm yes ,
@@ -204,10 +204,10 @@ index c01dd656..f68edf36 100644
 # Example of overriding settings on a per-user basis
 #Match User anoncvs
 diff --git a/sshd_config.5 b/sshd_config.5
-index 603c2ba7..cc5d9fb0 100644
+index 79676a95..16be4f62 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -57,6 +57,28 @@ Arguments may optionally be enclosed in double quotes
+@@ -55,6 +55,28 @@ Arguments may optionally be enclosed in double quotes
 .Pq \&"
 in order to represent arguments containing spaces.
 .Pp
diff --git a/debian/patches/dnssec-sshfp.patch b/debian/patches/dnssec-sshfp.patch
index 8f1f9bada..a8d98855a 100644
--- a/debian/patches/dnssec-sshfp.patch
+++ b/debian/patches/dnssec-sshfp.patch
@@ -1,4 +1,4 @@
-From 1e06dfb99d3a59ef0b0a804ed1c2a590b3fab71c Mon Sep 17 00:00:00 2001
+From f500e89e2310f6308a998357d72d767e3b01553c Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:01 +0000
 Subject: Force use of DNSSEC even if "options edns0" isn't in resolv.conf
@@ -18,7 +18,7 @@ Patch-Name: dnssec-sshfp.patch
 3 files changed, 21 insertions(+), 6 deletions(-)
 diff --git a/dns.c b/dns.c
-index e813afea..fce2e308 100644
+index 6e1abb53..8e0ca691 100644
 --- a/dns.c
 +++ b/dns.c
 @@ -206,6 +206,7 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
diff --git a/debian/patches/doc-hash-tab-completion.patch b/debian/patches/doc-hash-tab-completion.patch
index cc30ec4b5..c4342181d 100644
--- a/debian/patches/doc-hash-tab-completion.patch
+++ b/debian/patches/doc-hash-tab-completion.patch
@@ -1,4 +1,4 @@
-From b0c0c72ecdbef4ae020bbe17b47f1f616253722d Mon Sep 17 00:00:00 2001
+From a07f7c1fe9d8dc3bfe4cb8bbe6bb5a27b638d024 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:11 +0000
 Subject: Document that HashKnownHosts may break tab-completion
@@ -13,10 +13,10 @@ Patch-Name: doc-hash-tab-completion.patch
 1 file changed, 3 insertions(+)
 diff --git a/ssh_config.5 b/ssh_config.5
-index a04e5757..093ea8a7 100644
+index 7810a418..1edfe761 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -809,6 +809,9 @@ Note that existing names and addresses in known hosts files
+@@ -777,6 +777,9 @@ Note that existing names and addresses in known hosts files
 will not be converted automatically,
 but may be manually hashed using
 .Xr ssh-keygen 1 .
diff --git a/debian/patches/fix-incoming-compression-statistics.patch b/debian/patches/fix-incoming-compression-statistics.patch
deleted file mode 100644
index d948d67bc..000000000
--- a/debian/patches/fix-incoming-compression-statistics.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cda04ac1f5c69710187e602043758063479c3c65 Mon Sep 17 00:00:00 2001
-From: Russell Coker <russell@coker.com.au>
-Date: Tue, 6 Jun 2017 15:00:20 +0100
-Subject: Fix incoming compression statistics
-Bug-Debian: https://bugs.debian.org/797964
-Forwarded: https://lists.mindrot.org/pipermail/openssh-unix-dev/2017-June/036077.html
-Last-Update: 2017-06-06
-Patch-Name: fix-incoming-compression-statistics.patch
---
- packet.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/packet.c b/packet.c
-index 2f3a2ec7..6492b66f 100644
--- a/packet.c
-+++ b/packet.c
-@@ -606,7 +606,7 @@ ssh_packet_close(struct ssh *ssh)
-                                deflateEnd(stream);
-                }
-                if (state->compression_in_started) {
-                       z_streamp stream = &state->compression_out_stream;
-+                       z_streamp stream = &state->compression_in_stream;
-                        debug("compress incoming: "
-                            "raw data %llu, compressed %llu, factor %.2f",
-                            (unsigned long long)stream->total_out,
diff --git a/debian/patches/gnome-ssh-askpass2-icon.patch b/debian/patches/gnome-ssh-askpass2-icon.patch
index 5bfea56e9..e46c0f8b2 100644
--- a/debian/patches/gnome-ssh-askpass2-icon.patch
+++ b/debian/patches/gnome-ssh-askpass2-icon.patch
@@ -1,4 +1,4 @@
-From 28b830b6c22317c039ec2b2070fcd94bc3cf0477 Mon Sep 17 00:00:00 2001
+From 18950b79898be885c6b77d463367639647e54e28 Mon Sep 17 00:00:00 2001
 From: Vincent Untz <vuntz@ubuntu.com>
 Date: Sun, 9 Feb 2014 16:10:16 +0000
 Subject: Give the ssh-askpass-gnome window a default icon
diff --git a/debian/patches/gssapi.patch b/debian/patches/gssapi.patch
index deddbcb80..0726a5020 100644
--- a/debian/patches/gssapi.patch
+++ b/debian/patches/gssapi.patch
@@ -1,4 +1,4 @@
-From d51c7ac3328464dec21514fb398ab5c140a0664f Mon Sep 17 00:00:00 2001
+From 4e70490950e5c5134df48848affaf73685bf0284 Mon Sep 17 00:00:00 2001
 From: Simon Wilkinson <simon@sxw.org.uk>
 Date: Sun, 9 Feb 2014 16:09:48 +0000
 Subject: GSSAPI key exchange support
@@ -17,7 +17,7 @@ have it merged into the main openssh package rather than having separate
 security history.
 Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242
-Last-Updated: 2017-01-16
+Last-Updated: 2017-10-04
 Patch-Name: gssapi.patch
 ---
@@ -25,7 +25,7 @@ Patch-Name: gssapi.patch
 Makefile.in      |   3 +-
 auth-krb5.c      |  17 ++-
 auth.c           |  96 +---------------
- auth2-gss.c      |  48 +++++++-
+ auth2-gss.c      |  49 +++++++-
 auth2.c          |   2 +
 canohost.c       |  93 +++++++++++++++
 canohost.h       |   3 +
@@ -56,7 +56,7 @@ Patch-Name: gssapi.patch
 sshd_config.5    |  10 ++
 sshkey.c         |   3 +-
 sshkey.h         |   1 +
- 35 files changed, 2062 insertions(+), 147 deletions(-)
+ 35 files changed, 2063 insertions(+), 147 deletions(-)
 create mode 100644 ChangeLog.gssapi
 create mode 100644 kexgssc.c
 create mode 100644 kexgsss.c
@@ -181,7 +181,7 @@ index 00000000..f117a336
 +    (from jbasney AT ncsa.uiuc.edu)
 +    <gssapi-with-mic support is Bugzilla #1008>
 diff --git a/Makefile.in b/Makefile.in
-index 5870e9e6..6b774c1a 100644
+index c52ce191..f6e9fe4c 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -92,6 +92,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
@@ -189,7 +189,7 @@ index 5870e9e6..6b774c1a 100644
        kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \
        kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \
 +       kexgssc.o \
-        platform-pledge.o platform-tracing.o
+        platform-pledge.o platform-tracing.o platform-misc.o
 
 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
 @@ -105,7 +106,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o \
@@ -253,10 +253,10 @@ index a5a81ed2..38e7fee2 100644
        return (krb5_cc_resolve(ctx, ccname, ccache));
 }
 diff --git a/auth.c b/auth.c
-index 6ee6116d..c6390687 100644
+index a4490617..6aec3605 100644
 --- a/auth.c
 +++ b/auth.c
-@@ -372,7 +372,8 @@ auth_root_allowed(const char *method)
+@@ -395,7 +395,8 @@ auth_root_allowed(const char *method)
        case PERMIT_NO_PASSWD:
                if (strcmp(method, "publickey") == 0 ||
                    strcmp(method, "hostbased") == 0 ||
@@ -266,7 +266,7 @@ index 6ee6116d..c6390687 100644
                        return 1;
                break;
        case PERMIT_FORCED_ONLY:
-@@ -794,99 +795,6 @@ fakepw(void)
+@@ -727,99 +728,6 @@ fakepw(void)
        return (&fake);
 }
 
@@ -367,11 +367,11 @@ index 6ee6116d..c6390687 100644
  * Return the canonical name of the host in the other side of the current
  * connection.  The host name is cached, so it is efficient to call this
 diff --git a/auth2-gss.c b/auth2-gss.c
-index 1ca83577..3b5036df 100644
+index 589283b7..fd411d3a 100644
 --- a/auth2-gss.c
 +++ b/auth2-gss.c
 @@ -1,7 +1,7 @@
- /* $OpenBSD: auth2-gss.c,v 1.22 2015/01/19 20:07:45 markus Exp $ */
+ /* $OpenBSD: auth2-gss.c,v 1.26 2017/06/24 06:34:38 djm Exp $ */
 
 /*
 - * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -379,16 +379,17 @@ index 1ca83577..3b5036df 100644
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
-@@ -53,6 +53,40 @@ static int input_gssapi_mic(int type, u_int32_t plen, void *ctxt);
+@@ -53,6 +53,41 @@ static int input_gssapi_mic(int type, u_int32_t plen, struct ssh *ssh);
- static int input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt);
+ static int input_gssapi_exchange_complete(int type, u_int32_t plen, struct ssh *ssh);
- static int input_gssapi_errtok(int, u_int32_t, void *);
+ static int input_gssapi_errtok(int, u_int32_t, struct ssh *);
 
 +/* 
 + * The 'gssapi_keyex' userauth mechanism.
 + */
 +static int
-+userauth_gsskeyex(Authctxt *authctxt)
+userauth_gsskeyex(struct ssh *ssh)
 +{
+       Authctxt *authctxt = ssh->authctxt;
 +       int authenticated = 0;
 +       Buffer b;
 +       gss_buffer_desc mic, gssbuf;
@@ -420,7 +421,7 @@ index 1ca83577..3b5036df 100644
 /*
  * We only support those mechanisms that we know about (ie ones that we know
  * how to check local user kuserok and the like)
-@@ -238,7 +272,8 @@ input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt)
+@@ -240,7 +275,8 @@ input_gssapi_exchange_complete(int type, u_int32_t plen, struct ssh *ssh)
 
        packet_check_eom();
 
@@ -428,9 +429,9 @@ index 1ca83577..3b5036df 100644
 +       authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
 +           authctxt->pw));
 
-        authctxt->postponed = 0;
+        if ((!use_privsep || mm_is_monitor()) &&
-        dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
+            (displayname = ssh_gssapi_displayname()) != NULL)
-@@ -274,7 +309,8 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt)
+@@ -281,7 +317,8 @@ input_gssapi_mic(int type, u_int32_t plen, struct ssh *ssh)
        gssbuf.length = buffer_len(&b);
 
        if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic))))
@@ -440,7 +441,7 @@ index 1ca83577..3b5036df 100644
        else
                logit("GSSAPI MIC check failed");
 
-@@ -290,6 +326,12 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt)
+@@ -301,6 +338,12 @@ input_gssapi_mic(int type, u_int32_t plen, struct ssh *ssh)
        return 0;
 }
 
@@ -454,10 +455,10 @@ index 1ca83577..3b5036df 100644
        "gssapi-with-mic",
        userauth_gssapi,
 diff --git a/auth2.c b/auth2.c
-index 97dd2ef0..946e9235 100644
+index 862e0996..54070e3a 100644
 --- a/auth2.c
 +++ b/auth2.c
-@@ -70,6 +70,7 @@ extern Authmethod method_passwd;
+@@ -72,6 +72,7 @@ extern Authmethod method_passwd;
 extern Authmethod method_kbdint;
 extern Authmethod method_hostbased;
 #ifdef GSSAPI
@@ -465,7 +466,7 @@ index 97dd2ef0..946e9235 100644
 extern Authmethod method_gssapi;
 #endif
 
-@@ -77,6 +78,7 @@ Authmethod *authmethods[] = {
+@@ -79,6 +80,7 @@ Authmethod *authmethods[] = {
        &method_none,
        &method_pubkey,
 #ifdef GSSAPI
@@ -592,10 +593,10 @@ index 26d62855..0cadc9f1 100644
 int             get_peer_port(int);
 char           *get_local_ipaddr(int);
 diff --git a/clientloop.c b/clientloop.c
-index 06481623..38b0330e 100644
+index 791d336e..0010b833 100644
 --- a/clientloop.c
 +++ b/clientloop.c
-@@ -113,6 +113,10 @@
+@@ -112,6 +112,10 @@
 #include "ssherr.h"
 #include "hostfile.h"
 
@@ -606,13 +607,13 @@ index 06481623..38b0330e 100644
 /* import options */
 extern Options options;
 
-@@ -1664,9 +1668,18 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
+@@ -1349,9 +1353,18 @@ client_loop(struct ssh *ssh, int have_pty, int escape_char_arg,
                        break;
 
                /* Do channel operations unless rekeying in progress. */
-               if (!ssh_packet_is_rekeying(active_state))
+-               if (!ssh_packet_is_rekeying(ssh))
-+               if (!ssh_packet_is_rekeying(active_state)) {
+               if (!ssh_packet_is_rekeying(ssh)) {
-                        channel_after_select(readset, writeset);
+                        channel_after_select(ssh, readset, writeset);
 
 +#ifdef GSSAPI
 +                       if (options.gss_renewal_rekey &&
@@ -627,10 +628,10 @@ index 06481623..38b0330e 100644
                client_process_net_input(readset);
 
 diff --git a/config.h.in b/config.h.in
-index b65420e4..fd8a73f1 100644
+index 63fc548b..0b244fd5 100644
 --- a/config.h.in
 +++ b/config.h.in
-@@ -1670,6 +1670,9 @@
+@@ -1696,6 +1696,9 @@
 /* Use btmp to log bad logins */
 #undef USE_BTMP
 
@@ -640,7 +641,7 @@ index b65420e4..fd8a73f1 100644
 /* Use libedit for sftp */
 #undef USE_LIBEDIT
 
-@@ -1685,6 +1688,9 @@
+@@ -1711,6 +1714,9 @@
 /* Use PIPES instead of a socketpair() */
 #undef USE_PIPES
 
@@ -651,10 +652,10 @@ index b65420e4..fd8a73f1 100644
 #undef USE_SOLARIS_PRIVS
 
 diff --git a/configure.ac b/configure.ac
-index c2878e3d..ead34acf 100644
+index 889f5063..84bfad8c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -623,6 +623,30 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
+@@ -621,6 +621,30 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
            [Use tunnel device compatibility to OpenBSD])
        AC_DEFINE([SSH_TUN_PREPEND_AF], [1],
            [Prepend the address family to IP tunnel traffic])
@@ -1163,11 +1164,11 @@ index 795992d9..fd8b3718 100644
 
 #endif /* KRB5 */
 diff --git a/gss-serv.c b/gss-serv.c
-index 53993d67..2e27cbf9 100644
+index 6cae720e..967c6cfb 100644
 --- a/gss-serv.c
 +++ b/gss-serv.c
 @@ -1,7 +1,7 @@
- /* $OpenBSD: gss-serv.c,v 1.29 2015/05/22 03:50:02 djm Exp $ */
+ /* $OpenBSD: gss-serv.c,v 1.30 2017/06/24 06:34:38 djm Exp $ */
 
 /*
 - * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -1432,9 +1433,9 @@ index 53993d67..2e27cbf9 100644
 +       return ok;
 }
 
- #endif
+ /* Privileged */
 diff --git a/kex.c b/kex.c
-index cf4ac0dc..556a32e9 100644
+index d5d5a9da..bb1bd661 100644
 --- a/kex.c
 +++ b/kex.c
 @@ -54,6 +54,10 @@
@@ -1445,10 +1446,10 @@ index cf4ac0dc..556a32e9 100644
 +#include "ssh-gss.h"
 +#endif
 +
- #if OPENSSL_VERSION_NUMBER >= 0x00907000L
+ /* prototype */
- # if defined(HAVE_EVP_SHA256)
+ static int kex_choose_conf(struct ssh *);
- # define evp_ssh_sha256 EVP_sha256
+ static int kex_input_newkeys(int, u_int32_t, struct ssh *);
-@@ -113,6 +117,14 @@ static const struct kexalg kexalgs[] = {
+@@ -105,6 +109,14 @@ static const struct kexalg kexalgs[] = {
 #endif /* HAVE_EVP_SHA256 || !WITH_OPENSSL */
        { NULL, -1, -1, -1},
 };
@@ -1463,7 +1464,7 @@ index cf4ac0dc..556a32e9 100644
 
 char *
 kex_alg_list(char sep)
-@@ -145,6 +157,10 @@ kex_alg_by_name(const char *name)
+@@ -137,6 +149,10 @@ kex_alg_by_name(const char *name)
                if (strcmp(k->name, name) == 0)
                        return k;
        }
@@ -1474,7 +1475,7 @@ index cf4ac0dc..556a32e9 100644
        return NULL;
 }
 
-@@ -605,6 +621,9 @@ kex_free(struct kex *kex)
+@@ -601,6 +617,9 @@ kex_free(struct kex *kex)
        sshbuf_free(kex->peer);
        sshbuf_free(kex->my);
        free(kex->session_id);
@@ -1485,7 +1486,7 @@ index cf4ac0dc..556a32e9 100644
        free(kex->server_version_string);
        free(kex->failed_choice);
 diff --git a/kex.h b/kex.h
-index 3794f212..fd56171d 100644
+index 01bb3986..a708e486 100644
 --- a/kex.h
 +++ b/kex.h
 @@ -99,6 +99,9 @@ enum kex_exchange {
@@ -2169,7 +2170,7 @@ index 00000000..38ca082b
 +}
 +#endif /* GSSAPI */
 diff --git a/monitor.c b/monitor.c
-index 96d22b7e..506645c7 100644
+index f517da48..cabfeb8a 100644
 --- a/monitor.c
 +++ b/monitor.c
 @@ -157,6 +157,8 @@ int mm_answer_gss_setup_ctx(int, Buffer *);
@@ -2211,7 +2212,7 @@ index 96d22b7e..506645c7 100644
 
        /* The first few requests do not require asynchronous access */
        while (!authenticated) {
-@@ -402,6 +415,10 @@ monitor_child_postauth(struct monitor *pmonitor)
+@@ -408,6 +421,10 @@ monitor_child_postauth(struct monitor *pmonitor)
        monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
        monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
        monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
@@ -2222,7 +2223,7 @@ index 96d22b7e..506645c7 100644
 
        if (!no_pty_flag) {
                monitor_permit(mon_dispatch, MONITOR_REQ_PTY, 1);
-@@ -1606,6 +1623,13 @@ monitor_apply_keystate(struct monitor *pmonitor)
+@@ -1626,6 +1643,13 @@ monitor_apply_keystate(struct monitor *pmonitor)
 # endif
 #endif /* WITH_OPENSSL */
                kex->kex[KEX_C25519_SHA256] = kexc25519_server;
@@ -2236,7 +2237,7 @@ index 96d22b7e..506645c7 100644
                kex->load_host_public_key=&get_hostkey_public_by_type;
                kex->load_host_private_key=&get_hostkey_private_by_type;
                kex->host_key_index=&get_hostkey_index;
-@@ -1685,8 +1709,8 @@ mm_answer_gss_setup_ctx(int sock, Buffer *m)
+@@ -1714,8 +1738,8 @@ mm_answer_gss_setup_ctx(int sock, Buffer *m)
        OM_uint32 major;
        u_int len;
 
@@ -2247,7 +2248,7 @@ index 96d22b7e..506645c7 100644
 
        goid.elements = buffer_get_string(m, &len);
        goid.length = len;
-@@ -1715,8 +1739,8 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
+@@ -1744,8 +1768,8 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
        OM_uint32 flags = 0; /* GSI needs this */
        u_int len;
 
@@ -2258,7 +2259,7 @@ index 96d22b7e..506645c7 100644
 
        in.value = buffer_get_string(m, &len);
        in.length = len;
-@@ -1735,6 +1759,7 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
+@@ -1764,6 +1788,7 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
                monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0);
                monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1);
                monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1);
@@ -2266,7 +2267,7 @@ index 96d22b7e..506645c7 100644
        }
        return (0);
 }
-@@ -1746,8 +1771,8 @@ mm_answer_gss_checkmic(int sock, Buffer *m)
+@@ -1775,8 +1800,8 @@ mm_answer_gss_checkmic(int sock, Buffer *m)
        OM_uint32 ret;
        u_int len;
 
@@ -2277,9 +2278,9 @@ index 96d22b7e..506645c7 100644
 
        gssbuf.value = buffer_get_string(m, &len);
        gssbuf.length = len;
-@@ -1775,10 +1800,11 @@ mm_answer_gss_userok(int sock, Buffer *m)
+@@ -1805,10 +1830,11 @@ mm_answer_gss_userok(int sock, Buffer *m)
- {
        int authenticated;
+        const char *displayname;
 
 -       if (!options.gss_authentication)
 -               fatal("%s: GSSAPI authentication not enabled", __func__);
@@ -2292,7 +2293,7 @@ index 96d22b7e..506645c7 100644
 
        buffer_clear(m);
        buffer_put_int(m, authenticated);
-@@ -1791,5 +1817,76 @@ mm_answer_gss_userok(int sock, Buffer *m)
+@@ -1824,5 +1850,76 @@ mm_answer_gss_userok(int sock, Buffer *m)
        /* Monitor loop will terminate if authenticated */
        return (authenticated);
 }
@@ -2384,10 +2385,10 @@ index d68f6745..ec41404c 100644
 
 struct monitor {
 diff --git a/monitor_wrap.c b/monitor_wrap.c
-index 64ff9288..d5cb640a 100644
+index 69212aaf..0e171a6a 100644
 --- a/monitor_wrap.c
 +++ b/monitor_wrap.c
-@@ -924,7 +924,7 @@ mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
+@@ -937,7 +937,7 @@ mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
 }
 
 int
@@ -2396,7 +2397,7 @@ index 64ff9288..d5cb640a 100644
 {
        Buffer m;
        int authenticated = 0;
-@@ -941,5 +941,50 @@ mm_ssh_gssapi_userok(char *user)
+@@ -954,5 +954,50 @@ mm_ssh_gssapi_userok(char *user)
        debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not ");
        return (authenticated);
 }
@@ -2448,10 +2449,10 @@ index 64ff9288..d5cb640a 100644
 #endif /* GSSAPI */
 
 diff --git a/monitor_wrap.h b/monitor_wrap.h
-index db5902f5..8f9dd896 100644
+index 9e032d20..7b2e8945 100644
 --- a/monitor_wrap.h
 +++ b/monitor_wrap.h
-@@ -55,8 +55,10 @@ int mm_key_verify(Key *, u_char *, u_int, u_char *, u_int);
+@@ -57,8 +57,10 @@ int mm_sshkey_verify(const struct sshkey *, const u_char *, size_t,
 OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
 OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *,
    gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *);
@@ -2464,7 +2465,7 @@ index db5902f5..8f9dd896 100644
 
 #ifdef USE_PAM
 diff --git a/readconf.c b/readconf.c
-index 9d59493f..00d9cc30 100644
+index f63894f9..99e03ee1 100644
 --- a/readconf.c
 +++ b/readconf.c
 @@ -160,6 +160,8 @@ typedef enum {
@@ -2476,7 +2477,7 @@ index 9d59493f..00d9cc30 100644
        oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
        oSendEnv, oControlPath, oControlMaster, oControlPersist,
        oHashKnownHosts,
-@@ -196,10 +198,20 @@ static struct {
+@@ -199,10 +201,20 @@ static struct {
        /* Sometimes-unsupported options */
 #if defined(GSSAPI)
        { "gssapiauthentication", oGssAuthentication },
@@ -2497,7 +2498,7 @@ index 9d59493f..00d9cc30 100644
 #endif
 #ifdef ENABLE_PKCS11
        { "smartcarddevice", oPKCS11Provider },
-@@ -973,10 +985,30 @@ parse_time:
+@@ -976,10 +988,30 @@ parse_time:
                intptr = &options->gss_authentication;
                goto parse_flag;
 
@@ -2528,7 +2529,7 @@ index 9d59493f..00d9cc30 100644
        case oBatchMode:
                intptr = &options->batch_mode;
                goto parse_flag;
-@@ -1798,7 +1830,12 @@ initialize_options(Options * options)
+@@ -1790,7 +1822,12 @@ initialize_options(Options * options)
        options->pubkey_authentication = -1;
        options->challenge_response_authentication = -1;
        options->gss_authentication = -1;
@@ -2541,7 +2542,7 @@ index 9d59493f..00d9cc30 100644
        options->password_authentication = -1;
        options->kbd_interactive_authentication = -1;
        options->kbd_interactive_devices = NULL;
-@@ -1942,8 +1979,14 @@ fill_default_options(Options * options)
+@@ -1930,8 +1967,14 @@ fill_default_options(Options * options)
                options->challenge_response_authentication = 1;
        if (options->gss_authentication == -1)
                options->gss_authentication = 0;
@@ -2557,10 +2558,10 @@ index 9d59493f..00d9cc30 100644
                options->password_authentication = 1;
        if (options->kbd_interactive_authentication == -1)
 diff --git a/readconf.h b/readconf.h
-index cef55f71..fd3d7c75 100644
+index 22fe5c18..d61161a8 100644
 --- a/readconf.h
 +++ b/readconf.h
-@@ -45,7 +45,12 @@ typedef struct {
+@@ -42,7 +42,12 @@ typedef struct {
        int     challenge_response_authentication;
                                        /* Try S/Key or TIS, authentication. */
        int     gss_authentication;     /* Try GSS authentication */
@@ -2574,7 +2575,7 @@ index cef55f71..fd3d7c75 100644
                                                 * authentication. */
        int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
 diff --git a/servconf.c b/servconf.c
-index 56b83165..d796b7c8 100644
+index 2c321a4a..8ba74517 100644
 --- a/servconf.c
 +++ b/servconf.c
 @@ -113,8 +113,10 @@ initialize_server_options(ServerOptions *options)
@@ -2588,7 +2589,7 @@ index 56b83165..d796b7c8 100644
        options->password_authentication = -1;
        options->kbd_interactive_authentication = -1;
        options->challenge_response_authentication = -1;
-@@ -267,10 +269,14 @@ fill_default_server_options(ServerOptions *options)
+@@ -268,10 +270,14 @@ fill_default_server_options(ServerOptions *options)
                options->kerberos_get_afs_token = 0;
        if (options->gss_authentication == -1)
                options->gss_authentication = 0;
@@ -2603,7 +2604,7 @@ index 56b83165..d796b7c8 100644
        if (options->password_authentication == -1)
                options->password_authentication = 1;
        if (options->kbd_interactive_authentication == -1)
-@@ -407,6 +413,7 @@ typedef enum {
+@@ -410,6 +416,7 @@ typedef enum {
        sHostKeyAlgorithms,
        sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile,
        sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
@@ -2611,7 +2612,7 @@ index 56b83165..d796b7c8 100644
        sAcceptEnv, sPermitTunnel,
        sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
        sUsePrivilegeSeparation, sAllowAgentForwarding,
-@@ -480,12 +487,20 @@ static struct {
+@@ -484,12 +491,20 @@ static struct {
 #ifdef GSSAPI
        { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
        { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
@@ -2632,7 +2633,7 @@ index 56b83165..d796b7c8 100644
        { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
        { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
        { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },
-@@ -1217,6 +1232,10 @@ process_server_config_line(ServerOptions *options, char *line,
+@@ -1253,6 +1268,10 @@ process_server_config_line(ServerOptions *options, char *line,
                intptr = &options->gss_authentication;
                goto parse_flag;
 
@@ -2643,7 +2644,7 @@ index 56b83165..d796b7c8 100644
        case sGssCleanupCreds:
                intptr = &options->gss_cleanup_creds;
                goto parse_flag;
-@@ -1225,6 +1244,10 @@ process_server_config_line(ServerOptions *options, char *line,
+@@ -1261,6 +1280,10 @@ process_server_config_line(ServerOptions *options, char *line,
                intptr = &options->gss_strict_acceptor;
                goto parse_flag;
 
@@ -2654,7 +2655,7 @@ index 56b83165..d796b7c8 100644
        case sPasswordAuthentication:
                intptr = &options->password_authentication;
                goto parse_flag;
-@@ -2250,7 +2273,10 @@ dump_config(ServerOptions *o)
+@@ -2301,7 +2324,10 @@ dump_config(ServerOptions *o)
 #endif
 #ifdef GSSAPI
        dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
@@ -2666,10 +2667,10 @@ index 56b83165..d796b7c8 100644
        dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
        dump_cfg_fmtint(sKbdInteractiveAuthentication,
 diff --git a/servconf.h b/servconf.h
-index 5853a974..90dfa4c2 100644
+index 1dca702e..641e93c8 100644
 --- a/servconf.h
 +++ b/servconf.h
-@@ -112,8 +112,10 @@ typedef struct {
+@@ -119,8 +119,10 @@ typedef struct {
        int     kerberos_get_afs_token;         /* If true, try to get AFS token if
                                                 * authenticated with Kerberos. */
        int     gss_authentication;     /* If true, permit GSSAPI authentication */
@@ -2681,11 +2682,11 @@ index 5853a974..90dfa4c2 100644
                                                 * authentication. */
        int     kbd_interactive_authentication; /* If true, permit */
 diff --git a/ssh-gss.h b/ssh-gss.h
-index a99d7f08..914701bc 100644
+index 6593e422..919660a0 100644
 --- a/ssh-gss.h
 +++ b/ssh-gss.h
 @@ -1,6 +1,6 @@
- /* $OpenBSD: ssh-gss.h,v 1.11 2014/02/26 20:28:44 djm Exp $ */
+ /* $OpenBSD: ssh-gss.h,v 1.12 2017/06/24 06:34:38 djm Exp $ */
 /*
 - * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
 + * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
@@ -2748,7 +2749,7 @@ index a99d7f08..914701bc 100644
 
 int  ssh_gssapi_check_oid(Gssctxt *, void *, size_t);
 void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t);
-@@ -119,16 +136,32 @@ void ssh_gssapi_build_ctx(Gssctxt **);
+@@ -119,17 +136,33 @@ void ssh_gssapi_build_ctx(Gssctxt **);
 void ssh_gssapi_delete_ctx(Gssctxt **);
 OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
 void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *);
@@ -2773,6 +2774,7 @@ index a99d7f08..914701bc 100644
 void ssh_gssapi_do_child(char ***, u_int *);
 void ssh_gssapi_cleanup_creds(void);
 void ssh_gssapi_storecreds(void);
+ const char *ssh_gssapi_displayname(void);
 
 +char *ssh_gssapi_server_mechanisms(void);
 +int ssh_gssapi_oid_table_ok(void);
@@ -2784,10 +2786,10 @@ index a99d7f08..914701bc 100644
 
 #endif /* _SSH_GSS_H */
 diff --git a/ssh_config b/ssh_config
-index 90fb63f0..4e879cd2 100644
+index c12f5ef5..bcb9f153 100644
 --- a/ssh_config
 +++ b/ssh_config
-@@ -26,6 +26,8 @@
+@@ -24,6 +24,8 @@
 #   HostbasedAuthentication no
 #   GSSAPIAuthentication no
 #   GSSAPIDelegateCredentials no
@@ -2797,10 +2799,10 @@ index 90fb63f0..4e879cd2 100644
 #   CheckHostIP yes
 #   AddressFamily any
 diff --git a/ssh_config.5 b/ssh_config.5
-index 532745b2..ec60273e 100644
+index eab8dd01..9a06a757 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -752,10 +752,42 @@ The default is
+@@ -720,10 +720,42 @@ The default is
 Specifies whether user authentication based on GSSAPI is allowed.
 The default is
 .Cm no .
@@ -2844,7 +2846,7 @@ index 532745b2..ec60273e 100644
 Indicates that
 .Xr ssh 1
 diff --git a/sshconnect2.c b/sshconnect2.c
-index f8a54bee..5743c2c4 100644
+index be9397e4..c22477f5 100644
 --- a/sshconnect2.c
 +++ b/sshconnect2.c
 @@ -162,6 +162,11 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
@@ -2919,7 +2921,7 @@ index f8a54bee..5743c2c4 100644
 +       }
 +#endif
 +
-        dispatch_run(DISPATCH_BLOCK, &kex->done, active_state);
+        ssh_dispatch_run_fatal(active_state, DISPATCH_BLOCK, &kex->done);
 
        /* remove ext-info from the KEX proposals for rekeying */
        myproposal[PROPOSAL_KEX_ALGS] =
@@ -2937,10 +2939,10 @@ index f8a54bee..5743c2c4 100644
        if ((r = kex_prop2buf(kex->my, myproposal)) != 0)
                fatal("kex_prop2buf: %s", ssh_err(r));
 
-@@ -311,6 +371,7 @@ int input_gssapi_token(int type, u_int32_t, void *);
+@@ -311,6 +371,7 @@ int input_gssapi_token(int type, u_int32_t, struct ssh *);
- int    input_gssapi_hash(int type, u_int32_t, void *);
+ int    input_gssapi_hash(int type, u_int32_t, struct ssh *);
- int    input_gssapi_error(int, u_int32_t, void *);
+ int    input_gssapi_error(int, u_int32_t, struct ssh *);
- int    input_gssapi_errtok(int, u_int32_t, void *);
+ int    input_gssapi_errtok(int, u_int32_t, struct ssh *);
 +int    userauth_gsskeyex(Authctxt *authctxt);
 #endif
 
@@ -2957,7 +2959,7 @@ index f8a54bee..5743c2c4 100644
        {"gssapi-with-mic",
                userauth_gssapi,
                NULL,
-@@ -652,25 +718,40 @@ userauth_gssapi(Authctxt *authctxt)
+@@ -654,25 +720,40 @@ userauth_gssapi(Authctxt *authctxt)
        static u_int mech = 0;
        OM_uint32 min;
        int ok = 0;
@@ -3000,9 +3002,9 @@ index f8a54bee..5743c2c4 100644
        if (!ok)
                return 0;
 
-@@ -761,8 +842,8 @@ input_gssapi_response(int type, u_int32_t plen, void *ctxt)
+@@ -763,8 +844,8 @@ input_gssapi_response(int type, u_int32_t plen, struct ssh *ssh)
 {
-        Authctxt *authctxt = ctxt;
+        Authctxt *authctxt = ssh->authctxt;
        Gssctxt *gssctxt;
 -       int oidlen;
 -       char *oidv;
@@ -3011,7 +3013,7 @@ index f8a54bee..5743c2c4 100644
 
        if (authctxt == NULL)
                fatal("input_gssapi_response: no authentication context");
-@@ -875,6 +956,48 @@ input_gssapi_error(int type, u_int32_t plen, void *ctxt)
+@@ -877,6 +958,48 @@ input_gssapi_error(int type, u_int32_t plen, struct ssh *ssh)
        free(lang);
        return 0;
 }
@@ -3061,10 +3063,10 @@ index f8a54bee..5743c2c4 100644
 
 int
 diff --git a/sshd.c b/sshd.c
-index 010a2c38..20a7a5f3 100644
+index 51a1aaf6..45e50fac 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -123,6 +123,10 @@
+@@ -122,6 +122,10 @@
 #include "version.h"
 #include "ssherr.h"
 
@@ -3075,7 +3077,7 @@ index 010a2c38..20a7a5f3 100644
 /* Re-exec fds */
 #define REEXEC_DEVCRYPTO_RESERVED_FD   (STDERR_FILENO + 1)
 #define REEXEC_STARTUP_PIPE_FD         (STDERR_FILENO + 2)
-@@ -531,7 +535,7 @@ privsep_preauth_child(void)
+@@ -529,7 +533,7 @@ privsep_preauth_child(void)
 
 #ifdef GSSAPI
        /* Cache supported mechanism OIDs for later use */
@@ -3084,7 +3086,7 @@ index 010a2c38..20a7a5f3 100644
                ssh_gssapi_prepare_supported_oids();
 #endif
 
-@@ -1719,10 +1723,13 @@ main(int ac, char **av)
+@@ -1708,10 +1712,13 @@ main(int ac, char **av)
                    key ? "private" : "agent", i, sshkey_ssh_name(pubkey), fp);
                free(fp);
        }
@@ -3098,7 +3100,7 @@ index 010a2c38..20a7a5f3 100644
 
        /*
         * Load certificates. They are stored in an array at identical
-@@ -1992,6 +1999,60 @@ main(int ac, char **av)
+@@ -1987,6 +1994,60 @@ main(int ac, char **av)
            remote_ip, remote_port, laddr,  ssh_local_port(ssh));
        free(laddr);
 
@@ -3159,7 +3161,7 @@ index 010a2c38..20a7a5f3 100644
        /*
         * We don't want to listen forever unless the other side
         * successfully authenticates itself.  So we set up an alarm which is
-@@ -2173,6 +2234,48 @@ do_ssh2_kex(void)
+@@ -2170,6 +2231,48 @@ do_ssh2_kex(void)
        myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal(
            list_hostkey_types());
 
@@ -3208,7 +3210,7 @@ index 010a2c38..20a7a5f3 100644
        /* start key exchange */
        if ((r = kex_setup(active_state, myproposal)) != 0)
                fatal("kex_setup: %s", ssh_err(r));
-@@ -2190,6 +2293,13 @@ do_ssh2_kex(void)
+@@ -2187,6 +2290,13 @@ do_ssh2_kex(void)
 # endif
 #endif
        kex->kex[KEX_C25519_SHA256] = kexc25519_server;
@@ -3236,10 +3238,10 @@ index 4eb2e02e..c01dd656 100644
 # Set this to 'yes' to enable PAM authentication, account processing,
 # and session processing. If this is enabled, PAM authentication will
 diff --git a/sshd_config.5 b/sshd_config.5
-index ac6ccc79..3f819c76 100644
+index 251b7467..0dbcb8da 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -627,6 +627,11 @@ The default is
+@@ -635,6 +635,11 @@ The default is
 Specifies whether user authentication based on GSSAPI is allowed.
 The default is
 .Cm no .
@@ -3251,7 +3253,7 @@ index ac6ccc79..3f819c76 100644
 .It Cm GSSAPICleanupCredentials
 Specifies whether to automatically destroy the user's credentials cache
 on logout.
-@@ -646,6 +651,11 @@ machine's default store.
+@@ -654,6 +659,11 @@ machine's default store.
 This facility is provided to assist with operation on multi homed machines.
 The default is
 .Cm yes .
@@ -3264,10 +3266,10 @@ index ac6ccc79..3f819c76 100644
 Specifies the key types that will be accepted for hostbased authentication
 as a comma-separated pattern list.
 diff --git a/sshkey.c b/sshkey.c
-index 53a7674b..54001989 100644
+index e91c54f5..c2cf0e03 100644
 --- a/sshkey.c
 +++ b/sshkey.c
-@@ -116,6 +116,7 @@ static const struct keytype keytypes[] = {
+@@ -112,6 +112,7 @@ static const struct keytype keytypes[] = {
 #  endif /* OPENSSL_HAS_NISTP521 */
 # endif /* OPENSSL_HAS_ECC */
 #endif /* WITH_OPENSSL */
@@ -3275,7 +3277,7 @@ index 53a7674b..54001989 100644
        { NULL, NULL, -1, -1, 0, 0 }
 };
 
-@@ -204,7 +205,7 @@ sshkey_alg_list(int certs_only, int plain_only, int include_sigonly, char sep)
+@@ -200,7 +201,7 @@ sshkey_alg_list(int certs_only, int plain_only, int include_sigonly, char sep)
        const struct keytype *kt;
 
        for (kt = keytypes; kt->type != -1; kt++) {
@@ -3285,10 +3287,10 @@ index 53a7674b..54001989 100644
                if (!include_sigonly && kt->sigonly)
                        continue;
 diff --git a/sshkey.h b/sshkey.h
-index 1b9e42f4..f91e4a08 100644
+index 9093eac5..b5d020cb 100644
 --- a/sshkey.h
 +++ b/sshkey.h
-@@ -62,6 +62,7 @@ enum sshkey_types {
+@@ -61,6 +61,7 @@ enum sshkey_types {
        KEY_DSA_CERT,
        KEY_ECDSA_CERT,
        KEY_ED25519_CERT,
diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index 8748ac286..d3eca5924 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -1,4 +1,4 @@
-From 74415628b380db26961259a25dcc47c4f02e8703 Mon Sep 17 00:00:00 2001
+From c147d4dbab74e0dbf738beb9d9f4220534ae9da6 Mon Sep 17 00:00:00 2001
 From: Richard Kettlewell <rjk@greenend.org.uk>
 Date: Sun, 9 Feb 2014 16:09:52 +0000
 Subject: Various keepalive extensions
@@ -16,7 +16,7 @@ keepalives.
 Author: Ian Jackson <ian@chiark.greenend.org.uk>
 Author: Matthew Vernon <matthew@debian.org>
 Author: Colin Watson <cjwatson@debian.org>
-Last-Update: 2016-12-26
+Last-Update: 2017-10-04
 Patch-Name: keepalive-extensions.patch
 ---
@@ -26,18 +26,18 @@ Patch-Name: keepalive-extensions.patch
 3 files changed, 34 insertions(+), 4 deletions(-)
 diff --git a/readconf.c b/readconf.c
-index 32a72957..0b1370a8 100644
+index d2b28a41..45caa095 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -173,6 +173,7 @@ typedef enum {
+@@ -174,6 +174,7 @@ typedef enum {
        oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
        oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes,
        oPubkeyAcceptedKeyTypes, oProxyJump,
 +       oProtocolKeepAlives, oSetupTimeOut,
-        oIgnoredUnknownOption, oDeprecated, oUnsupported
+        oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported
 } OpCodes;
 
-@@ -321,6 +322,8 @@ static struct {
+@@ -318,6 +319,8 @@ static struct {
        { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes },
        { "ignoreunknown", oIgnoreUnknown },
        { "proxyjump", oProxyJump },
@@ -46,7 +46,7 @@ index 32a72957..0b1370a8 100644
 
        { NULL, oBadOption }
 };
-@@ -1417,6 +1420,8 @@ parse_keytypes:
+@@ -1406,6 +1409,8 @@ parse_keytypes:
                goto parse_flag;
 
        case oServerAliveInterval:
@@ -55,7 +55,7 @@ index 32a72957..0b1370a8 100644
                intptr = &options->server_alive_interval;
                goto parse_time;
 
-@@ -2070,8 +2075,13 @@ fill_default_options(Options * options)
+@@ -2042,8 +2047,13 @@ fill_default_options(Options * options)
                options->rekey_interval = 0;
        if (options->verify_host_key_dns == -1)
                options->verify_host_key_dns = 0;
@@ -72,10 +72,10 @@ index 32a72957..0b1370a8 100644
                options->server_alive_count_max = 3;
        if (options->control_master == -1)
 diff --git a/ssh_config.5 b/ssh_config.5
-index ec60273e..e4eaa5ae 100644
+index 9a06a757..d6f43c2d 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -250,8 +250,12 @@ Valid arguments are
+@@ -247,8 +247,12 @@ Valid arguments are
 If set to
 .Cm yes ,
 passphrase/password querying will be disabled.
@@ -89,7 +89,7 @@ index ec60273e..e4eaa5ae 100644
 The argument must be
 .Cm yes
 or
-@@ -1509,7 +1513,14 @@ from the server,
+@@ -1455,7 +1459,14 @@ from the server,
 will send a message through the encrypted
 channel to request a response from the server.
 The default
@@ -105,7 +105,7 @@ index ec60273e..e4eaa5ae 100644
 .It Cm StreamLocalBindMask
 Sets the octal file creation mode mask
 .Pq umask
-@@ -1568,6 +1579,12 @@ Specifies whether the system should send TCP keepalive messages to the
+@@ -1529,6 +1540,12 @@ Specifies whether the system should send TCP keepalive messages to the
 other side.
 If they are sent, death of the connection or crash of one
 of the machines will be properly noticed.
@@ -119,10 +119,10 @@ index ec60273e..e4eaa5ae 100644
 connections will die if the route is down temporarily, and some people
 find it annoying.
 diff --git a/sshd_config.5 b/sshd_config.5
-index 3f819c76..41ec6688 100644
+index 0dbcb8da..7db25552 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -1447,6 +1447,9 @@ This avoids infinitely hanging sessions.
+@@ -1454,6 +1454,9 @@ This avoids infinitely hanging sessions.
 .Pp
 To disable TCP keepalive messages, the value should be set to
 .Cm no .
diff --git a/debian/patches/mention-ssh-keygen-on-keychange.patch b/debian/patches/mention-ssh-keygen-on-keychange.patch
index a425efa55..3edb37705 100644
--- a/debian/patches/mention-ssh-keygen-on-keychange.patch
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -1,4 +1,4 @@
-From 78963ce671198209cadd01ebb0aa20ae4fac22d6 Mon Sep 17 00:00:00 2001
+From 19be4218cdb262f7b584b0104ee430de0e24eeb8 Mon Sep 17 00:00:00 2001
 From: Scott Moser <smoser@ubuntu.com>
 Date: Sun, 9 Feb 2014 16:10:03 +0000
 Subject: Mention ssh-keygen in ssh fingerprint changed warning
@@ -14,10 +14,10 @@ Patch-Name: mention-ssh-keygen-on-keychange.patch
 1 file changed, 8 insertions(+), 1 deletion(-)
 diff --git a/sshconnect.c b/sshconnect.c
-index 7f169a8f..881b0886 100644
+index 5eed5880..7ce2716c 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
-@@ -1080,9 +1080,13 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
+@@ -1022,9 +1022,13 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                        error("%s. This could either mean that", key_msg);
                        error("DNS SPOOFING is happening or the IP address for the host");
                        error("and its host key have changed at the same time.");
@@ -32,9 +32,9 @@ index 7f169a8f..881b0886 100644
                }
                /* The host key has changed. */
                warn_changed_key(host_key);
-@@ -1090,6 +1094,9 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
+@@ -1033,6 +1037,9 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
-                    user_hostfiles[0]);
+                error("Offending %s key in %s:%lu",
-                error("Offending %s key in %s:%lu", key_type(host_found->key),
+                    sshkey_type(host_found->key),
                    host_found->file, host_found->line);
 +               error("  remove with:");
 +               error("  ssh-keygen -f \"%s\" -R \"%s\"",
diff --git a/debian/patches/no-dsa-host-key-by-default.patch b/debian/patches/no-dsa-host-key-by-default.patch
index 92f9d7c61..c24ff4e3f 100644
--- a/debian/patches/no-dsa-host-key-by-default.patch
+++ b/debian/patches/no-dsa-host-key-by-default.patch
@@ -1,4 +1,4 @@
-From 5fc5168dde0c840bf743058d235193fc27e61cab Mon Sep 17 00:00:00 2001
+From 922f3a7599d03234b6bb2ffb22a33624e7cf1953 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Mon, 16 Jan 2017 13:53:04 +0000
 Subject: Remove ssh_host_dsa_key from HostKey default
@@ -19,10 +19,10 @@ Patch-Name: no-dsa-host-key-by-default.patch
 4 files changed, 6 insertions(+), 11 deletions(-)
 diff --git a/servconf.c b/servconf.c
-index a391cf4b..1a7a5f18 100644
+index b0146405..5e996cf8 100644
 --- a/servconf.c
 +++ b/servconf.c
-@@ -204,8 +204,6 @@ fill_default_server_options(ServerOptions *options)
+@@ -205,8 +205,6 @@ fill_default_server_options(ServerOptions *options)
                /* fill default hostkeys for protocols */
                options->host_key_files[options->num_host_key_files++] =
                    _PATH_HOST_RSA_KEY_FILE;
@@ -32,7 +32,7 @@ index a391cf4b..1a7a5f18 100644
                options->host_key_files[options->num_host_key_files++] =
                    _PATH_HOST_ECDSA_KEY_FILE;
 diff --git a/sshd.8 b/sshd.8
-index 6355178f..f038fb82 100644
+index 02c5e1df..8c230657 100644
 --- a/sshd.8
 +++ b/sshd.8
 @@ -164,11 +164,10 @@ This option must be given if
@@ -63,10 +63,10 @@ index f68edf36..92822959 100644
 #HostKey /etc/ssh/ssh_host_ed25519_key
 
 diff --git a/sshd_config.5 b/sshd_config.5
-index cc5d9fb0..0747cc8b 100644
+index 16be4f62..ef520680 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -741,11 +741,10 @@ is not to load any certificates.
+@@ -749,11 +749,10 @@ is not to load any certificates.
 Specifies a file containing a private host key
 used by SSH.
 The defaults are
diff --git a/debian/patches/no-openssl-version-status.patch b/debian/patches/no-openssl-version-status.patch
index 63a226284..cbfaebfe0 100644
--- a/debian/patches/no-openssl-version-status.patch
+++ b/debian/patches/no-openssl-version-status.patch
@@ -1,4 +1,4 @@
-From 1780065057642803e173730f6e2162943ae54302 Mon Sep 17 00:00:00 2001
+From b614a7f9148af821919165be47c6c29f59dc6b44 Mon Sep 17 00:00:00 2001
 From: Kurt Roeckx <kurt@roeckx.be>
 Date: Sun, 9 Feb 2014 16:10:14 +0000
 Subject: Don't check the status field of the OpenSSL version
diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
index 2a5a2e466..9297decd6 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -1,4 +1,4 @@
-From 10138a01a89b20e851d85bd040e289d47b9815b0 Mon Sep 17 00:00:00 2001
+From 7e53354725eeb002e6126a73fd5f294ed9f9b03e Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:09 +0000
 Subject: Adjust various OpenBSD-specific references in manual pages
@@ -10,7 +10,7 @@ No single bug reference for this patch, but history includes:
 https://bugs.launchpad.net/bugs/456660 (ssl(8))
 Forwarded: not-needed
-Last-Update: 2014-10-07
+Last-Update: 2017-10-04
 Patch-Name: openbsd-docs.patch
 ---
@@ -44,10 +44,10 @@ index ef0de085..149846c8 100644
 .Sh SEE ALSO
 .Xr ssh-keygen 1 ,
 diff --git a/ssh-keygen.1 b/ssh-keygen.1
-index ce2213c7..01711dff 100644
+index 5f1ec09b..dfbc65dd 100644
 --- a/ssh-keygen.1
 +++ b/ssh-keygen.1
-@@ -178,9 +178,7 @@ key in
+@@ -176,9 +176,7 @@ key in
 .Pa ~/.ssh/id_ed25519
 or
 .Pa ~/.ssh/id_rsa .
@@ -58,18 +58,18 @@ index ce2213c7..01711dff 100644
 .Pp
 Normally this program generates the key and asks for a file in which
 to store the private key.
-@@ -227,9 +225,7 @@ For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519)
+@@ -229,9 +227,7 @@ If
- for which host keys
+ .Fl f
- do not exist, generate the host keys with the default key file path,
+ has also been specified, its argument is used as a prefix to the
- an empty passphrase, default bits for the key type, and default comment.
+ default path for the resulting host key files.
 -This is used by
 -.Pa /etc/rc
 -to generate new host keys.
 +This is used by system administration scripts to generate new host keys.
 .It Fl a Ar rounds
- When saving a new-format private key (i.e. an ed25519 key or any SSH protocol
+ When saving a new-format private key (i.e. an ed25519 key or when the
- 2 key when the
+ .Fl o
-@@ -644,7 +640,7 @@ option.
+@@ -676,7 +672,7 @@ option.
 Valid generator values are 2, 3, and 5.
 .Pp
 Screened DH groups may be installed in
@@ -78,7 +78,7 @@ index ce2213c7..01711dff 100644
 It is important that this file contains moduli of a range of bit lengths and
 that both ends of a connection share common moduli.
 .Sh CERTIFICATES
-@@ -843,7 +839,7 @@ on all machines
+@@ -863,7 +859,7 @@ on all machines
 where the user wishes to log in using public key authentication.
 There is no need to keep the contents of this file secret.
 .Pp
@@ -88,10 +88,10 @@ index ce2213c7..01711dff 100644
 The file format is described in
 .Xr moduli 5 .
 diff --git a/ssh.1 b/ssh.1
-index feef81a5..b1f128c2 100644
+index 3cc94688..2a2aab30 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -877,6 +877,10 @@ implements public key authentication protocol automatically,
+@@ -842,6 +842,10 @@ implements public key authentication protocol automatically,
 using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
 The HISTORY section of
 .Xr ssl 8
@@ -103,7 +103,7 @@ index feef81a5..b1f128c2 100644
 .Pp
 The file
 diff --git a/sshd.8 b/sshd.8
-index 989dd4bf..6355178f 100644
+index 2ed523a2..02c5e1df 100644
 --- a/sshd.8
 +++ b/sshd.8
 @@ -65,7 +65,7 @@ over an insecure network.
@@ -115,7 +115,7 @@ index 989dd4bf..6355178f 100644
 It forks a new
 daemon for each incoming connection.
 The forked daemons handle
-@@ -836,7 +836,7 @@ This file is for host-based authentication (see
+@@ -850,7 +850,7 @@ This file is for host-based authentication (see
 .Xr ssh 1 ) .
 It should only be writable by root.
 .Pp
@@ -124,7 +124,7 @@ index 989dd4bf..6355178f 100644
 Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange"
 key exchange method.
 The file format is described in
-@@ -936,7 +936,6 @@ The content of this file is not sensitive; it can be world-readable.
+@@ -950,7 +950,6 @@ The content of this file is not sensitive; it can be world-readable.
 .Xr ssh-keyscan 1 ,
 .Xr chroot 2 ,
 .Xr hosts_access 5 ,
@@ -133,10 +133,10 @@ index 989dd4bf..6355178f 100644
 .Xr sshd_config 5 ,
 .Xr inetd 8 ,
 diff --git a/sshd_config.5 b/sshd_config.5
-index 5f316481..603c2ba7 100644
+index 41e8c939..79676a95 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -372,8 +372,7 @@ then no banner is displayed.
+@@ -382,8 +382,7 @@ then no banner is displayed.
 By default, no banner is displayed.
 .It Cm ChallengeResponseAuthentication
 Specifies whether challenge-response authentication is allowed (e.g. via
diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch
index 566761b3a..0d851e68c 100644
--- a/debian/patches/package-versioning.patch
+++ b/debian/patches/package-versioning.patch
@@ -1,4 +1,4 @@
-From 24262015f741a40c9374b15d24c23b8e98b7b7ae Mon Sep 17 00:00:00 2001
+From 326b09bce8058629980cc92f289fd7912269eb98 Mon Sep 17 00:00:00 2001
 From: Matthew Vernon <matthew@debian.org>
 Date: Sun, 9 Feb 2014 16:10:05 +0000
 Subject: Include the Debian version in our identification
@@ -9,34 +9,30 @@ generally just try attacks rather than bothering to scan for
 vulnerable-looking version strings.  (However, see debian-banner.patch.)
 Forwarded: not-needed
-Last-Update: 2013-09-14
+Last-Update: 2017-10-04
 Patch-Name: package-versioning.patch
 ---
- sshconnect.c | 4 ++--
+ sshconnect.c | 2 +-
 sshd.c       | 2 +-
 version.h    | 7 ++++++-
- 3 files changed, 9 insertions(+), 4 deletions(-)
+ 3 files changed, 8 insertions(+), 3 deletions(-)
 diff --git a/sshconnect.c b/sshconnect.c
-index 881b0886..d9ed5910 100644
+index 7ce2716c..3280b310 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
-@@ -526,10 +526,10 @@ send_client_banner(int connection_out, int minor1)
+@@ -517,7 +517,7 @@ send_client_banner(int connection_out, int minor1)
+ {
        /* Send our own protocol version identification. */
-        if (compat20) {
+        xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
-                xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
+-           PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
-                   PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
+           PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
-+                   PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
-        } else {
-                xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
-                   PROTOCOL_MAJOR_1, minor1, SSH_VERSION);
-+                   PROTOCOL_MAJOR_1, minor1, SSH_RELEASE);
-        }
        if (atomicio(vwrite, connection_out, client_version_string,
            strlen(client_version_string)) != strlen(client_version_string))
+                fatal("write: %.100s", strerror(errno));
 diff --git a/sshd.c b/sshd.c
-index 9221632e..602f4740 100644
+index af1ec337..eccf81bb 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -378,7 +378,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
@@ -49,11 +45,11 @@ index 9221632e..602f4740 100644
            options.version_addendum);
 
 diff --git a/version.h b/version.h
-index c86e2097..f4d8b13a 100644
+index e093f623..b7c5ad2a 100644
 --- a/version.h
 +++ b/version.h
 @@ -3,4 +3,9 @@
- #define SSH_VERSION    "OpenSSH_7.5"
+ #define SSH_VERSION    "OpenSSH_7.6"
 
 #define SSH_PORTABLE   "p1"
 -#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE
diff --git a/debian/patches/quieter-signals.patch b/debian/patches/quieter-signals.patch
deleted file mode 100644
index 55dd37fb9..000000000
--- a/debian/patches/quieter-signals.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 980646a9f7f03b43b678272b2a56e30906c6ddec Mon Sep 17 00:00:00 2001
-From: Peter Samuelson <peter@p12n.org>
-Date: Sun, 9 Feb 2014 16:09:55 +0000
-Subject: Reduce severity of "Killed by signal %d"
-This produces irritating messages when using ProxyCommand or other programs
-that use ssh under the covers (e.g. Subversion).  These messages are more
-normally printed by the calling program, such as the shell.
-According to the upstream bug, the right way to avoid this is to use the -q
-option, so we may drop this patch after further investigation into whether
-any software in Debian is still relying on it.
-Author: Colin Watson <cjwatson@debian.org>
-Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1118
-Bug-Debian: http://bugs.debian.org/313371
-Last-Update: 2013-09-14
-Patch-Name: quieter-signals.patch
---
- clientloop.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-diff --git a/clientloop.c b/clientloop.c
-index 38b0330e..06845280 100644
--- a/clientloop.c
-+++ b/clientloop.c
-@@ -1755,8 +1755,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
-                exit_status = 0;
-        }
- 
-       if (received_signal)
-               fatal("Killed by signal %d.", (int) received_signal);
-+       if (received_signal) {
-+               debug("Killed by signal %d.", (int) received_signal);
-+               cleanup_exit((int) received_signal + 128);
-+       }
- 
-        /*
-         * In interactive mode (with pseudo tty) display a message indicating
diff --git a/debian/patches/regress-integrity-robust.patch b/debian/patches/regress-integrity-robust.patch
deleted file mode 100644
index fe8a321c3..000000000
--- a/debian/patches/regress-integrity-robust.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 11f55875afff41aa1f1732ff138c9f76dc2a0afa Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@debian.org>
-Date: Sun, 1 Jan 2017 15:21:10 +0000
-Subject: Make integrity tests more robust against timeouts
-If the first test in a series for a given MAC happens to modify the low
-bytes of a packet length, then ssh will time out and this will be
-interpreted as a test failure.  Handle this failure mode.
-Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=2658
-Patch-Name: regress-integrity-robust.patch
-Last-Update: 2017-01-01
---
- regress/integrity.sh | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-diff --git a/regress/integrity.sh b/regress/integrity.sh
-index 1df2924f..ed378337 100644
--- a/regress/integrity.sh
-+++ b/regress/integrity.sh
-@@ -60,14 +60,16 @@ for m in $macs; do
-                Corrupted?MAC* | *message?authentication?code?incorrect*)
-                                emac=`expr $emac + 1`; skip=0;;
-                padding*)       epad=`expr $epad + 1`; skip=0;;
-+               *Timeout,?server*)
-+                               etmo=`expr $etmo + 1`; skip=0;;
-                *)              fail "unexpected error mac $m at $off: $out";;
-                esac
-        done
-       verbose "test $tid: $ecnt errors: mac $emac padding $epad length $elen"
-+       verbose "test $tid: $ecnt errors: mac $emac padding $epad length $elen timeout $etmo"
-        if [ $emac -eq 0 ]; then
-                fail "$m: no mac errors"
-        fi
-       expect=`expr $ecnt - $epad - $elen`
-+       expect=`expr $ecnt - $epad - $elen - $etmo`
-        if [ $emac -ne $expect ]; then
-                fail "$m: expected $expect mac errors, got $emac"
-        fi
diff --git a/debian/patches/restore-authorized_keys2.patch b/debian/patches/restore-authorized_keys2.patch
index 8ef01fe57..098f9d681 100644
--- a/debian/patches/restore-authorized_keys2.patch
+++ b/debian/patches/restore-authorized_keys2.patch
@@ -1,4 +1,4 @@
-From 91dbdb5e4e0a34acdf8dbc79ef70c7f3942d4a95 Mon Sep 17 00:00:00 2001
+From 6c2e9847f608cc9c36236eecc58241cd3358dd5b Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 5 Mar 2017 02:02:11 +0000
 Subject: Restore reading authorized_keys2 by default
diff --git a/debian/patches/restore-tcp-wrappers.patch b/debian/patches/restore-tcp-wrappers.patch
index 67711c5f8..5832897d2 100644
--- a/debian/patches/restore-tcp-wrappers.patch
+++ b/debian/patches/restore-tcp-wrappers.patch
@@ -1,4 +1,4 @@
-From 9d91ede3c03c99b6584038aa07d095d7c277ad3a Mon Sep 17 00:00:00 2001
+From cdd9076a145a95c21538eedb3f728a897480c5de Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Tue, 7 Oct 2014 13:22:41 +0100
 Subject: Restore TCP wrappers support
@@ -28,10 +28,10 @@ Patch-Name: restore-tcp-wrappers.patch
 3 files changed, 89 insertions(+)
 diff --git a/configure.ac b/configure.ac
-index ead34acf..a92425db 100644
+index 84bfad8c..3b30736b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1494,6 +1494,62 @@ AC_ARG_WITH([skey],
+@@ -1503,6 +1503,62 @@ AC_ARG_WITH([skey],
        ]
 )
 
@@ -94,7 +94,7 @@ index ead34acf..a92425db 100644
 # Check whether user wants to use ldns
 LDNS_MSG="no"
 AC_ARG_WITH(ldns,
-@@ -5117,6 +5173,7 @@ echo "                 KerberosV support: $KRB5_MSG"
+@@ -5133,6 +5189,7 @@ echo "                 KerberosV support: $KRB5_MSG"
 echo "                   SELinux support: $SELINUX_MSG"
 echo "                 Smartcard support: $SCARD_MSG"
 echo "                     S/KEY support: $SKEY_MSG"
@@ -103,10 +103,10 @@ index ead34acf..a92425db 100644
 echo "                   libedit support: $LIBEDIT_MSG"
 echo "                   libldns support: $LDNS_MSG"
 diff --git a/sshd.8 b/sshd.8
-index 7725a692..989dd4bf 100644
+index a4201146..2ed523a2 100644
 --- a/sshd.8
 +++ b/sshd.8
-@@ -825,6 +825,12 @@ the user's home directory becomes accessible.
+@@ -839,6 +839,12 @@ the user's home directory becomes accessible.
 This file should be writable only by the user, and need not be
 readable by anyone else.
 .Pp
@@ -119,7 +119,7 @@ index 7725a692..989dd4bf 100644
 .It Pa /etc/hosts.equiv
 This file is for host-based authentication (see
 .Xr ssh 1 ) .
-@@ -929,6 +935,7 @@ The content of this file is not sensitive; it can be world-readable.
+@@ -943,6 +949,7 @@ The content of this file is not sensitive; it can be world-readable.
 .Xr ssh-keygen 1 ,
 .Xr ssh-keyscan 1 ,
 .Xr chroot 2 ,
@@ -128,10 +128,10 @@ index 7725a692..989dd4bf 100644
 .Xr moduli 5 ,
 .Xr sshd_config 5 ,
 diff --git a/sshd.c b/sshd.c
-index 20a7a5f3..38cf9b49 100644
+index 45e50fac..a66e9ca6 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -127,6 +127,13 @@
+@@ -126,6 +126,13 @@
 #include <Security/AuthSession.h>
 #endif
 
@@ -145,7 +145,7 @@ index 20a7a5f3..38cf9b49 100644
 /* Re-exec fds */
 #define REEXEC_DEVCRYPTO_RESERVED_FD   (STDERR_FILENO + 1)
 #define REEXEC_STARTUP_PIPE_FD         (STDERR_FILENO + 2)
-@@ -1992,6 +1999,24 @@ main(int ac, char **av)
+@@ -1987,6 +1994,24 @@ main(int ac, char **av)
 #ifdef SSH_AUDIT_EVENTS
        audit_connection_from(remote_ip, remote_port);
 #endif
diff --git a/debian/patches/s390-missing-header.patch b/debian/patches/s390-missing-header.patch
deleted file mode 100644
index be7c511b9..000000000
--- a/debian/patches/s390-missing-header.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 735a04bf257744fc490581e9d5d7e607e4419579 Mon Sep 17 00:00:00 2001
-From: Damien Miller <djm@mindrot.org>
-Date: Wed, 22 Mar 2017 12:43:02 +1100
-Subject: Missing header on Linux/s390
-Patch from Jakub Jelen
-Origin: https://anongit.mindrot.org/openssh.git/commit/?id=58b8cfa2a062b72139d7229ae8de567f55776f24
-Last-Update: 2017-04-02
-Patch-Name: s390-missing-header.patch
---
- sandbox-seccomp-filter.c | 3 +++
- 1 file changed, 3 insertions(+)
-diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
-index 3a1aedce..08dc3a8b 100644
--- a/sandbox-seccomp-filter.c
-+++ b/sandbox-seccomp-filter.c
-@@ -50,6 +50,9 @@
- #include <elf.h>
- 
- #include <asm/unistd.h>
-+#ifdef __s390__
-+#include <asm/zcrypt.h>
-+#endif
- 
- #include <errno.h>
- #include <signal.h>
diff --git a/debian/patches/scp-quoting.patch b/debian/patches/scp-quoting.patch
index f48709864..43153ec04 100644
--- a/debian/patches/scp-quoting.patch
+++ b/debian/patches/scp-quoting.patch
@@ -1,4 +1,4 @@
-From 17d18d2f87eaa6c781356a78800ee17ccd12218b Mon Sep 17 00:00:00 2001
+From ef7aa8189491e0b43f14f7f15fb5e66903f7e185 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Nicolas=20Valc=C3=A1rcel?= <nvalcarcel@ubuntu.com>
 Date: Sun, 9 Feb 2014 16:09:59 +0000
 Subject: Adjust scp quoting in verbose mode
@@ -17,10 +17,10 @@ Patch-Name: scp-quoting.patch
 1 file changed, 10 insertions(+), 2 deletions(-)
 diff --git a/scp.c b/scp.c
-index b4db8519..18c27720 100644
+index a533eb09..12e3199d 100644
 --- a/scp.c
 +++ b/scp.c
-@@ -191,8 +191,16 @@ do_local_cmd(arglist *a)
+@@ -194,8 +194,16 @@ do_local_cmd(arglist *a)
 
        if (verbose_mode) {
                fprintf(stderr, "Executing:");
diff --git a/debian/patches/seccomp-getuid-geteuid.patch b/debian/patches/seccomp-getuid-geteuid.patch
index c829abaa9..41455aa83 100644
--- a/debian/patches/seccomp-getuid-geteuid.patch
+++ b/debian/patches/seccomp-getuid-geteuid.patch
@@ -1,4 +1,4 @@
-From b2195f2116754f99fff8ceae026931be3aa3cd3b Mon Sep 17 00:00:00 2001
+From 8165600205696cca8a080a5cb6746070512174e9 Mon Sep 17 00:00:00 2001
 From: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>
 Date: Tue, 9 May 2017 13:31:05 -0300
 Subject: Allow getuid and geteuid calls
@@ -20,7 +20,7 @@ Patch-Name: seccomp-getuid-geteuid.patch
 1 file changed, 12 insertions(+)
 diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
-index 997b66ff..4cbaaa2e 100644
+index 6e7de311..e86aa2c9 100644
 --- a/sandbox-seccomp-filter.c
 +++ b/sandbox-seccomp-filter.c
 @@ -175,6 +175,18 @@ static const struct sock_filter preauth_insns[] = {
diff --git a/debian/patches/seccomp-s390-flock-ipc.patch b/debian/patches/seccomp-s390-flock-ipc.patch
index 7b5ed1098..5fb94137d 100644
--- a/debian/patches/seccomp-s390-flock-ipc.patch
+++ b/debian/patches/seccomp-s390-flock-ipc.patch
@@ -1,4 +1,4 @@
-From 057d62d148428cf0411cf37d00feb8741e5a424c Mon Sep 17 00:00:00 2001
+From a5a99443e190a90eb511215aa7c1fa940f79b901 Mon Sep 17 00:00:00 2001
 From: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>
 Date: Tue, 9 May 2017 10:53:04 -0300
 Subject: Allow flock and ipc syscall for s390 architecture
@@ -22,7 +22,7 @@ Patch-Name: seccomp-s390-flock-ipc.patch
 1 file changed, 6 insertions(+)
 diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
-index 2831e9d1..997b66ff 100644
+index ca75cc71..6e7de311 100644
 --- a/sandbox-seccomp-filter.c
 +++ b/sandbox-seccomp-filter.c
 @@ -166,6 +166,9 @@ static const struct sock_filter preauth_insns[] = {
diff --git a/debian/patches/seccomp-s390-ioctl-ep11-crypto.patch b/debian/patches/seccomp-s390-ioctl-ep11-crypto.patch
index 83997695e..595b3d6ec 100644
--- a/debian/patches/seccomp-s390-ioctl-ep11-crypto.patch
+++ b/debian/patches/seccomp-s390-ioctl-ep11-crypto.patch
@@ -1,4 +1,4 @@
-From 375f99251da3754666750fe1ed63575ba909f397 Mon Sep 17 00:00:00 2001
+From 801a62eedaaf47b20dbf4b426dc3e084bf0c8d49 Mon Sep 17 00:00:00 2001
 From: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>
 Date: Tue, 9 May 2017 13:33:30 -0300
 Subject: Enable specific ioctl call for EP11 crypto card (s390)
@@ -19,10 +19,10 @@ Patch-Name: seccomp-s390-ioctl-ep11-crypto.patch
 1 file changed, 2 insertions(+)
 diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
-index 4cbaaa2e..3833424b 100644
+index e86aa2c9..98062f15 100644
 --- a/sandbox-seccomp-filter.c
 +++ b/sandbox-seccomp-filter.c
-@@ -249,6 +249,8 @@ static const struct sock_filter preauth_insns[] = {
+@@ -250,6 +250,8 @@ static const struct sock_filter preauth_insns[] = {
        SC_ALLOW_ARG(__NR_ioctl, 1, Z90STAT_STATUS_MASK),
        SC_ALLOW_ARG(__NR_ioctl, 1, ICARSAMODEXPO),
        SC_ALLOW_ARG(__NR_ioctl, 1, ICARSACRT),
diff --git a/debian/patches/selinux-role.patch b/debian/patches/selinux-role.patch
index ae83d23b0..1402b9025 100644
--- a/debian/patches/selinux-role.patch
+++ b/debian/patches/selinux-role.patch
@@ -1,4 +1,4 @@
-From e5d3ea2ca423a54b1d53d45252cb7173a15600eb Mon Sep 17 00:00:00 2001
+From 4b276122c04aed0726803a92c8ca955e614a4d3a Mon Sep 17 00:00:00 2001
 From: Manoj Srivastava <srivasta@debian.org>
 Date: Sun, 9 Feb 2014 16:09:49 +0000
 Subject: Handle SELinux authorisation roles
@@ -9,7 +9,7 @@ SELinux maintainer, so we'll keep it until we have something better.
 Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1641
 Bug-Debian: http://bugs.debian.org/394795
-Last-Update: 2015-08-19
+Last-Update: 2017-10-04
 Patch-Name: selinux-role.patch
 ---
@@ -31,31 +31,31 @@ Patch-Name: selinux-role.patch
 15 files changed, 97 insertions(+), 30 deletions(-)
 diff --git a/auth.h b/auth.h
-index 338a62da..8c658d16 100644
+index 29835ae9..27a1a88e 100644
 --- a/auth.h
 +++ b/auth.h
-@@ -62,6 +62,7 @@ struct Authctxt {
+@@ -63,6 +63,7 @@ struct Authctxt {
        char            *service;
        struct passwd   *pw;            /* set if 'valid' */
        char            *style;
 +       char            *role;
-        void            *kbdintctxt;
+ 
-        char            *info;          /* Extra info for next auth_log */
+        /* Method lists for multiple authentication */
- #ifdef BSD_AUTH
+        char            **auth_methods; /* modified from server config */
 diff --git a/auth2.c b/auth2.c
-index 946e9235..2f51be23 100644
+index 54070e3a..1f9ec632 100644
 --- a/auth2.c
 +++ b/auth2.c
-@@ -217,7 +217,7 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
+@@ -221,7 +221,7 @@ input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
-        struct ssh *ssh = active_state; /* XXX */
+ {
-        Authctxt *authctxt = ctxt;
+        Authctxt *authctxt = ssh->authctxt;
        Authmethod *m = NULL;
 -       char *user, *service, *method, *style = NULL;
 +       char *user, *service, *method, *style = NULL, *role = NULL;
        int authenticated = 0;
 
        if (authctxt == NULL)
-@@ -229,8 +229,13 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
+@@ -233,8 +233,13 @@ input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
        debug("userauth-request for user %s service %s method %s", user, service, method);
        debug("attempt %d failures %d", authctxt->attempt, authctxt->failures);
 
@@ -69,7 +69,7 @@ index 946e9235..2f51be23 100644
 
        if (authctxt->attempt++ == 0) {
                /* setup auth context */
-@@ -257,8 +262,9 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
+@@ -261,8 +266,9 @@ input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
                    use_privsep ? " [net]" : "");
                authctxt->service = xstrdup(service);
                authctxt->style = style ? xstrdup(style) : NULL;
@@ -81,7 +81,7 @@ index 946e9235..2f51be23 100644
                if (auth2_setup_methods_lists(authctxt) != 0)
                        packet_disconnect("no authentication methods enabled");
 diff --git a/monitor.c b/monitor.c
-index 506645c7..7452e20e 100644
+index cabfeb8a..510e3496 100644
 --- a/monitor.c
 +++ b/monitor.c
 @@ -127,6 +127,7 @@ int mm_answer_sign(int, Buffer *);
@@ -100,7 +100,7 @@ index 506645c7..7452e20e 100644
     {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner},
     {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword},
 #ifdef USE_PAM
-@@ -791,6 +793,7 @@ mm_answer_pwnamallow(int sock, Buffer *m)
+@@ -799,6 +801,7 @@ mm_answer_pwnamallow(int sock, Buffer *m)
 
        /* Allow service/style information on the auth context */
        monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1);
@@ -108,7 +108,7 @@ index 506645c7..7452e20e 100644
        monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1);
 
 #ifdef USE_PAM
-@@ -821,14 +824,37 @@ mm_answer_authserv(int sock, Buffer *m)
+@@ -829,14 +832,37 @@ mm_answer_authserv(int sock, Buffer *m)
 
        authctxt->service = buffer_get_string(m, NULL);
        authctxt->style = buffer_get_string(m, NULL);
@@ -148,7 +148,7 @@ index 506645c7..7452e20e 100644
        return (0);
 }
 
-@@ -1463,7 +1489,7 @@ mm_answer_pty(int sock, Buffer *m)
+@@ -1471,7 +1497,7 @@ mm_answer_pty(int sock, Buffer *m)
        res = pty_allocate(&s->ptyfd, &s->ttyfd, s->tty, sizeof(s->tty));
        if (res == 0)
                goto error;
@@ -171,10 +171,10 @@ index ec41404c..4c7955d7 100644
 
 struct monitor {
 diff --git a/monitor_wrap.c b/monitor_wrap.c
-index d5cb640a..2ff8064a 100644
+index 0e171a6a..d806bb2e 100644
 --- a/monitor_wrap.c
 +++ b/monitor_wrap.c
-@@ -327,10 +327,10 @@ mm_auth2_read_banner(void)
+@@ -336,10 +336,10 @@ mm_auth2_read_banner(void)
        return (banner);
 }
 
@@ -187,7 +187,7 @@ index d5cb640a..2ff8064a 100644
 {
        Buffer m;
 
-@@ -339,12 +339,30 @@ mm_inform_authserv(char *service, char *style)
+@@ -348,12 +348,30 @@ mm_inform_authserv(char *service, char *style)
        buffer_init(&m);
        buffer_put_cstring(&m, service);
        buffer_put_cstring(&m, style ? style : "");
@@ -219,13 +219,13 @@ index d5cb640a..2ff8064a 100644
 int
 mm_auth_password(Authctxt *authctxt, char *password)
 diff --git a/monitor_wrap.h b/monitor_wrap.h
-index 8f9dd896..3e75867c 100644
+index 7b2e8945..a9ccb243 100644
 --- a/monitor_wrap.h
 +++ b/monitor_wrap.h
-@@ -41,7 +41,8 @@ void mm_log_handler(LogLevel, const char *, void *);
+@@ -41,7 +41,8 @@ int mm_is_monitor(void);
- int mm_is_monitor(void);
 DH *mm_choose_dh(int, int, int);
- int mm_key_sign(Key *, u_char **, u_int *, const u_char *, u_int, const char *);
+ int mm_key_sign(struct sshkey *, u_char **, u_int *, const u_char *, u_int,
+     const char *);
 -void mm_inform_authserv(char *, char *);
 +void mm_inform_authserv(char *, char *, char *);
 +void mm_inform_authrole(char *);
@@ -329,7 +329,7 @@ index 3c22a854..c8812942 100644
 void ssh_selinux_setfscreatecon(const char *);
 #endif
 diff --git a/platform.c b/platform.c
-index 973a63e4..cd7bf566 100644
+index 18c7751d..380ee3a4 100644
 --- a/platform.c
 +++ b/platform.c
 @@ -143,7 +143,7 @@ platform_setusercontext(struct passwd *pw)
@@ -364,10 +364,10 @@ index ea4f9c58..60d72ffe 100644
 char *platform_krb5_get_principal_name(const char *);
 int platform_sys_dir_uid(uid_t);
 diff --git a/session.c b/session.c
-index a08aa69d..ea3871eb 100644
+index 4bccb62d..d40afe4f 100644
 --- a/session.c
 +++ b/session.c
-@@ -1325,7 +1325,7 @@ safely_chroot(const char *path, uid_t uid)
+@@ -1312,7 +1312,7 @@ safely_chroot(const char *path, uid_t uid)
 
 /* Set login name, uid, gid, and groups. */
 void
@@ -376,7 +376,7 @@ index a08aa69d..ea3871eb 100644
 {
        char *chroot_path, *tmp;
 
-@@ -1353,7 +1353,7 @@ do_setusercontext(struct passwd *pw)
+@@ -1340,7 +1340,7 @@ do_setusercontext(struct passwd *pw)
                endgrent();
 #endif
 
@@ -385,16 +385,16 @@ index a08aa69d..ea3871eb 100644
 
                if (!in_chroot && options.chroot_directory != NULL &&
                    strcasecmp(options.chroot_directory, "none") != 0) {
-@@ -1489,7 +1489,7 @@ do_child(Session *s, const char *command)
+@@ -1477,7 +1477,7 @@ do_child(struct ssh *ssh, Session *s, const char *command)
 
        /* Force a password change */
        if (s->authctxt->force_pwchange) {
 -               do_setusercontext(pw);
 +               do_setusercontext(pw, s->authctxt->role);
-                child_close_fds();
+                child_close_fds(ssh);
                do_pwchange(s);
                exit(1);
-@@ -1511,7 +1511,7 @@ do_child(Session *s, const char *command)
+@@ -1499,7 +1499,7 @@ do_child(struct ssh *ssh, Session *s, const char *command)
        /* When PAM is enabled we rely on it to do the nologin check */
        if (!options.use_pam)
                do_nologin(pw);
@@ -403,7 +403,7 @@ index a08aa69d..ea3871eb 100644
        /*
         * PAM session modules in do_setusercontext may have
         * generated messages, so if this in an interactive
-@@ -1903,7 +1903,7 @@ session_pty_req(Session *s)
+@@ -1891,7 +1891,7 @@ session_pty_req(struct ssh *ssh, Session *s)
        tty_parse_modes(s->ttyfd, &n_bytes);
 
        if (!use_privsep)
@@ -413,23 +413,23 @@ index a08aa69d..ea3871eb 100644
        /* Set window size from the packet. */
        pty_change_window_size(s->ptyfd, s->row, s->col, s->xpixel, s->ypixel);
 diff --git a/session.h b/session.h
-index 98e1dafe..0a31dce4 100644
+index 54dd1f0c..8535ebce 100644
 --- a/session.h
 +++ b/session.h
 @@ -76,7 +76,7 @@ void   session_pty_cleanup2(Session *);
 Session        *session_new(void);
 Session        *session_by_tty(char *);
- void    session_close(Session *);
+ void    session_close(struct ssh *, Session *);
 -void    do_setusercontext(struct passwd *);
 +void    do_setusercontext(struct passwd *, const char *);
- void    child_set_env(char ***envp, u_int *envsizep, const char *name,
+ 
-                       const char *value);
+ const char     *session_get_remote_name_or_ip(struct ssh *, u_int, int);
 
 diff --git a/sshd.c b/sshd.c
-index 38cf9b49..9221632e 100644
+index a66e9ca6..af1ec337 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -678,7 +678,7 @@ privsep_postauth(Authctxt *authctxt)
+@@ -677,7 +677,7 @@ privsep_postauth(Authctxt *authctxt)
        reseed_prngs();
 
        /* Drop privileges */
diff --git a/debian/patches/series b/debian/patches/series
index c9d79be6a..d1bb1ff5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ selinux-role.patch
 ssh-vulnkey-compat.patch
 keepalive-extensions.patch
 syslog-level-silent.patch
-quieter-signals.patch
 user-group-modes.patch
 scp-quoting.patch
 shell-path.patch
@@ -22,12 +21,8 @@ no-openssl-version-status.patch
 gnome-ssh-askpass2-icon.patch
 systemd-readiness.patch
 debian-config.patch
-regress-integrity-robust.patch
 no-dsa-host-key-by-default.patch
 restore-authorized_keys2.patch
-s390-missing-header.patch
-x32-syntax-error.patch
-fix-incoming-compression-statistics.patch
 seccomp-s390-flock-ipc.patch
 seccomp-getuid-geteuid.patch
 seccomp-s390-ioctl-ep11-crypto.patch
diff --git a/debian/patches/shell-path.patch b/debian/patches/shell-path.patch
index 1fecd756e..29abf10f2 100644
--- a/debian/patches/shell-path.patch
+++ b/debian/patches/shell-path.patch
@@ -1,4 +1,4 @@
-From ce9a126fdaa8ef6488364107cc66d04ecabc8cc4 Mon Sep 17 00:00:00 2001
+From c239ba6fa4560704a237779f82445d5f125847e1 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:00 +0000
 Subject: Look for $SHELL on the path for ProxyCommand/LocalCommand
@@ -16,10 +16,10 @@ Patch-Name: shell-path.patch
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/sshconnect.c b/sshconnect.c
-index 948b638a..7f169a8f 100644
+index dc7a704d..5eed5880 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
-@@ -231,7 +231,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command)
+@@ -235,7 +235,7 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, u_short port,
                /* Execute the proxy command.  Note that we gave up any
                   extra privileges above. */
                signal(SIGPIPE, SIG_DFL);
@@ -28,7 +28,7 @@ index 948b638a..7f169a8f 100644
                perror(argv[0]);
                exit(1);
        }
-@@ -1498,7 +1498,7 @@ ssh_local_cmd(const char *args)
+@@ -1435,7 +1435,7 @@ ssh_local_cmd(const char *args)
        if (pid == 0) {
                signal(SIGPIPE, SIG_DFL);
                debug3("Executing %s -c \"%s\"", shell, args);
diff --git a/debian/patches/ssh-agent-setgid.patch b/debian/patches/ssh-agent-setgid.patch
index 188869fe2..9ac4977b5 100644
--- a/debian/patches/ssh-agent-setgid.patch
+++ b/debian/patches/ssh-agent-setgid.patch
@@ -1,4 +1,4 @@
-From 8c1482336efd745a72cbd27ac07977ccb6d8b35b Mon Sep 17 00:00:00 2001
+From b37d4f364f9c9bfbaf372e903ebbe80ef8ae2264 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:13 +0000
 Subject: Document consequences of ssh-agent being setgid in ssh-agent(1)
diff --git a/debian/patches/ssh-argv0.patch b/debian/patches/ssh-argv0.patch
index f07a061a1..3a560ad78 100644
--- a/debian/patches/ssh-argv0.patch
+++ b/debian/patches/ssh-argv0.patch
@@ -1,4 +1,4 @@
-From 5be45fb4b0459bbff7b4b5a67c2f754c601155df Mon Sep 17 00:00:00 2001
+From 7e5cf5d27a7be47203280c665ca7311269f53671 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:10 +0000
 Subject: ssh(1): Refer to ssh-argv0(1)
@@ -18,10 +18,10 @@ Patch-Name: ssh-argv0.patch
 1 file changed, 1 insertion(+)
 diff --git a/ssh.1 b/ssh.1
-index b1f128c2..22e56a7b 100644
+index 2a2aab30..711fe608 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -1586,6 +1586,7 @@ if an error occurred.
+@@ -1556,6 +1556,7 @@ if an error occurred.
 .Xr sftp 1 ,
 .Xr ssh-add 1 ,
 .Xr ssh-agent 1 ,
diff --git a/debian/patches/ssh-vulnkey-compat.patch b/debian/patches/ssh-vulnkey-compat.patch
index d8f4ec973..ef1ce4e99 100644
--- a/debian/patches/ssh-vulnkey-compat.patch
+++ b/debian/patches/ssh-vulnkey-compat.patch
@@ -1,4 +1,4 @@
-From fb7c3c37876359b7a110e1386a6b7887cd2c8ca2 Mon Sep 17 00:00:00 2001
+From 19971fb92159a621b55f0b9da76dd38a56d7247c Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Sun, 9 Feb 2014 16:09:50 +0000
 Subject: Accept obsolete ssh-vulnkey configuration options
@@ -17,10 +17,10 @@ Patch-Name: ssh-vulnkey-compat.patch
 2 files changed, 2 insertions(+)
 diff --git a/readconf.c b/readconf.c
-index 00d9cc30..32a72957 100644
+index 99e03ee1..d2b28a41 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -186,6 +186,7 @@ static struct {
+@@ -189,6 +189,7 @@ static struct {
        { "fallbacktorsh", oDeprecated },
        { "globalknownhostsfile2", oDeprecated },
        { "rhostsauthentication", oDeprecated },
@@ -29,10 +29,10 @@ index 00d9cc30..32a72957 100644
        { "useroaming", oDeprecated },
        { "usersh", oDeprecated },
 diff --git a/servconf.c b/servconf.c
-index d796b7c8..ca73f7c5 100644
+index 8ba74517..9889fb0a 100644
 --- a/servconf.c
 +++ b/servconf.c
-@@ -521,6 +521,7 @@ static struct {
+@@ -525,6 +525,7 @@ static struct {
        { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL },
        { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL },
        { "strictmodes", sStrictModes, SSHCFG_GLOBAL },
diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch
index 3f012c99c..3ed6287a9 100644
--- a/debian/patches/syslog-level-silent.patch
+++ b/debian/patches/syslog-level-silent.patch
@@ -1,4 +1,4 @@
-From b5695a565e466477305d2ae0059b09e94ae6f44e Mon Sep 17 00:00:00 2001
+From 215bd91f12b0ddb9754483ee6e3c3b4751256dca Mon Sep 17 00:00:00 2001
 From: Jonathan David Amery <jdamery@ysolde.ucam.org>
 Date: Sun, 9 Feb 2014 16:09:54 +0000
 Subject: "LogLevel SILENT" compatibility
@@ -21,7 +21,7 @@ Patch-Name: syslog-level-silent.patch
 2 files changed, 2 insertions(+), 1 deletion(-)
 diff --git a/log.c b/log.c
-index d0f86cf6..0e515e26 100644
+index 99450dd1..1559091d 100644
 --- a/log.c
 +++ b/log.c
 @@ -93,6 +93,7 @@ static struct {
@@ -33,10 +33,10 @@ index d0f86cf6..0e515e26 100644
        { "FATAL",      SYSLOG_LEVEL_FATAL },
        { "ERROR",      SYSLOG_LEVEL_ERROR },
 diff --git a/ssh.c b/ssh.c
-index 32b27bbc..b65f35ac 100644
+index ae37432b..9cb21171 100644
 --- a/ssh.c
 +++ b/ssh.c
-@@ -1167,7 +1167,7 @@ main(int ac, char **av)
+@@ -1166,7 +1166,7 @@ main(int ac, char **av)
        /* Do not allocate a tty if stdin is not a tty. */
        if ((!isatty(fileno(stdin)) || stdin_null_flag) &&
            options.request_tty != REQUEST_TTY_FORCE) {
diff --git a/debian/patches/systemd-readiness.patch b/debian/patches/systemd-readiness.patch
index bddc781f2..537a5cab6 100644
--- a/debian/patches/systemd-readiness.patch
+++ b/debian/patches/systemd-readiness.patch
@@ -1,4 +1,4 @@
-From 49ea641997b0dce73df3271f10a875cb702729b7 Mon Sep 17 00:00:00 2001
+From ba3f6b85ede72ef42987f0069f5ed2b88ebe69fd Mon Sep 17 00:00:00 2001
 From: Michael Biebl <biebl@debian.org>
 Date: Mon, 21 Dec 2015 16:08:47 +0000
 Subject: Add systemd readiness notification support
@@ -14,10 +14,10 @@ Patch-Name: systemd-readiness.patch
 2 files changed, 33 insertions(+)
 diff --git a/configure.ac b/configure.ac
-index a92425db..9d89bc35 100644
+index 3b30736b..483a9038 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4376,6 +4376,29 @@ AC_ARG_WITH([kerberos5],
+@@ -4389,6 +4389,29 @@ AC_ARG_WITH([kerberos5],
 AC_SUBST([GSSLIBS])
 AC_SUBST([K5LIBS])
 
@@ -47,7 +47,7 @@ index a92425db..9d89bc35 100644
 # Looking for programs, paths and files
 
 PRIVSEP_PATH=/var/empty
-@@ -5180,6 +5203,7 @@ echo "                   libldns support: $LDNS_MSG"
+@@ -5196,6 +5219,7 @@ echo "                   libldns support: $LDNS_MSG"
 echo "  Solaris process contract support: $SPC_MSG"
 echo "           Solaris project support: $SP_MSG"
 echo "         Solaris privilege support: $SPP_MSG"
@@ -56,7 +56,7 @@ index a92425db..9d89bc35 100644
 echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
 echo "                  BSD Auth support: $BSD_AUTH_MSG"
 diff --git a/sshd.c b/sshd.c
-index f2f54b51..44772c6d 100644
+index a5a1193d..1fde5a63 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -85,6 +85,10 @@
@@ -70,7 +70,7 @@ index f2f54b51..44772c6d 100644
 #include "xmalloc.h"
 #include "ssh.h"
 #include "ssh2.h"
-@@ -1892,6 +1896,11 @@ main(int ac, char **av)
+@@ -1881,6 +1885,11 @@ main(int ac, char **av)
                        }
                }
 
diff --git a/debian/patches/user-group-modes.patch b/debian/patches/user-group-modes.patch
index 17e7126ca..338c7567d 100644
--- a/debian/patches/user-group-modes.patch
+++ b/debian/patches/user-group-modes.patch
@@ -1,4 +1,4 @@
-From 0b9c0482cbff9ce16384e4247d955676d4d77df3 Mon Sep 17 00:00:00 2001
+From b1033fed87fd9fa24dccab45f00cadcbc7144c47 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:09:58 +0000
 Subject: Allow harmless group-writability
@@ -13,19 +13,18 @@ default.
 Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1060
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=314347
-Last-Update: 2013-09-14
+Last-Update: 2017-10-04
 Patch-Name: user-group-modes.patch
 ---
 auth-rhosts.c |  6 ++----
- auth.c        |  9 +++-----
+ auth.c        |  3 +--
- misc.c        | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ misc.c        | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 misc.h        |  2 ++
- platform.c    | 16 --------------
 readconf.c    |  3 +--
 ssh.1         |  2 ++
 ssh_config.5  |  2 ++
- 8 files changed, 80 insertions(+), 29 deletions(-)
+ 7 files changed, 63 insertions(+), 13 deletions(-)
 diff --git a/auth-rhosts.c b/auth-rhosts.c
 index ecf956f0..4dccd5e6 100644
@@ -52,10 +51,10 @@ index ecf956f0..4dccd5e6 100644
                            pw->pw_name, buf);
                        auth_debug_add("Bad file modes for %.200s", buf);
 diff --git a/auth.c b/auth.c
-index c6390687..90390724 100644
+index 6aec3605..68a1e4a7 100644
 --- a/auth.c
 +++ b/auth.c
-@@ -444,8 +444,7 @@ check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host,
+@@ -467,8 +467,7 @@ check_key_in_hostfiles(struct passwd *pw, struct sshkey *key, const char *host,
                user_hostfile = tilde_expand_filename(userfile, pw->pw_uid);
                if (options.strict_modes &&
                    (stat(user_hostfile, &st) == 0) &&
@@ -65,31 +64,11 @@ index c6390687..90390724 100644
                        logit("Authentication refused for %.100s: "
                            "bad owner or modes for %.200s",
                            pw->pw_name, user_hostfile);
-@@ -507,8 +506,7 @@ auth_secure_path(const char *name, struct stat *stp, const char *pw_dir,
-                snprintf(err, errlen, "%s is not a regular file", buf);
-                return -1;
-        }
-       if ((!platform_sys_dir_uid(stp->st_uid) && stp->st_uid != uid) ||
-           (stp->st_mode & 022) != 0) {
-+       if (!secure_permissions(stp, uid)) {
-                snprintf(err, errlen, "bad ownership or modes for file %s",
-                    buf);
-                return -1;
-@@ -523,8 +521,7 @@ auth_secure_path(const char *name, struct stat *stp, const char *pw_dir,
-                strlcpy(buf, cp, sizeof(buf));
- 
-                if (stat(buf, &st) < 0 ||
-                   (!platform_sys_dir_uid(st.st_uid) && st.st_uid != uid) ||
-                   (st.st_mode & 022) != 0) {
-+                   !secure_permissions(&st, uid)) {
-                        snprintf(err, errlen,
-                            "bad ownership or modes for directory %s", buf);
-                        return -1;
 diff --git a/misc.c b/misc.c
-index cfd32729..6e972f56 100644
+index 05950a47..40aeeef3 100644
 --- a/misc.c
 +++ b/misc.c
-@@ -51,8 +51,9 @@
+@@ -57,8 +57,9 @@
 #include <netdb.h>
 #ifdef HAVE_PATHS_H
 # include <paths.h>
@@ -100,34 +79,10 @@ index cfd32729..6e972f56 100644
 #ifdef SSH_TUN_OPENBSD
 #include <net/if.h>
 #endif
-@@ -61,6 +62,7 @@
+@@ -723,6 +724,55 @@ read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz,
- #include "misc.h"
- #include "log.h"
- #include "ssh.h"
-+#include "platform.h"
- 
- /* remove newline at end of string */
- char *
-@@ -713,6 +715,71 @@ read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz,
        return -1;
 }
 
-+/*
-+ * return 1 if the specified uid is a uid that may own a system directory
-+ * otherwise 0.
-+ */
-+int
-+platform_sys_dir_uid(uid_t uid)
-+{
-+       if (uid == 0)
-+               return 1;
-+#ifdef PLATFORM_SYS_DIR_UID
-+       if (uid == PLATFORM_SYS_DIR_UID)
-+               return 1;
-+#endif
-+       return 0;
-+}
-+
 +int
 +secure_permissions(struct stat *st, uid_t uid)
 +{
@@ -180,11 +135,31 @@ index cfd32729..6e972f56 100644
 int
 tun_open(int tun, int mode)
 {
+@@ -1626,8 +1676,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir,
+                snprintf(err, errlen, "%s is not a regular file", buf);
+                return -1;
+        }
+-       if ((!platform_sys_dir_uid(stp->st_uid) && stp->st_uid != uid) ||
+-           (stp->st_mode & 022) != 0) {
+       if (!secure_permissions(stp, uid)) {
+                snprintf(err, errlen, "bad ownership or modes for file %s",
+                    buf);
+                return -1;
+@@ -1642,8 +1691,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir,
+                strlcpy(buf, cp, sizeof(buf));
+ 
+                if (stat(buf, &st) < 0 ||
+-                   (!platform_sys_dir_uid(st.st_uid) && st.st_uid != uid) ||
+-                   (st.st_mode & 022) != 0) {
+                   !secure_permissions(&st, uid)) {
+                        snprintf(err, errlen,
+                            "bad ownership or modes for directory %s", buf);
+                        return -1;
 diff --git a/misc.h b/misc.h
-index c242f901..8b223b55 100644
+index 153d1137..d8759ab1 100644
 --- a/misc.h
 +++ b/misc.h
-@@ -143,6 +143,8 @@ char        *read_passphrase(const char *, int);
+@@ -163,6 +163,8 @@ char        *read_passphrase(const char *, int);
 int     ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
 int     read_keyfile_line(FILE *, const char *, char *, size_t, u_long *);
 
@@ -193,35 +168,11 @@ index c242f901..8b223b55 100644
 #define MINIMUM(a, b)  (((a) < (b)) ? (a) : (b))
 #define MAXIMUM(a, b)  (((a) > (b)) ? (a) : (b))
 #define ROUNDUP(x, y)   ((((x)+((y)-1))/(y))*(y))
-diff --git a/platform.c b/platform.c
-index cd7bf566..380ee3a4 100644
--- a/platform.c
-+++ b/platform.c
-@@ -197,19 +197,3 @@ platform_krb5_get_principal_name(const char *pw_name)
-        return NULL;
- #endif
- }
-
-/*
- * return 1 if the specified uid is a uid that may own a system directory
- * otherwise 0.
- */
-int
-platform_sys_dir_uid(uid_t uid)
-{
-       if (uid == 0)
-               return 1;
-#ifdef PLATFORM_SYS_DIR_UID
-       if (uid == PLATFORM_SYS_DIR_UID)
-               return 1;
-#endif
-       return 0;
-}
 diff --git a/readconf.c b/readconf.c
-index 0b1370a8..70fac682 100644
+index 45caa095..be3d5873 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -1773,8 +1773,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
+@@ -1766,8 +1766,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
 
                if (fstat(fileno(f), &sb) == -1)
                        fatal("fstat %s: %s", filename, strerror(errno));
@@ -232,10 +183,10 @@ index 0b1370a8..70fac682 100644
        }
 
 diff --git a/ssh.1 b/ssh.1
-index 4011c65a..feef81a5 100644
+index 2ab1697f..3cc94688 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -1484,6 +1484,8 @@ The file format and configuration options are described in
+@@ -1456,6 +1456,8 @@ The file format and configuration options are described in
 .Xr ssh_config 5 .
 Because of the potential for abuse, this file must have strict permissions:
 read/write for the user, and not writable by others.
@@ -245,10 +196,10 @@ index 4011c65a..feef81a5 100644
 .It Pa ~/.ssh/environment
 Contains additional definitions for environment variables; see
 diff --git a/ssh_config.5 b/ssh_config.5
-index e4eaa5ae..a04e5757 100644
+index d6f43c2d..7810a418 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -1827,6 +1827,8 @@ The format of this file is described above.
+@@ -1786,6 +1786,8 @@ The format of this file is described above.
 This file is used by the SSH client.
 Because of the potential for abuse, this file must have strict permissions:
 read/write for the user, and not accessible by others.
diff --git a/debian/patches/x32-syntax-error.patch b/debian/patches/x32-syntax-error.patch
deleted file mode 100644
index c7b7a0a94..000000000
--- a/debian/patches/x32-syntax-error.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4a6a0dd530022333dccf0e54a4c2827662b14109 Mon Sep 17 00:00:00 2001
-From: Damien Miller <djm@mindrot.org>
-Date: Tue, 21 Mar 2017 08:47:55 +1100
-Subject: Fix syntax error on Linux/X32
-Patch from Mike Frysinger
-Origin: https://anongit.mindrot.org/openssh.git/commit/?id=6b853c6f8ba5eecc50f3b57af8e63f8184eb0fa6
-Last-Update: 2017-04-02
-Patch-Name: x32-syntax-error.patch
---
- sandbox-seccomp-filter.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
-index 08dc3a8b..2831e9d1 100644
--- a/sandbox-seccomp-filter.c
-+++ b/sandbox-seccomp-filter.c
-@@ -238,7 +238,7 @@ static const struct sock_filter preauth_insns[] = {
-         * x86-64 syscall under some circumstances, e.g.
-         * https://bugs.debian.org/849923
-         */
-       SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT);
-+       SC_ALLOW(__NR_clock_gettime & ~__X32_SYSCALL_BIT),
- #endif
- 
-        /* Default deny */
author	Colin Watson <cjwatson@debian.org>	2017-10-04 11:23:58 +0100
committer	Colin Watson <cjwatson@debian.org>	2017-10-05 23:58:12 +0100
commit	0556ea972b15607b7e13ff31bc05840881c91dd3 (patch)
tree	d6b8d48062d0278b5ae0eeff42d0e9afa9f26860 /debian/patches
parent	db2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92 (diff)
parent	801a62eedaaf47b20dbf4b426dc3e084bf0c8d49 (diff)