26 files changed, 282 insertions, 250 deletions
diff --git a/debian/patches/authorized-keys-man-symlink.patch b/debian/patches/authorized-keys-man-symlink.patch
index ad2890400..c895e63db 100644
--- a/debian/patches/authorized-keys-man-symlink.patch
+++ b/debian/patches/authorized-keys-man-symlink.patch
@@ -1,4 +1,4 @@
-From 153278a21da639b5ad965632485f79ea4ac5e705 Mon Sep 17 00:00:00 2001
+From 67a6cbb29f77920718884e783238f4a00fe64001 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,7 +13,7 @@ Patch-Name: authorized-keys-man-symlink.patch
 1 file changed, 1 insertion(+)
 diff --git a/Makefile.in b/Makefile.in
-index 6175c6063..0ee0285f6 100644
+index 70050ffb6..ee166114d 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -356,6 +356,7 @@ install-files:
diff --git a/debian/patches/conch-old-privkey-format.patch b/debian/patches/conch-old-privkey-format.patch
index ff5be43d8..90bb3e995 100644
--- a/debian/patches/conch-old-privkey-format.patch
+++ b/debian/patches/conch-old-privkey-format.patch
@@ -1,4 +1,4 @@
-From 38966b4afedee3bb57d3b1b0a7df4ff438fb9fd0 Mon Sep 17 00:00:00 2001
+From 1d2a55436d4b556269f42ad5f7e16608b5a8ed74 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Thu, 30 Aug 2018 00:58:56 +0100
 Subject: Work around conch interoperability failure
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
index 98d97dce8..7963b03ed 100644
--- a/debian/patches/debian-banner.patch
+++ b/debian/patches/debian-banner.patch
@@ -1,4 +1,4 @@
-From 905ffae23105d59b013aac809da6195d231b0395 Mon Sep 17 00:00:00 2001
+From a18385c6866da4d69f46b64626ae5d60b4cf4a66 Mon Sep 17 00:00:00 2001
 From: Kees Cook <kees@debian.org>
 Date: Sun, 9 Feb 2014 16:10:06 +0000
 Subject: Add DebianBanner server configuration option
@@ -8,7 +8,7 @@ initial protocol handshake, for those scared by package-versioning.patch.
 Bug-Debian: http://bugs.debian.org/562048
 Forwarded: not-needed
-Last-Update: 2018-08-24
+Last-Update: 2018-10-19
 Patch-Name: debian-banner.patch
 ---
@@ -19,10 +19,10 @@ Patch-Name: debian-banner.patch
 4 files changed, 18 insertions(+), 1 deletion(-)
 diff --git a/servconf.c b/servconf.c
-index e49984a81..bb43a649c 100644
+index 6caf1db38..c5dd617ef 100644
 --- a/servconf.c
 +++ b/servconf.c
-@@ -181,6 +181,7 @@ initialize_server_options(ServerOptions *options)
+@@ -182,6 +182,7 @@ initialize_server_options(ServerOptions *options)
        options->fingerprint_hash = -1;
        options->disable_forwarding = -1;
        options->expose_userauth_info = -1;
@@ -30,7 +30,7 @@ index e49984a81..bb43a649c 100644
 }
 
 /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */
-@@ -413,6 +414,8 @@ fill_default_server_options(ServerOptions *options)
+@@ -417,6 +418,8 @@ fill_default_server_options(ServerOptions *options)
                options->disable_forwarding = 0;
        if (options->expose_userauth_info == -1)
                options->expose_userauth_info = 0;
@@ -39,7 +39,7 @@ index e49984a81..bb43a649c 100644
 
        assemble_algorithms(options);
 
-@@ -500,6 +503,7 @@ typedef enum {
+@@ -504,6 +507,7 @@ typedef enum {
        sStreamLocalBindMask, sStreamLocalBindUnlink,
        sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,
        sExposeAuthInfo, sRDomain,
@@ -47,15 +47,15 @@ index e49984a81..bb43a649c 100644
        sDeprecated, sIgnore, sUnsupported
 } ServerOpCodes;
 
-@@ -656,6 +660,7 @@ static struct {
+@@ -661,6 +665,7 @@ static struct {
-        { "disableforwarding", sDisableForwarding, SSHCFG_ALL },
        { "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL },
        { "rdomain", sRDomain, SSHCFG_ALL },
+        { "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL },
 +       { "debianbanner", sDebianBanner, SSHCFG_GLOBAL },
        { NULL, sBadOption, 0 }
 };
 
-@@ -2164,6 +2169,10 @@ process_server_config_line(ServerOptions *options, char *line,
+@@ -2173,6 +2178,10 @@ process_server_config_line(ServerOptions *options, char *line,
                        *charptr = xstrdup(arg);
                break;
 
@@ -67,10 +67,10 @@ index e49984a81..bb43a649c 100644
        case sIgnore:
        case sUnsupported:
 diff --git a/servconf.h b/servconf.h
-index 9b117fe27..76098119b 100644
+index 3b76da816..4e3c54042 100644
 --- a/servconf.h
 +++ b/servconf.h
-@@ -211,6 +211,8 @@ typedef struct {
+@@ -212,6 +212,8 @@ typedef struct {
        int     fingerprint_hash;
        int     expose_userauth_info;
        u_int64_t timing_secret;
@@ -80,7 +80,7 @@ index 9b117fe27..76098119b 100644
 
 /* Information about the incoming connection as used by Match */
 diff --git a/sshd.c b/sshd.c
-index ffd3dad6a..698593605 100644
+index 9481272fc..d7e77d343 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -384,7 +384,8 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
@@ -94,10 +94,10 @@ index ffd3dad6a..698593605 100644
            options.version_addendum);
 
 diff --git a/sshd_config.5 b/sshd_config.5
-index 0fbbccbde..96a69ab55 100644
+index e7e55dd71..37e6be38f 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -532,6 +532,11 @@ or
+@@ -543,6 +543,11 @@ or
 .Cm no .
 The default is
 .Cm yes .
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index fd86d5a4d..4866d52ad 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,4 +1,4 @@
-From 157278376c0eb6e4de3d47e8573684095a230685 Mon Sep 17 00:00:00 2001
+From a433d9baa031d7136a8cf3e3807ebff83a3a8634 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
@@ -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 3ed6dfb54..a3d42f2ae 100644
+index 6b01f20d2..661b8bf40 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -1974,7 +1974,7 @@ fill_default_options(Options * options)
+@@ -2000,7 +2000,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 3ed6dfb54..a3d42f2ae 100644
                options->forward_x11_timeout = 1200;
        /*
 diff --git a/ssh.1 b/ssh.1
-index 0a8e63f51..ba55aa665 100644
+index ad1ed0f86..1bcc8edab 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -772,6 +772,16 @@ directive in
+@@ -782,6 +782,16 @@ directive in
 .Xr ssh_config 5
 for more information.
 .Pp
@@ -72,7 +72,7 @@ index 0a8e63f51..ba55aa665 100644
 .It Fl x
 Disables X11 forwarding.
 .Pp
-@@ -780,6 +790,17 @@ Enables trusted X11 forwarding.
+@@ -790,6 +800,17 @@ Enables trusted X11 forwarding.
 Trusted X11 forwardings are not subjected to the X11 SECURITY extension
 controls.
 .Pp
@@ -114,7 +114,7 @@ index bcb9f153d..1b676fb2c 100644
 +    HashKnownHosts yes
 +    GSSAPIAuthentication yes
 diff --git a/ssh_config.5 b/ssh_config.5
-index cb68f51a6..35c578c3b 100644
+index a91355726..1a8e24bd1 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -71,6 +71,22 @@ Since the first obtained value for each parameter is used, more
@@ -140,7 +140,7 @@ index cb68f51a6..35c578c3b 100644
 The file contains keyword-argument pairs, one per line.
 Lines starting with
 .Ql #
-@@ -681,11 +697,12 @@ elapsed.
+@@ -699,11 +715,12 @@ elapsed.
 .It Cm ForwardX11Trusted
 If this option is set to
 .Cm yes ,
@@ -204,7 +204,7 @@ index 2c48105f8..ed8272f6d 100644
 # Example of overriding settings on a per-user basis
 #Match User anoncvs
 diff --git a/sshd_config.5 b/sshd_config.5
-index 9774831fe..15b82e84d 100644
+index 23f71fd1d..ba50a30f1 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
 @@ -56,6 +56,28 @@ Arguments may optionally be enclosed in double quotes
diff --git a/debian/patches/dnssec-sshfp.patch b/debian/patches/dnssec-sshfp.patch
index 6e90d402c..e2acdf1a2 100644
--- a/debian/patches/dnssec-sshfp.patch
+++ b/debian/patches/dnssec-sshfp.patch
@@ -1,4 +1,4 @@
-From 298716354cedb77d8e3672a2157d63e15a778d64 Mon Sep 17 00:00:00 2001
+From 0ee33d93c5c7a5fbb8b027aa24e7c9668125fda9 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
diff --git a/debian/patches/doc-hash-tab-completion.patch b/debian/patches/doc-hash-tab-completion.patch
index 2b7936a5d..c6bc43299 100644
--- a/debian/patches/doc-hash-tab-completion.patch
+++ b/debian/patches/doc-hash-tab-completion.patch
@@ -1,4 +1,4 @@
-From c1af61a47620c9f50efb53774139c308410f9296 Mon Sep 17 00:00:00 2001
+From 1d0c41a7e0b2426733ddb598248d0488c9c00a8b 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 03341a229..cb68f51a6 100644
+index 7d55fa820..a91355726 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -775,6 +775,9 @@ Note that existing names and addresses in known hosts files
+@@ -793,6 +793,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/gnome-ssh-askpass2-icon.patch b/debian/patches/gnome-ssh-askpass2-icon.patch
index eb212da29..b6d4f1239 100644
--- a/debian/patches/gnome-ssh-askpass2-icon.patch
+++ b/debian/patches/gnome-ssh-askpass2-icon.patch
@@ -1,4 +1,4 @@
-From cae89cd0edc9d656661ea05b7ecca4c9a9ba4d77 Mon Sep 17 00:00:00 2001
+From df56506f727e37c13346259bdcd5975e257a259d 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 25edd5cbe..f62bf6672 100644
--- a/debian/patches/gssapi.patch
+++ b/debian/patches/gssapi.patch
@@ -1,4 +1,4 @@
-From e6c7c11ac2576ac62334616bd4408bf64140bba7 Mon Sep 17 00:00:00 2001
+From 72b1d308e6400194ef6e4e7dd45bfa48fa39b5e6 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,14 +17,14 @@ 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: 2018-08-24
+Last-Updated: 2018-10-20
 Patch-Name: gssapi.patch
 ---
 ChangeLog.gssapi | 113 ++++++++++++++++
 Makefile.in      |   3 +-
 auth-krb5.c      |  17 ++-
- auth.c           |  96 +-------------
+ auth.c           |  96 +------------
 auth2-gss.c      |  54 +++++++-
 auth2.c          |   2 +
 canohost.c       |  93 +++++++++++++
@@ -32,17 +32,19 @@ Patch-Name: gssapi.patch
 clientloop.c     |  15 ++-
 config.h.in      |   6 +
 configure.ac     |  24 ++++
- gss-genr.c       | 277 +++++++++++++++++++++++++++++++++++++-
+ gss-genr.c       | 280 +++++++++++++++++++++++++++++++++++++-
 gss-serv-krb5.c  |  85 +++++++++++-
- gss-serv.c       | 184 ++++++++++++++++++++++++--
+ gss-serv.c       | 184 +++++++++++++++++++++++--
 kex.c            |  19 +++
 kex.h            |  14 ++
- kexgssc.c        | 338 +++++++++++++++++++++++++++++++++++++++++++++++
+ kexgssc.c        | 341 +++++++++++++++++++++++++++++++++++++++++++++++
- kexgsss.c        | 295 +++++++++++++++++++++++++++++++++++++++++
+ kexgsss.c        | 300 +++++++++++++++++++++++++++++++++++++++++
 monitor.c        | 122 +++++++++++++++--
 monitor.h        |   3 +
 monitor_wrap.c   |  53 +++++++-
 monitor_wrap.h   |   4 +-
+ opacket.c        |   2 +-
+ opacket.h        |   2 +-
 readconf.c       |  43 ++++++
 readconf.h       |   5 +
 servconf.c       |  26 ++++
@@ -50,13 +52,13 @@ Patch-Name: gssapi.patch
 ssh-gss.h        |  41 +++++-
 ssh_config       |   2 +
 ssh_config.5     |  32 +++++
- sshconnect2.c    | 133 ++++++++++++++++++-
+ sshconnect2.c    | 133 +++++++++++++++++-
- sshd.c           | 112 +++++++++++++++-
+ sshd.c           | 110 +++++++++++++++
 sshd_config      |   2 +
 sshd_config.5    |  10 ++
 sshkey.c         |   3 +-
 sshkey.h         |   1 +
- 35 files changed, 2087 insertions(+), 145 deletions(-)
+ 37 files changed, 2099 insertions(+), 146 deletions(-)
 create mode 100644 ChangeLog.gssapi
 create mode 100644 kexgssc.c
 create mode 100644 kexgsss.c
@@ -181,7 +183,7 @@ index 000000000..f117a336a
 +    (from jbasney AT ncsa.uiuc.edu)
 +    <gssapi-with-mic support is Bugzilla #1008>
 diff --git a/Makefile.in b/Makefile.in
-index 2385c62a8..6175c6063 100644
+index 126b2c742..70050ffb6 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -100,6 +100,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
@@ -253,10 +255,10 @@ index 3096f1c8e..204752e1b 100644
        return (krb5_cc_resolve(ctx, ccname, ccache));
 }
 diff --git a/auth.c b/auth.c
-index 9a3bc96f1..80eb78c48 100644
+index 3ca3762cc..d8e6b4a3d 100644
 --- a/auth.c
 +++ b/auth.c
-@@ -395,7 +395,8 @@ auth_root_allowed(struct ssh *ssh, const char *method)
+@@ -399,7 +399,8 @@ auth_root_allowed(struct ssh *ssh, const char *method)
        case PERMIT_NO_PASSWD:
                if (strcmp(method, "publickey") == 0 ||
                    strcmp(method, "hostbased") == 0 ||
@@ -266,7 +268,7 @@ index 9a3bc96f1..80eb78c48 100644
                        return 1;
                break;
        case PERMIT_FORCED_ONLY:
-@@ -733,99 +734,6 @@ fakepw(void)
+@@ -737,99 +738,6 @@ fakepw(void)
        return (&fake);
 }
 
@@ -460,7 +462,7 @@ index 9351e0428..1f12bb113 100644
        "gssapi-with-mic",
        userauth_gssapi,
 diff --git a/auth2.c b/auth2.c
-index ab8795895..96efe164c 100644
+index 4d19957a6..a77742819 100644
 --- a/auth2.c
 +++ b/auth2.c
 @@ -74,6 +74,7 @@ extern Authmethod method_passwd;
@@ -598,7 +600,7 @@ index 26d62855a..0cadc9f18 100644
 int             get_peer_port(int);
 char           *get_local_ipaddr(int);
 diff --git a/clientloop.c b/clientloop.c
-index ad35cb7ba..e69c5141f 100644
+index 8d312cdaa..1464634b0 100644
 --- a/clientloop.c
 +++ b/clientloop.c
 @@ -112,6 +112,10 @@
@@ -612,7 +614,7 @@ index ad35cb7ba..e69c5141f 100644
 /* import options */
 extern Options options;
 
-@@ -1357,9 +1361,18 @@ client_loop(struct ssh *ssh, int have_pty, int escape_char_arg,
+@@ -1370,9 +1374,18 @@ client_loop(struct ssh *ssh, int have_pty, int escape_char_arg,
                        break;
 
                /* Do channel operations unless rekeying in progress. */
@@ -633,10 +635,10 @@ index ad35cb7ba..e69c5141f 100644
                client_process_net_input(readset);
 
 diff --git a/config.h.in b/config.h.in
-index 7940b4c86..93295da07 100644
+index 91b65db8f..209760c7c 100644
 --- a/config.h.in
 +++ b/config.h.in
-@@ -1749,6 +1749,9 @@
+@@ -1845,6 +1845,9 @@
 /* Use btmp to log bad logins */
 #undef USE_BTMP
 
@@ -646,7 +648,7 @@ index 7940b4c86..93295da07 100644
 /* Use libedit for sftp */
 #undef USE_LIBEDIT
 
-@@ -1764,6 +1767,9 @@
+@@ -1860,6 +1863,9 @@
 /* Use PIPES instead of a socketpair() */
 #undef USE_PIPES
 
@@ -657,10 +659,10 @@ index 7940b4c86..93295da07 100644
 #undef USE_SOLARIS_PRIVS
 
 diff --git a/configure.ac b/configure.ac
-index 83e530750..82428b241 100644
+index 7379ab358..023e7cc55 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -673,6 +673,30 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
+@@ -664,6 +664,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])
@@ -692,7 +694,7 @@ index 83e530750..82428b241 100644
        AC_CHECK_DECL([AU_IPv4], [],
            AC_DEFINE([AU_IPv4], [0], [System only supports IPv4 audit records])
 diff --git a/gss-genr.c b/gss-genr.c
-index d56257b4a..285fc29a5 100644
+index d56257b4a..491e62cee 100644
 --- a/gss-genr.c
 +++ b/gss-genr.c
 @@ -1,7 +1,7 @@
@@ -704,13 +706,16 @@ index d56257b4a..285fc29a5 100644
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
-@@ -41,12 +41,34 @@
+@@ -39,14 +39,37 @@
+ #include "xmalloc.h"
+ #include "ssherr.h"
 #include "sshbuf.h"
+#include "sshkey.h"
 #include "log.h"
 #include "ssh2.h"
 +#include "cipher.h"
 +#include "kex.h"
-+#include <openssl/evp.h>
+#include "digest.h"
 
 #include "ssh-gss.h"
 
@@ -739,7 +744,7 @@ index d56257b4a..285fc29a5 100644
 /* sshbuf_get for gss_buffer_desc */
 int
 ssh_gssapi_get_buffer_desc(struct sshbuf *b, gss_buffer_desc *g)
-@@ -62,6 +84,141 @@ ssh_gssapi_get_buffer_desc(struct sshbuf *b, gss_buffer_desc *g)
+@@ -62,6 +85,143 @@ ssh_gssapi_get_buffer_desc(struct sshbuf *b, gss_buffer_desc *g)
        return 0;
 }
 
@@ -769,10 +774,9 @@ index d56257b4a..285fc29a5 100644
 +       size_t i;
 +       int r, oidpos, enclen;
 +       char *mechs, *encoded;
-+       u_char digest[EVP_MAX_MD_SIZE];
+       u_char digest[SSH_DIGEST_MAX_LENGTH];
 +       char deroid[2];
-+       const EVP_MD *evp_md = EVP_md5();
+       struct ssh_digest_ctx *md;
-+       EVP_MD_CTX md;
 +
 +       if (gss_enc2oid != NULL) {
 +               for (i = 0; gss_enc2oid[i].encoded != NULL; i++)
@@ -794,16 +798,19 @@ index d56257b4a..285fc29a5 100644
 +                       deroid[0] = SSH_GSS_OIDTYPE;
 +                       deroid[1] = gss_supported->elements[i].length;
 +
-+                       EVP_DigestInit(&md, evp_md);
+                       if ((md = ssh_digest_start(SSH_DIGEST_MD5)) == NULL ||
-+                       EVP_DigestUpdate(&md, deroid, 2);
+                           ssh_digest_update(md, deroid, 2) != 0 ||
-+                       EVP_DigestUpdate(&md,
+                           ssh_digest_update(md,
 +                           gss_supported->elements[i].elements,
-+                           gss_supported->elements[i].length);
+                           gss_supported->elements[i].length) != 0 ||
-+                       EVP_DigestFinal(&md, digest, NULL);
+                           ssh_digest_final(md, digest, sizeof(digest)) != 0)
+                               fatal("%s: digest failed", __func__);
 +
-+                       encoded = xmalloc(EVP_MD_size(evp_md) * 2);
+                       encoded = xmalloc(ssh_digest_bytes(SSH_DIGEST_MD5)
-+                       enclen = __b64_ntop(digest, EVP_MD_size(evp_md),
+                           * 2);
-+                           encoded, EVP_MD_size(evp_md) * 2);
+                       enclen = __b64_ntop(digest,
+                           ssh_digest_bytes(SSH_DIGEST_MD5), encoded,
+                           ssh_digest_bytes(SSH_DIGEST_MD5) * 2);
 +
 +                       if (oidpos != 0) {
 +                               if ((r = sshbuf_put_u8(buf, ',')) != 0)
@@ -881,7 +888,7 @@ index d56257b4a..285fc29a5 100644
 /* Check that the OID in a data stream matches that in the context */
 int
 ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len)
-@@ -218,7 +375,7 @@ ssh_gssapi_init_ctx(Gssctxt *ctx, int deleg_creds, gss_buffer_desc *recv_tok,
+@@ -218,7 +378,7 @@ ssh_gssapi_init_ctx(Gssctxt *ctx, int deleg_creds, gss_buffer_desc *recv_tok,
        }
 
        ctx->major = gss_init_sec_context(&ctx->minor,
@@ -890,7 +897,7 @@ index d56257b4a..285fc29a5 100644
            GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag,
            0, NULL, recv_tok, NULL, send_tok, flags, NULL);
 
-@@ -247,9 +404,43 @@ ssh_gssapi_import_name(Gssctxt *ctx, const char *host)
+@@ -247,9 +407,43 @@ ssh_gssapi_import_name(Gssctxt *ctx, const char *host)
        return (ctx->major);
 }
 
@@ -934,7 +941,7 @@ index d56257b4a..285fc29a5 100644
        if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context,
            GSS_C_QOP_DEFAULT, buffer, hash)))
                ssh_gssapi_error(ctx);
-@@ -257,6 +448,19 @@ ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
+@@ -257,6 +451,19 @@ ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
        return (ctx->major);
 }
 
@@ -954,7 +961,7 @@ index d56257b4a..285fc29a5 100644
 void
 ssh_gssapi_buildmic(struct sshbuf *b, const char *user, const char *service,
     const char *context)
-@@ -273,11 +477,16 @@ ssh_gssapi_buildmic(struct sshbuf *b, const char *user, const char *service,
+@@ -273,11 +480,16 @@ ssh_gssapi_buildmic(struct sshbuf *b, const char *user, const char *service,
 }
 
 int
@@ -972,7 +979,7 @@ index d56257b4a..285fc29a5 100644
 
        /* RFC 4462 says we MUST NOT do SPNEGO */
        if (oid->length == spnego_oid.length && 
-@@ -287,6 +496,10 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
+@@ -287,6 +499,10 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
        ssh_gssapi_build_ctx(ctx);
        ssh_gssapi_set_oid(*ctx, oid);
        major = ssh_gssapi_import_name(*ctx, host);
@@ -983,7 +990,7 @@ index d56257b4a..285fc29a5 100644
        if (!GSS_ERROR(major)) {
                major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, 
                    NULL);
-@@ -296,10 +509,66 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
+@@ -296,10 +512,66 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
                            GSS_C_NO_BUFFER);
        }
 
@@ -1540,10 +1547,10 @@ index 593de1208..4e5ead839 100644
     const BIGNUM *, const BIGNUM *, const BIGNUM *, u_char *, size_t *);
 diff --git a/kexgssc.c b/kexgssc.c
 new file mode 100644
-index 000000000..953c0a248
+index 000000000..3c8ae08dd
 --- /dev/null
 +++ b/kexgssc.c
-@@ -0,0 +1,338 @@
+@@ -0,0 +1,341 @@
 +/*
 + * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
 + *
@@ -1602,6 +1609,7 @@ index 000000000..953c0a248
 +       DH *dh; 
 +       BIGNUM *dh_server_pub = NULL;
 +       BIGNUM *shared_secret = NULL;
+       const BIGNUM *pub_key, *dh_p, *dh_g;
 +       BIGNUM *p = NULL;
 +       BIGNUM *g = NULL;       
 +       u_char *kbuf;
@@ -1666,6 +1674,8 @@ index 000000000..953c0a248
 +       
 +       /* Step 1 - e is dh->pub_key */
 +       dh_gen_key(dh, ssh->kex->we_need * 8);
+       DH_get0_key(dh, &pub_key, NULL);
+       DH_get0_pqg(dh, &dh_p, NULL, &dh_g);
 +
 +       /* This is f, we initialise it now to make life easier */
 +       dh_server_pub = BN_new();
@@ -1713,7 +1723,7 @@ index 000000000..953c0a248
 +                               packet_start(SSH2_MSG_KEXGSS_INIT);
 +                               packet_put_string(send_tok.value,
 +                                   send_tok.length);
-+                               packet_put_bignum2(dh->pub_key);
+                               packet_put_bignum2(pub_key);
 +                               first = 0;
 +                       } else {
 +                               packet_start(SSH2_MSG_KEXGSS_CONTINUE);
@@ -1822,7 +1832,7 @@ index 000000000..953c0a248
 +                   sshbuf_ptr(ssh->kex->my), sshbuf_len(ssh->kex->my),
 +                   sshbuf_ptr(ssh->kex->peer), sshbuf_len(ssh->kex->peer),
 +                   (serverhostkey ? serverhostkey : empty), slen,
-+                   dh->pub_key,        /* e */
+                   pub_key,            /* e */
 +                   dh_server_pub,      /* f */
 +                   shared_secret,      /* K */
 +                   hash, &hashlen
@@ -1837,8 +1847,8 @@ index 000000000..953c0a248
 +                   sshbuf_ptr(ssh->kex->peer), sshbuf_len(ssh->kex->peer),
 +                   (serverhostkey ? serverhostkey : empty), slen,
 +                   min, nbits, max,
-+                   dh->p, dh->g,
+                   dh_p, dh_g,
-+                   dh->pub_key,
+                   pub_key,
 +                   dh_server_pub,
 +                   shared_secret,
 +                   hash, &hashlen
@@ -1884,10 +1894,10 @@ index 000000000..953c0a248
 +#endif /* GSSAPI */
 diff --git a/kexgsss.c b/kexgsss.c
 new file mode 100644
-index 000000000..31ec6a890
+index 000000000..18070f1d7
 --- /dev/null
 +++ b/kexgsss.c
-@@ -0,0 +1,295 @@
+@@ -0,0 +1,300 @@
 +/*
 + * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
 + *
@@ -1958,6 +1968,7 @@ index 000000000..31ec6a890
 +       u_char *kbuf;
 +       DH *dh;
 +       int min = -1, max = -1, nbits = -1;
+       const BIGNUM *pub_key, *dh_p, *dh_g;
 +       BIGNUM *shared_secret = NULL;
 +       BIGNUM *dh_client_pub = NULL;
 +       int type = 0;
@@ -2008,10 +2019,11 @@ index 000000000..31ec6a890
 +                   nbits, MIN(DH_GRP_MAX, max)));
 +               if (dh == NULL)
 +                       packet_disconnect("Protocol error: no matching group found");
+               DH_get0_pqg(dh, &dh_p, NULL, &dh_g);
 +
 +               packet_start(SSH2_MSG_KEXGSS_GROUP);
-+               packet_put_bignum2(dh->p);
+               packet_put_bignum2(dh_p);
-+               packet_put_bignum2(dh->g);
+               packet_put_bignum2(dh_g);
 +               packet_send();
 +
 +               packet_write_wait();
@@ -2103,6 +2115,9 @@ index 000000000..31ec6a890
 +       memset(kbuf, 0, klen);
 +       free(kbuf);
 +
+       DH_get0_key(dh, &pub_key, NULL);
+       DH_get0_pqg(dh, &dh_p, NULL, &dh_g);
+
 +       hashlen = sizeof(hash);
 +       switch (ssh->kex->kex_type) {
 +       case KEX_GSS_GRP1_SHA1:
@@ -2113,7 +2128,7 @@ index 000000000..31ec6a890
 +                   sshbuf_ptr(ssh->kex->peer), sshbuf_len(ssh->kex->peer),
 +                   sshbuf_ptr(ssh->kex->my), sshbuf_len(ssh->kex->my),
 +                   NULL, 0, /* Change this if we start sending host keys */
-+                   dh_client_pub, dh->pub_key, shared_secret,
+                   dh_client_pub, pub_key, shared_secret,
 +                   hash, &hashlen
 +               );
 +               break;
@@ -2125,9 +2140,9 @@ index 000000000..31ec6a890
 +                   sshbuf_ptr(ssh->kex->my), sshbuf_len(ssh->kex->my),
 +                   NULL, 0,
 +                   min, nbits, max,
-+                   dh->p, dh->g,
+                   dh_p, dh_g,
 +                   dh_client_pub,
-+                   dh->pub_key,
+                   pub_key,
 +                   shared_secret,
 +                   hash, &hashlen
 +               );
@@ -2151,7 +2166,7 @@ index 000000000..31ec6a890
 +               fatal("Couldn't get MIC");
 +
 +       packet_start(SSH2_MSG_KEXGSS_COMPLETE);
-+       packet_put_bignum2(dh->pub_key);
+       packet_put_bignum2(pub_key);
 +       packet_put_string(msg_tok.value,msg_tok.length);
 +
 +       if (send_tok.length != 0) {
@@ -2184,10 +2199,10 @@ index 000000000..31ec6a890
 +}
 +#endif /* GSSAPI */
 diff --git a/monitor.c b/monitor.c
-index d4b4b0471..4e574a2ae 100644
+index 531b2993a..eabc1e89b 100644
 --- a/monitor.c
 +++ b/monitor.c
-@@ -143,6 +143,8 @@ int mm_answer_gss_setup_ctx(int, struct sshbuf *);
+@@ -145,6 +145,8 @@ int mm_answer_gss_setup_ctx(int, struct sshbuf *);
 int mm_answer_gss_accept_ctx(int, struct sshbuf *);
 int mm_answer_gss_userok(int, struct sshbuf *);
 int mm_answer_gss_checkmic(int, struct sshbuf *);
@@ -2196,7 +2211,7 @@ index d4b4b0471..4e574a2ae 100644
 #endif
 
 #ifdef SSH_AUDIT_EVENTS
-@@ -213,11 +215,18 @@ struct mon_table mon_dispatch_proto20[] = {
+@@ -215,11 +217,18 @@ struct mon_table mon_dispatch_proto20[] = {
     {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx},
     {MONITOR_REQ_GSSUSEROK, MON_ONCE|MON_AUTHDECIDE, mm_answer_gss_userok},
     {MONITOR_REQ_GSSCHECKMIC, MON_ONCE, mm_answer_gss_checkmic},
@@ -2215,7 +2230,7 @@ index d4b4b0471..4e574a2ae 100644
 #ifdef WITH_OPENSSL
     {MONITOR_REQ_MODULI, 0, mm_answer_moduli},
 #endif
-@@ -287,6 +296,10 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
+@@ -289,6 +298,10 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
        /* Permit requests for moduli and signatures */
        monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
        monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
@@ -2226,7 +2241,7 @@ index d4b4b0471..4e574a2ae 100644
 
        /* The first few requests do not require asynchronous access */
        while (!authenticated) {
-@@ -399,6 +412,10 @@ monitor_child_postauth(struct monitor *pmonitor)
+@@ -401,6 +414,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);
@@ -2237,7 +2252,7 @@ index d4b4b0471..4e574a2ae 100644
 
        if (auth_opts->permit_pty_flag) {
                monitor_permit(mon_dispatch, MONITOR_REQ_PTY, 1);
-@@ -1662,6 +1679,13 @@ monitor_apply_keystate(struct monitor *pmonitor)
+@@ -1666,6 +1683,13 @@ monitor_apply_keystate(struct monitor *pmonitor)
 # endif
 #endif /* WITH_OPENSSL */
                kex->kex[KEX_C25519_SHA256] = kexc25519_server;
@@ -2251,7 +2266,7 @@ index d4b4b0471..4e574a2ae 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;
-@@ -1752,8 +1776,8 @@ mm_answer_gss_setup_ctx(int sock, struct sshbuf *m)
+@@ -1756,8 +1780,8 @@ mm_answer_gss_setup_ctx(int sock, struct sshbuf *m)
        u_char *p;
        int r;
 
@@ -2262,7 +2277,7 @@ index d4b4b0471..4e574a2ae 100644
 
        if ((r = sshbuf_get_string(m, &p, &len)) != 0)
                fatal("%s: buffer error: %s", __func__, ssh_err(r));
-@@ -1785,8 +1809,8 @@ mm_answer_gss_accept_ctx(int sock, struct sshbuf *m)
+@@ -1789,8 +1813,8 @@ mm_answer_gss_accept_ctx(int sock, struct sshbuf *m)
        OM_uint32 flags = 0; /* GSI needs this */
        int r;
 
@@ -2273,7 +2288,7 @@ index d4b4b0471..4e574a2ae 100644
 
        if ((r = ssh_gssapi_get_buffer_desc(m, &in)) != 0)
                fatal("%s: buffer error: %s", __func__, ssh_err(r));
-@@ -1806,6 +1830,7 @@ mm_answer_gss_accept_ctx(int sock, struct sshbuf *m)
+@@ -1810,6 +1834,7 @@ mm_answer_gss_accept_ctx(int sock, struct sshbuf *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);
@@ -2281,7 +2296,7 @@ index d4b4b0471..4e574a2ae 100644
        }
        return (0);
 }
-@@ -1817,8 +1842,8 @@ mm_answer_gss_checkmic(int sock, struct sshbuf *m)
+@@ -1821,8 +1846,8 @@ mm_answer_gss_checkmic(int sock, struct sshbuf *m)
        OM_uint32 ret;
        int r;
 
@@ -2292,7 +2307,7 @@ index d4b4b0471..4e574a2ae 100644
 
        if ((r = ssh_gssapi_get_buffer_desc(m, &gssbuf)) != 0 ||
            (r = ssh_gssapi_get_buffer_desc(m, &mic)) != 0)
-@@ -1847,10 +1872,11 @@ mm_answer_gss_userok(int sock, struct sshbuf *m)
+@@ -1851,10 +1876,11 @@ mm_answer_gss_userok(int sock, struct sshbuf *m)
        int r, authenticated;
        const char *displayname;
 
@@ -2307,7 +2322,7 @@ index d4b4b0471..4e574a2ae 100644
 
        sshbuf_reset(m);
        if ((r = sshbuf_put_u32(m, authenticated)) != 0)
-@@ -1867,5 +1893,83 @@ mm_answer_gss_userok(int sock, struct sshbuf *m)
+@@ -1871,5 +1897,83 @@ mm_answer_gss_userok(int sock, struct sshbuf *m)
        /* Monitor loop will terminate if authenticated */
        return (authenticated);
 }
@@ -2490,8 +2505,34 @@ index 644da081d..7f93144ff 100644
 #endif
 
 #ifdef USE_PAM
+diff --git a/opacket.c b/opacket.c
+index e637d7a71..7672c0b59 100644
+--- a/opacket.c
+++ b/opacket.c
+@@ -80,7 +80,7 @@ ssh_packet_put_raw(struct ssh *ssh, const void *buf, u_int len)
+ 
+ #ifdef WITH_OPENSSL
+ void
+-ssh_packet_put_bignum2(struct ssh *ssh, BIGNUM * value)
+ssh_packet_put_bignum2(struct ssh *ssh, const BIGNUM * value)
+ {
+        int r;
+ 
+diff --git a/opacket.h b/opacket.h
+index f92fe586e..1cf66a2d3 100644
+--- a/opacket.h
+++ b/opacket.h
+@@ -7,7 +7,7 @@ void     ssh_packet_start(struct ssh *, u_char);
+ void     ssh_packet_put_char(struct ssh *, int ch);
+ void     ssh_packet_put_int(struct ssh *, u_int value);
+ void     ssh_packet_put_int64(struct ssh *, u_int64_t value);
+-void     ssh_packet_put_bignum2(struct ssh *, BIGNUM * value);
+void     ssh_packet_put_bignum2(struct ssh *, const BIGNUM * value);
+ void     ssh_packet_put_ecpoint(struct ssh *, const EC_GROUP *, const EC_POINT *);
+ void     ssh_packet_put_string(struct ssh *, const void *buf, u_int len);
+ void     ssh_packet_put_cstring(struct ssh *, const char *str);
 diff --git a/readconf.c b/readconf.c
-index db5f2d547..4ad3c75fe 100644
+index 433811521..36bc5e59a 100644
 --- a/readconf.c
 +++ b/readconf.c
 @@ -161,6 +161,8 @@ typedef enum {
@@ -2524,7 +2565,7 @@ index db5f2d547..4ad3c75fe 100644
 #endif
 #ifdef ENABLE_PKCS11
        { "smartcarddevice", oPKCS11Provider },
-@@ -973,10 +985,30 @@ parse_time:
+@@ -974,10 +986,30 @@ parse_time:
                intptr = &options->gss_authentication;
                goto parse_flag;
 
@@ -2555,7 +2596,7 @@ index db5f2d547..4ad3c75fe 100644
        case oBatchMode:
                intptr = &options->batch_mode;
                goto parse_flag;
-@@ -1817,7 +1849,12 @@ initialize_options(Options * options)
+@@ -1842,7 +1874,12 @@ initialize_options(Options * options)
        options->pubkey_authentication = -1;
        options->challenge_response_authentication = -1;
        options->gss_authentication = -1;
@@ -2568,7 +2609,7 @@ index db5f2d547..4ad3c75fe 100644
        options->password_authentication = -1;
        options->kbd_interactive_authentication = -1;
        options->kbd_interactive_devices = NULL;
-@@ -1962,8 +1999,14 @@ fill_default_options(Options * options)
+@@ -1988,8 +2025,14 @@ fill_default_options(Options * options)
                options->challenge_response_authentication = 1;
        if (options->gss_authentication == -1)
                options->gss_authentication = 0;
@@ -2584,7 +2625,7 @@ index db5f2d547..4ad3c75fe 100644
                options->password_authentication = 1;
        if (options->kbd_interactive_authentication == -1)
 diff --git a/readconf.h b/readconf.h
-index c56887816..5ea0c296b 100644
+index fc7e38251..8e4900d01 100644
 --- a/readconf.h
 +++ b/readconf.h
 @@ -40,7 +40,12 @@ typedef struct {
@@ -2601,7 +2642,7 @@ index c56887816..5ea0c296b 100644
                                                 * authentication. */
        int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
 diff --git a/servconf.c b/servconf.c
-index c0f6af0be..e1ae07fb7 100644
+index 932d363bb..4668b8a45 100644
 --- a/servconf.c
 +++ b/servconf.c
 @@ -124,8 +124,10 @@ initialize_server_options(ServerOptions *options)
@@ -2615,7 +2656,7 @@ index c0f6af0be..e1ae07fb7 100644
        options->password_authentication = -1;
        options->kbd_interactive_authentication = -1;
        options->challenge_response_authentication = -1;
-@@ -333,10 +335,14 @@ fill_default_server_options(ServerOptions *options)
+@@ -337,10 +339,14 @@ fill_default_server_options(ServerOptions *options)
                options->kerberos_get_afs_token = 0;
        if (options->gss_authentication == -1)
                options->gss_authentication = 0;
@@ -2630,7 +2671,7 @@ index c0f6af0be..e1ae07fb7 100644
        if (options->password_authentication == -1)
                options->password_authentication = 1;
        if (options->kbd_interactive_authentication == -1)
-@@ -481,6 +487,7 @@ typedef enum {
+@@ -485,6 +491,7 @@ typedef enum {
        sHostKeyAlgorithms,
        sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile,
        sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
@@ -2638,7 +2679,7 @@ index c0f6af0be..e1ae07fb7 100644
        sAcceptEnv, sSetEnv, sPermitTunnel,
        sMatch, sPermitOpen, sPermitListen, sForceCommand, sChrootDirectory,
        sUsePrivilegeSeparation, sAllowAgentForwarding,
-@@ -555,12 +562,20 @@ static struct {
+@@ -559,12 +566,20 @@ static struct {
 #ifdef GSSAPI
        { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
        { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
@@ -2659,7 +2700,7 @@ index c0f6af0be..e1ae07fb7 100644
        { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
        { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
        { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },
-@@ -1459,6 +1474,10 @@ process_server_config_line(ServerOptions *options, char *line,
+@@ -1468,6 +1483,10 @@ process_server_config_line(ServerOptions *options, char *line,
                intptr = &options->gss_authentication;
                goto parse_flag;
 
@@ -2670,7 +2711,7 @@ index c0f6af0be..e1ae07fb7 100644
        case sGssCleanupCreds:
                intptr = &options->gss_cleanup_creds;
                goto parse_flag;
-@@ -1467,6 +1486,10 @@ process_server_config_line(ServerOptions *options, char *line,
+@@ -1476,6 +1495,10 @@ process_server_config_line(ServerOptions *options, char *line,
                intptr = &options->gss_strict_acceptor;
                goto parse_flag;
 
@@ -2681,7 +2722,7 @@ index c0f6af0be..e1ae07fb7 100644
        case sPasswordAuthentication:
                intptr = &options->password_authentication;
                goto parse_flag;
-@@ -2551,7 +2574,10 @@ dump_config(ServerOptions *o)
+@@ -2560,7 +2583,10 @@ dump_config(ServerOptions *o)
 #endif
 #ifdef GSSAPI
        dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
@@ -2693,10 +2734,10 @@ index c0f6af0be..e1ae07fb7 100644
        dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
        dump_cfg_fmtint(sKbdInteractiveAuthentication,
 diff --git a/servconf.h b/servconf.h
-index 557521d73..9b117fe27 100644
+index 0175e00e8..3b76da816 100644
 --- a/servconf.h
 +++ b/servconf.h
-@@ -124,8 +124,10 @@ typedef struct {
+@@ -125,8 +125,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 */
@@ -2825,10 +2866,10 @@ index c12f5ef52..bcb9f153d 100644
 #   CheckHostIP yes
 #   AddressFamily any
 diff --git a/ssh_config.5 b/ssh_config.5
-index f499396a3..5b99921b4 100644
+index 4d5b01d3e..16c79368a 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -718,10 +718,42 @@ The default is
+@@ -736,10 +736,42 @@ The default is
 Specifies whether user authentication based on GSSAPI is allowed.
 The default is
 .Cm no .
@@ -2872,7 +2913,7 @@ index f499396a3..5b99921b4 100644
 Indicates that
 .Xr ssh 1
 diff --git a/sshconnect2.c b/sshconnect2.c
-index 10e4f0a08..c6a1b1271 100644
+index 1675f3935..8c872a4fb 100644
 --- a/sshconnect2.c
 +++ b/sshconnect2.c
 @@ -162,6 +162,11 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
@@ -2985,7 +3026,7 @@ index 10e4f0a08..c6a1b1271 100644
        {"gssapi-with-mic",
                userauth_gssapi,
                NULL,
-@@ -657,25 +723,40 @@ userauth_gssapi(Authctxt *authctxt)
+@@ -686,25 +752,40 @@ userauth_gssapi(Authctxt *authctxt)
        static u_int mech = 0;
        OM_uint32 min;
        int r, ok = 0;
@@ -3028,7 +3069,7 @@ index 10e4f0a08..c6a1b1271 100644
        if (!ok)
                return 0;
 
-@@ -906,6 +987,54 @@ input_gssapi_error(int type, u_int32_t plen, struct ssh *ssh)
+@@ -935,6 +1016,54 @@ input_gssapi_error(int type, u_int32_t plen, struct ssh *ssh)
        free(lang);
        return r;
 }
@@ -3084,7 +3125,7 @@ index 10e4f0a08..c6a1b1271 100644
 
 int
 diff --git a/sshd.c b/sshd.c
-index a738c3ab6..2e453cdf8 100644
+index ba26287ba..539a000fd 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -123,6 +123,10 @@
@@ -3098,16 +3139,7 @@ index a738c3ab6..2e453cdf8 100644
 /* Re-exec fds */
 #define REEXEC_DEVCRYPTO_RESERVED_FD   (STDERR_FILENO + 1)
 #define REEXEC_STARTUP_PIPE_FD         (STDERR_FILENO + 2)
-@@ -536,7 +540,7 @@ privsep_preauth_child(void)
+@@ -1810,10 +1814,13 @@ main(int ac, char **av)
- 
- #ifdef GSSAPI
-        /* Cache supported mechanism OIDs for later use */
-       if (options.gss_authentication)
-+       if (options.gss_authentication || options.gss_keyex)
-                ssh_gssapi_prepare_supported_oids();
- #endif
- 
-@@ -1811,10 +1815,13 @@ main(int ac, char **av)
                free(fp);
        }
        accumulate_host_timing_secret(cfg, NULL);
@@ -3121,7 +3153,7 @@ index a738c3ab6..2e453cdf8 100644
 
        /*
         * Load certificates. They are stored in an array at identical
-@@ -2105,6 +2112,60 @@ main(int ac, char **av)
+@@ -2104,6 +2111,60 @@ main(int ac, char **av)
            rdomain == NULL ? "" : "\"");
        free(laddr);
 
@@ -3182,7 +3214,7 @@ index a738c3ab6..2e453cdf8 100644
        /*
         * We don't want to listen forever unless the other side
         * successfully authenticates itself.  So we set up an alarm which is
-@@ -2288,6 +2349,48 @@ do_ssh2_kex(void)
+@@ -2287,6 +2348,48 @@ do_ssh2_kex(void)
        myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal(
            list_hostkey_types());
 
@@ -3231,7 +3263,7 @@ index a738c3ab6..2e453cdf8 100644
        /* start key exchange */
        if ((r = kex_setup(active_state, myproposal)) != 0)
                fatal("kex_setup: %s", ssh_err(r));
-@@ -2305,6 +2408,13 @@ do_ssh2_kex(void)
+@@ -2304,6 +2407,13 @@ do_ssh2_kex(void)
 # endif
 #endif
        kex->kex[KEX_C25519_SHA256] = kexc25519_server;
@@ -3259,10 +3291,10 @@ index 19b7c91a1..2c48105f8 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 e1b54ba20..a0ac717c7 100644
+index c6484370b..985eef5a2 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -637,6 +637,11 @@ The default is
+@@ -648,6 +648,11 @@ The default is
 Specifies whether user authentication based on GSSAPI is allowed.
 The default is
 .Cm no .
@@ -3274,7 +3306,7 @@ index e1b54ba20..a0ac717c7 100644
 .It Cm GSSAPICleanupCredentials
 Specifies whether to automatically destroy the user's credentials cache
 on logout.
-@@ -656,6 +661,11 @@ machine's default store.
+@@ -667,6 +672,11 @@ machine's default store.
 This facility is provided to assist with operation on multi homed machines.
 The default is
 .Cm yes .
@@ -3287,10 +3319,10 @@ index e1b54ba20..a0ac717c7 100644
 Specifies the key types that will be accepted for hostbased authentication
 as a list of comma-separated patterns.
 diff --git a/sshkey.c b/sshkey.c
-index 72c08c7e0..91e99a262 100644
+index 6555c5ef8..a85c185fc 100644
 --- a/sshkey.c
 +++ b/sshkey.c
-@@ -140,6 +140,7 @@ static const struct keytype keytypes[] = {
+@@ -135,6 +135,7 @@ static const struct keytype keytypes[] = {
 #  endif /* OPENSSL_HAS_NISTP521 */
 # endif /* OPENSSL_HAS_ECC */
 #endif /* WITH_OPENSSL */
@@ -3298,7 +3330,7 @@ index 72c08c7e0..91e99a262 100644
        { NULL, NULL, NULL, -1, -1, 0, 0 }
 };
 
-@@ -228,7 +229,7 @@ sshkey_alg_list(int certs_only, int plain_only, int include_sigonly, char sep)
+@@ -223,7 +224,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++) {
@@ -3308,10 +3340,10 @@ index 72c08c7e0..91e99a262 100644
                if (!include_sigonly && kt->sigonly)
                        continue;
 diff --git a/sshkey.h b/sshkey.h
-index 9060b2ecb..0cbdcfd74 100644
+index f6a007fdf..f54deb0c0 100644
 --- a/sshkey.h
 +++ b/sshkey.h
-@@ -63,6 +63,7 @@ enum sshkey_types {
+@@ -64,6 +64,7 @@ enum sshkey_types {
        KEY_ED25519_CERT,
        KEY_XMSS,
        KEY_XMSS_CERT,
diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index fc052ea73..4207302c3 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -1,4 +1,4 @@
-From 2c0a1fef2aaf16c5b97694139239797f0ea33d27 Mon Sep 17 00:00:00 2001
+From 7ba31c6ff505278fb9f33b695605ca3a093caba2 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: 2018-08-24
+Last-Update: 2018-10-19
 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 6e26ba32d..3fd0fe7b7 100644
+index 5e655e924..052d4b1ac 100644
 --- a/readconf.c
 +++ b/readconf.c
 @@ -175,6 +175,7 @@ typedef enum {
        oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
        oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes,
-        oPubkeyAcceptedKeyTypes, oProxyJump,
+        oPubkeyAcceptedKeyTypes, oCASignatureAlgorithms, oProxyJump,
 +       oProtocolKeepAlives, oSetupTimeOut,
        oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported
 } OpCodes;
 
-@@ -321,6 +322,8 @@ static struct {
+@@ -322,6 +323,8 @@ static struct {
        { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes },
        { "ignoreunknown", oIgnoreUnknown },
        { "proxyjump", oProxyJump },
@@ -46,7 +46,7 @@ index 6e26ba32d..3fd0fe7b7 100644
 
        { NULL, oBadOption }
 };
-@@ -1401,6 +1404,8 @@ parse_keytypes:
+@@ -1415,6 +1418,8 @@ parse_keytypes:
                goto parse_flag;
 
        case oServerAliveInterval:
@@ -55,7 +55,7 @@ index 6e26ba32d..3fd0fe7b7 100644
                intptr = &options->server_alive_interval;
                goto parse_time;
 
-@@ -2075,8 +2080,13 @@ fill_default_options(Options * options)
+@@ -2101,8 +2106,13 @@ fill_default_options(Options * options)
                options->rekey_interval = 0;
        if (options->verify_host_key_dns == -1)
                options->verify_host_key_dns = 0;
@@ -72,7 +72,7 @@ index 6e26ba32d..3fd0fe7b7 100644
                options->server_alive_count_max = 3;
        if (options->control_master == -1)
 diff --git a/ssh_config.5 b/ssh_config.5
-index 5b99921b4..86ada128e 100644
+index 16c79368a..54e143c93 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -247,8 +247,12 @@ Valid arguments are
@@ -89,7 +89,7 @@ index 5b99921b4..86ada128e 100644
 The argument must be
 .Cm yes
 or
-@@ -1463,7 +1467,14 @@ from the server,
+@@ -1485,7 +1489,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 5b99921b4..86ada128e 100644
 .It Cm SetEnv
 Directly specify one or more environment variables and their contents to
 be sent to the server.
-@@ -1543,6 +1554,12 @@ Specifies whether the system should send TCP keepalive messages to the
+@@ -1565,6 +1576,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 5b99921b4..86ada128e 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 a0ac717c7..0fbbccbde 100644
+index 985eef5a2..e7e55dd71 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -1566,6 +1566,9 @@ This avoids infinitely hanging sessions.
+@@ -1577,6 +1577,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 3f0d5fba3..75ed46db7 100644
--- a/debian/patches/mention-ssh-keygen-on-keychange.patch
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -1,4 +1,4 @@
-From 0e0121b6dc0ffc2ec6a171328fea530378df2b3b Mon Sep 17 00:00:00 2001
+From bb8bb2621914ad600202e38d5b9b4f4544b191e5 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 a2efe6d15..ab5966066 100644
+index 700ea6c3c..158e8146f 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
-@@ -1112,9 +1112,13 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
+@@ -1121,9 +1121,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,7 +32,7 @@ index a2efe6d15..ab5966066 100644
                }
                /* The host key has changed. */
                warn_changed_key(host_key);
-@@ -1123,6 +1127,9 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
+@@ -1132,6 +1136,9 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                error("Offending %s key in %s:%lu",
                    sshkey_type(host_found->key),
                    host_found->file, host_found->line);
diff --git a/debian/patches/no-openssl-version-status.patch b/debian/patches/no-openssl-version-status.patch
index 9c9c664d4..3b2e05e58 100644
--- a/debian/patches/no-openssl-version-status.patch
+++ b/debian/patches/no-openssl-version-status.patch
@@ -1,4 +1,4 @@
-From 4d75300bdb447824c974febd3d04331755dde3ca Mon Sep 17 00:00:00 2001
+From 690051b3aa4ff72af57e4a82d640858357eef820 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
@@ -23,7 +23,7 @@ Patch-Name: no-openssl-version-status.patch
 2 files changed, 4 insertions(+), 3 deletions(-)
 diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
-index 259fccbec..aaa953f2d 100644
+index 8b4a36274..ea0b0c9fb 100644
 --- a/openbsd-compat/openssl-compat.c
 +++ b/openbsd-compat/openssl-compat.c
 @@ -34,7 +34,7 @@
diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
index dacff74c3..cdb905b2e 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -1,4 +1,4 @@
-From f48c4fd12f8ecd275226e357454e45f10c20ac92 Mon Sep 17 00:00:00 2001
+From 96c85e746d4f94c7d2748a200e5817ad8a987918 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
@@ -44,7 +44,7 @@ index ef0de0850..149846c8c 100644
 .Sh SEE ALSO
 .Xr ssh-keygen 1 ,
 diff --git a/ssh-keygen.1 b/ssh-keygen.1
-index dd6e7e5a8..33e0bbcc1 100644
+index bfa2eb5f3..da6b5ed76 100644
 --- a/ssh-keygen.1
 +++ b/ssh-keygen.1
 @@ -176,9 +176,7 @@ key in
@@ -78,7 +78,7 @@ index dd6e7e5a8..33e0bbcc1 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
-@@ -864,7 +860,7 @@ on all machines
+@@ -877,7 +873,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 dd6e7e5a8..33e0bbcc1 100644
 The file format is described in
 .Xr moduli 5 .
 diff --git a/ssh.1 b/ssh.1
-index cb0fdd50e..d41426781 100644
+index 81f29af43..5dfad6daa 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -850,6 +850,10 @@ implements public key authentication protocol automatically,
+@@ -860,6 +860,10 @@ implements public key authentication protocol automatically,
 using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
 The HISTORY section of
 .Xr ssl 8
@@ -133,11 +133,11 @@ index 57a7fd66b..4abc01d66 100644
 .Xr sshd_config 5 ,
 .Xr inetd 8 ,
 diff --git a/sshd_config.5 b/sshd_config.5
-index 96a69ab55..9774831fe 100644
+index 37e6be38f..23f71fd1d 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -384,8 +384,7 @@ then no banner is displayed.
+@@ -395,8 +395,7 @@ Certificates signed using other algorithms will not be accepted for
- By default, no banner is displayed.
+ public key or host-based authentication.
 .It Cm ChallengeResponseAuthentication
 Specifies whether challenge-response authentication is allowed (e.g. via
 -PAM or through authentication styles supported in
diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch
index 470d057b2..809c78846 100644
--- a/debian/patches/package-versioning.patch
+++ b/debian/patches/package-versioning.patch
@@ -1,4 +1,4 @@
-From 97c5d99b8d1957d5a29ca34157a9bfe2ed5c7003 Mon Sep 17 00:00:00 2001
+From b258a00bedcf29200b394c671c6deb1e53157f32 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
@@ -19,7 +19,7 @@ Patch-Name: package-versioning.patch
 3 files changed, 8 insertions(+), 3 deletions(-)
 diff --git a/sshconnect.c b/sshconnect.c
-index ab5966066..d3656e47a 100644
+index 158e8146f..b9418e277 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
 @@ -609,7 +609,7 @@ send_client_banner(int connection_out, int minor1)
@@ -32,7 +32,7 @@ index ab5966066..d3656e47a 100644
            strlen(client_version_string)) != strlen(client_version_string))
                fatal("write: %.100s", strerror(errno));
 diff --git a/sshd.c b/sshd.c
-index 92d15c82d..ffd3dad6a 100644
+index 2bc6679e5..9481272fc 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -384,7 +384,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
@@ -45,11 +45,11 @@ index 92d15c82d..ffd3dad6a 100644
            options.version_addendum);
 
 diff --git a/version.h b/version.h
-index f1bbf00f3..e7df751e1 100644
+index 422dfbc3a..5e1ce0426 100644
 --- a/version.h
 +++ b/version.h
 @@ -3,4 +3,9 @@
- #define SSH_VERSION    "OpenSSH_7.8"
+ #define SSH_VERSION    "OpenSSH_7.9"
 
 #define SSH_PORTABLE   "p1"
 -#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE
diff --git a/debian/patches/restore-authorized_keys2.patch b/debian/patches/restore-authorized_keys2.patch
index 6f0abc35f..fcb1ac7e3 100644
--- a/debian/patches/restore-authorized_keys2.patch
+++ b/debian/patches/restore-authorized_keys2.patch
@@ -1,4 +1,4 @@
-From 2bc71f46ab96ec8af88a5b86786fb0835d9b65bc Mon Sep 17 00:00:00 2001
+From cebe4b82b280810172877a7f3d489c506c9a0691 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 91f3377b1..fdc6cf18a 100644
--- a/debian/patches/restore-tcp-wrappers.patch
+++ b/debian/patches/restore-tcp-wrappers.patch
@@ -1,4 +1,4 @@
-From 84a7a1b1c767056c80add9f0e15c9f9ec23ec94d Mon Sep 17 00:00:00 2001
+From 389e16d0109d8c49a761cd7c267438b05c9ab984 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 82428b241..ebc10f51e 100644
+index 023e7cc55..917300b43 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1526,6 +1526,62 @@ else
+@@ -1517,6 +1517,62 @@ else
        AC_MSG_RESULT([no])
 fi
 
@@ -94,7 +94,7 @@ index 82428b241..ebc10f51e 100644
 # Check whether user wants to use ldns
 LDNS_MSG="no"
 AC_ARG_WITH(ldns,
-@@ -5201,6 +5257,7 @@ echo "                       PAM support: $PAM_MSG"
+@@ -5329,6 +5385,7 @@ echo "                       PAM support: $PAM_MSG"
 echo "                   OSF SIA support: $SIA_MSG"
 echo "                 KerberosV support: $KRB5_MSG"
 echo "                   SELinux support: $SELINUX_MSG"
@@ -128,7 +128,7 @@ index fb133c14b..57a7fd66b 100644
 .Xr moduli 5 ,
 .Xr sshd_config 5 ,
 diff --git a/sshd.c b/sshd.c
-index 2e453cdf8..71c360da0 100644
+index 539a000fd..673db87f6 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -127,6 +127,13 @@
@@ -145,7 +145,7 @@ index 2e453cdf8..71c360da0 100644
 /* Re-exec fds */
 #define REEXEC_DEVCRYPTO_RESERVED_FD   (STDERR_FILENO + 1)
 #define REEXEC_STARTUP_PIPE_FD         (STDERR_FILENO + 2)
-@@ -2100,6 +2107,24 @@ main(int ac, char **av)
+@@ -2099,6 +2106,24 @@ main(int ac, char **av)
 #ifdef SSH_AUDIT_EVENTS
        audit_connection_from(remote_ip, remote_port);
 #endif
diff --git a/debian/patches/scp-quoting.patch b/debian/patches/scp-quoting.patch
index c52632134..d054b2a82 100644
--- a/debian/patches/scp-quoting.patch
+++ b/debian/patches/scp-quoting.patch
@@ -1,4 +1,4 @@
-From f14447b774639c6de52f452e5a0e012939832855 Mon Sep 17 00:00:00 2001
+From eefdc7046766b52e39f1b6eafcde22c1e013ce9f 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
diff --git a/debian/patches/seccomp-s390-flock-ipc.patch b/debian/patches/seccomp-s390-flock-ipc.patch
index 2febc4e38..e864427bd 100644
--- a/debian/patches/seccomp-s390-flock-ipc.patch
+++ b/debian/patches/seccomp-s390-flock-ipc.patch
@@ -1,4 +1,4 @@
-From 04910479f7869c27065950b7deb0d69d85230927 Mon Sep 17 00:00:00 2001
+From 690939ba320d93e6f3ab5266bea94d8fb06c8bae 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
@@ -14,7 +14,7 @@ Signed-off-by: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>
 Origin: other, https://bugzilla.mindrot.org/show_bug.cgi?id=2752
 Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=2752
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/1686618
-Last-Update: 2018-08-24
+Last-Update: 2018-10-19
 Patch-Name: seccomp-s390-flock-ipc.patch
 ---
@@ -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 12c4ee130..bcea77997 100644
+index 5edbc6946..d4bc20828 100644
 --- a/sandbox-seccomp-filter.c
 +++ b/sandbox-seccomp-filter.c
 @@ -166,6 +166,9 @@ static const struct sock_filter preauth_insns[] = {
@@ -32,10 +32,10 @@ index 12c4ee130..bcea77997 100644
 +#if defined(__NR_flock) && defined(__s390__)
 +       SC_ALLOW(__NR_flock),
 +#endif
- #ifdef __NR_geteuid
+ #ifdef __NR_futex
-        SC_ALLOW(__NR_geteuid),
+        SC_ALLOW(__NR_futex),
 #endif
-@@ -190,6 +193,9 @@ static const struct sock_filter preauth_insns[] = {
+@@ -193,6 +196,9 @@ static const struct sock_filter preauth_insns[] = {
 #ifdef __NR_getuid32
        SC_ALLOW(__NR_getuid32),
 #endif
diff --git a/debian/patches/seccomp-s390-ioctl-ep11-crypto.patch b/debian/patches/seccomp-s390-ioctl-ep11-crypto.patch
index fc3af3e64..ecbe1d142 100644
--- a/debian/patches/seccomp-s390-ioctl-ep11-crypto.patch
+++ b/debian/patches/seccomp-s390-ioctl-ep11-crypto.patch
@@ -1,4 +1,4 @@
-From 16a47fc4b04977a14f44dd433c8da1499fa80671 Mon Sep 17 00:00:00 2001
+From 9ce189b9f22890421b7f8d3f49a39186d3ce3e14 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 bcea77997..f216ba353 100644
+index d4bc20828..ef4de8c65 100644
 --- a/sandbox-seccomp-filter.c
 +++ b/sandbox-seccomp-filter.c
-@@ -253,6 +253,8 @@ static const struct sock_filter preauth_insns[] = {
+@@ -256,6 +256,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 95d582067..269a87c76 100644
--- a/debian/patches/selinux-role.patch
+++ b/debian/patches/selinux-role.patch
@@ -1,4 +1,4 @@
-From 03979f2e0768e146d179c66f2d2e33afe61c1be3 Mon Sep 17 00:00:00 2001
+From cf3f6ac19812e4d32874304b3854b055831c2124 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
@@ -43,7 +43,7 @@ index 977562f0a..90802a5eb 100644
        /* Method lists for multiple authentication */
        char            **auth_methods; /* modified from server config */
 diff --git a/auth2.c b/auth2.c
-index 96efe164c..90a247c1c 100644
+index a77742819..3035926ba 100644
 --- a/auth2.c
 +++ b/auth2.c
 @@ -257,7 +257,7 @@ input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
@@ -81,10 +81,10 @@ index 96efe164c..90a247c1c 100644
                if (auth2_setup_methods_lists(authctxt) != 0)
                        packet_disconnect("no authentication methods enabled");
 diff --git a/monitor.c b/monitor.c
-index 4e574a2ae..c1e7e9b80 100644
+index eabc1e89b..08fddabd7 100644
 --- a/monitor.c
 +++ b/monitor.c
-@@ -115,6 +115,7 @@ int mm_answer_sign(int, struct sshbuf *);
+@@ -117,6 +117,7 @@ int mm_answer_sign(int, struct sshbuf *);
 int mm_answer_pwnamallow(int, struct sshbuf *);
 int mm_answer_auth2_read_banner(int, struct sshbuf *);
 int mm_answer_authserv(int, struct sshbuf *);
@@ -92,7 +92,7 @@ index 4e574a2ae..c1e7e9b80 100644
 int mm_answer_authpassword(int, struct sshbuf *);
 int mm_answer_bsdauthquery(int, struct sshbuf *);
 int mm_answer_bsdauthrespond(int, struct sshbuf *);
-@@ -191,6 +192,7 @@ struct mon_table mon_dispatch_proto20[] = {
+@@ -193,6 +194,7 @@ struct mon_table mon_dispatch_proto20[] = {
     {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign},
     {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow},
     {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv},
@@ -100,7 +100,7 @@ index 4e574a2ae..c1e7e9b80 100644
     {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner},
     {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword},
 #ifdef USE_PAM
-@@ -813,6 +815,7 @@ mm_answer_pwnamallow(int sock, struct sshbuf *m)
+@@ -817,6 +819,7 @@ mm_answer_pwnamallow(int sock, struct sshbuf *m)
 
        /* Allow service/style information on the auth context */
        monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1);
@@ -108,7 +108,7 @@ index 4e574a2ae..c1e7e9b80 100644
        monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1);
 
 #ifdef USE_PAM
-@@ -846,16 +849,42 @@ mm_answer_authserv(int sock, struct sshbuf *m)
+@@ -850,16 +853,42 @@ mm_answer_authserv(int sock, struct sshbuf *m)
        monitor_permit_authentications(1);
 
        if ((r = sshbuf_get_cstring(m, &authctxt->service, NULL)) != 0 ||
@@ -154,7 +154,7 @@ index 4e574a2ae..c1e7e9b80 100644
        return (0);
 }
 
-@@ -1497,7 +1526,7 @@ mm_answer_pty(int sock, struct sshbuf *m)
+@@ -1501,7 +1530,7 @@ mm_answer_pty(int sock, struct sshbuf *m)
        res = pty_allocate(&s->ptyfd, &s->ttyfd, s->tty, sizeof(s->tty));
        if (res == 0)
                goto error;
@@ -245,10 +245,10 @@ index 7f93144ff..79e78cc90 100644
 char *mm_auth2_read_banner(void);
 int mm_auth_password(struct ssh *, char *);
 diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
-index 8c5325cc3..9fdda664f 100644
+index 622988822..3e6e07670 100644
 --- a/openbsd-compat/port-linux.c
 +++ b/openbsd-compat/port-linux.c
-@@ -55,7 +55,7 @@ ssh_selinux_enabled(void)
+@@ -56,7 +56,7 @@ ssh_selinux_enabled(void)
 
 /* Return the default security context for the given username */
 static security_context_t
@@ -257,7 +257,7 @@ index 8c5325cc3..9fdda664f 100644
 {
        security_context_t sc = NULL;
        char *sename = NULL, *lvl = NULL;
-@@ -70,9 +70,16 @@ ssh_selinux_getctxbyname(char *pwname)
+@@ -71,9 +71,16 @@ ssh_selinux_getctxbyname(char *pwname)
 #endif
 
 #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
@@ -276,7 +276,7 @@ index 8c5325cc3..9fdda664f 100644
 #endif
 
        if (r != 0) {
-@@ -102,7 +109,7 @@ ssh_selinux_getctxbyname(char *pwname)
+@@ -103,7 +110,7 @@ ssh_selinux_getctxbyname(char *pwname)
 
 /* Set the execution context to the default for the specified user */
 void
@@ -285,7 +285,7 @@ index 8c5325cc3..9fdda664f 100644
 {
        security_context_t user_ctx = NULL;
 
-@@ -111,7 +118,7 @@ ssh_selinux_setup_exec_context(char *pwname)
+@@ -112,7 +119,7 @@ ssh_selinux_setup_exec_context(char *pwname)
 
        debug3("%s: setting execution context", __func__);
 
@@ -294,7 +294,7 @@ index 8c5325cc3..9fdda664f 100644
        if (setexeccon(user_ctx) != 0) {
                switch (security_getenforce()) {
                case -1:
-@@ -133,7 +140,7 @@ ssh_selinux_setup_exec_context(char *pwname)
+@@ -134,7 +141,7 @@ ssh_selinux_setup_exec_context(char *pwname)
 
 /* Set the TTY context for the specified user */
 void
@@ -303,7 +303,7 @@ index 8c5325cc3..9fdda664f 100644
 {
        security_context_t new_tty_ctx = NULL;
        security_context_t user_ctx = NULL;
-@@ -145,7 +152,7 @@ ssh_selinux_setup_pty(char *pwname, const char *tty)
+@@ -146,7 +153,7 @@ ssh_selinux_setup_pty(char *pwname, const char *tty)
 
        debug3("%s: setting TTY context on %s", __func__, tty);
 
@@ -363,10 +363,10 @@ index ea4f9c584..60d72ffe7 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 f2cf52006..d5d2e94b0 100644
+index 2d0958d11..19f38637e 100644
 --- a/session.c
 +++ b/session.c
-@@ -1378,7 +1378,7 @@ safely_chroot(const char *path, uid_t uid)
+@@ -1380,7 +1380,7 @@ safely_chroot(const char *path, uid_t uid)
 
 /* Set login name, uid, gid, and groups. */
 void
@@ -375,7 +375,7 @@ index f2cf52006..d5d2e94b0 100644
 {
        char uidstr[32], *chroot_path, *tmp;
 
-@@ -1406,7 +1406,7 @@ do_setusercontext(struct passwd *pw)
+@@ -1408,7 +1408,7 @@ do_setusercontext(struct passwd *pw)
                endgrent();
 #endif
 
@@ -384,7 +384,7 @@ index f2cf52006..d5d2e94b0 100644
 
                if (!in_chroot && options.chroot_directory != NULL &&
                    strcasecmp(options.chroot_directory, "none") != 0) {
-@@ -1545,7 +1545,7 @@ do_child(struct ssh *ssh, Session *s, const char *command)
+@@ -1547,7 +1547,7 @@ do_child(struct ssh *ssh, Session *s, const char *command)
 
        /* Force a password change */
        if (s->authctxt->force_pwchange) {
@@ -393,7 +393,7 @@ index f2cf52006..d5d2e94b0 100644
                child_close_fds(ssh);
                do_pwchange(s);
                exit(1);
-@@ -1563,7 +1563,7 @@ do_child(struct ssh *ssh, Session *s, const char *command)
+@@ -1565,7 +1565,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);
@@ -402,7 +402,7 @@ index f2cf52006..d5d2e94b0 100644
        /*
         * PAM session modules in do_setusercontext may have
         * generated messages, so if this in an interactive
-@@ -1953,7 +1953,7 @@ session_pty_req(struct ssh *ssh, Session *s)
+@@ -1955,7 +1955,7 @@ session_pty_req(struct ssh *ssh, Session *s)
        ssh_tty_parse_modes(ssh, s->ttyfd);
 
        if (!use_privsep)
@@ -412,10 +412,10 @@ index f2cf52006..d5d2e94b0 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 54dd1f0ca..8535ebcef 100644
+index ce59dabd9..675c91146 100644
 --- a/session.h
 +++ b/session.h
-@@ -76,7 +76,7 @@ void   session_pty_cleanup2(Session *);
+@@ -77,7 +77,7 @@ void   session_pty_cleanup2(Session *);
 Session        *session_new(void);
 Session        *session_by_tty(char *);
 void    session_close(struct ssh *, Session *);
@@ -425,10 +425,10 @@ index 54dd1f0ca..8535ebcef 100644
 const char     *session_get_remote_name_or_ip(struct ssh *, u_int, int);
 
 diff --git a/sshd.c b/sshd.c
-index 71c360da0..92d15c82d 100644
+index 673db87f6..2bc6679e5 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -684,7 +684,7 @@ privsep_postauth(Authctxt *authctxt)
+@@ -683,7 +683,7 @@ privsep_postauth(Authctxt *authctxt)
        reseed_prngs();
 
        /* Drop privileges */
diff --git a/debian/patches/shell-path.patch b/debian/patches/shell-path.patch
index 7e91b9b14..ad574e829 100644
--- a/debian/patches/shell-path.patch
+++ b/debian/patches/shell-path.patch
@@ -1,4 +1,4 @@
-From 0e7d3495f758a4ecccc14eda31845ea0efc89251 Mon Sep 17 00:00:00 2001
+From cabad6b7182cd6eaa8b760718200a316e7f578ed 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,7 +16,7 @@ Patch-Name: shell-path.patch
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/sshconnect.c b/sshconnect.c
-index 78813c164..a2efe6d15 100644
+index 6d819279e..700ea6c3c 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
 @@ -229,7 +229,7 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, u_short port,
@@ -28,7 +28,7 @@ index 78813c164..a2efe6d15 100644
                perror(argv[0]);
                exit(1);
        }
-@@ -1525,7 +1525,7 @@ ssh_local_cmd(const char *args)
+@@ -1534,7 +1534,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 ae29c2afb..ed6ef3d46 100644
--- a/debian/patches/ssh-agent-setgid.patch
+++ b/debian/patches/ssh-agent-setgid.patch
@@ -1,4 +1,4 @@
-From 67414e1884f4ac0eb391988b932af2dd9b2ab5ae Mon Sep 17 00:00:00 2001
+From 6d4521d39a852dc5627187c045c933f4e1cb4601 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 5f9e9bbc8..bb1e10973 100644
--- a/debian/patches/ssh-argv0.patch
+++ b/debian/patches/ssh-argv0.patch
@@ -1,4 +1,4 @@
-From 0d0221146dc61545ca1dba099f669d5d6a37504e Mon Sep 17 00:00:00 2001
+From d1064c2689df8d0894a68ac9671d14ab125bc91b 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 d41426781..0a8e63f51 100644
+index 5dfad6daa..ad1ed0f86 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -1575,6 +1575,7 @@ if an error occurred.
+@@ -1585,6 +1585,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 da0f358d8..ca3e090bd 100644
--- a/debian/patches/ssh-vulnkey-compat.patch
+++ b/debian/patches/ssh-vulnkey-compat.patch
@@ -1,4 +1,4 @@
-From 80ef33d2e2559a2fcb71940f0ef0de18f426dab4 Mon Sep 17 00:00:00 2001
+From eccbd3637a2b8544fdcfdd5d1a00a9dfdac62aeb 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,7 +17,7 @@ Patch-Name: ssh-vulnkey-compat.patch
 2 files changed, 2 insertions(+)
 diff --git a/readconf.c b/readconf.c
-index 4ad3c75fe..6e26ba32d 100644
+index 36bc5e59a..5e655e924 100644
 --- a/readconf.c
 +++ b/readconf.c
 @@ -190,6 +190,7 @@ static struct {
@@ -29,10 +29,10 @@ index 4ad3c75fe..6e26ba32d 100644
        { "useroaming", oDeprecated },
        { "usersh", oDeprecated },
 diff --git a/servconf.c b/servconf.c
-index e1ae07fb7..e49984a81 100644
+index 4668b8a45..6caf1db38 100644
 --- a/servconf.c
 +++ b/servconf.c
-@@ -596,6 +596,7 @@ static struct {
+@@ -600,6 +600,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 1610d40d1..3093a41fb 100644
--- a/debian/patches/syslog-level-silent.patch
+++ b/debian/patches/syslog-level-silent.patch
@@ -1,4 +1,4 @@
-From d47fa6fefb418c6d8f5a6d3dd49fd9dc7fce0c74 Mon Sep 17 00:00:00 2001
+From e755ec70d62bfb9b02159123f4e870b00010be77 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
@@ -33,10 +33,10 @@ index d9c2d136c..1749af6d1 100644
        { "FATAL",      SYSLOG_LEVEL_FATAL },
        { "ERROR",      SYSLOG_LEVEL_ERROR },
 diff --git a/ssh.c b/ssh.c
-index ce628848c..6ee0f8c68 100644
+index 0777c31e4..3140fed4c 100644
 --- a/ssh.c
 +++ b/ssh.c
-@@ -1252,7 +1252,7 @@ main(int ac, char **av)
+@@ -1258,7 +1258,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 95753542e..c5dee41ad 100644
--- a/debian/patches/systemd-readiness.patch
+++ b/debian/patches/systemd-readiness.patch
@@ -1,4 +1,4 @@
-From ba2be368348f9f411377f494e209faedf53903de Mon Sep 17 00:00:00 2001
+From da34947128351bee9d2530574432190548f5be58 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 ebc10f51e..dab138640 100644
+index 917300b43..8a5db4cb5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4458,6 +4458,29 @@ AC_ARG_WITH([kerberos5],
+@@ -4586,6 +4586,29 @@ AC_ARG_WITH([kerberos5],
 AC_SUBST([GSSLIBS])
 AC_SUBST([K5LIBS])
 
@@ -47,7 +47,7 @@ index ebc10f51e..dab138640 100644
 # Looking for programs, paths and files
 
 PRIVSEP_PATH=/var/empty
-@@ -5264,6 +5287,7 @@ echo "                   libldns support: $LDNS_MSG"
+@@ -5392,6 +5415,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 ebc10f51e..dab138640 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 698593605..7ff109175 100644
+index d7e77d343..a1c3970b3 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -85,6 +85,10 @@
@@ -70,7 +70,7 @@ index 698593605..7ff109175 100644
 #include "xmalloc.h"
 #include "ssh.h"
 #include "ssh2.h"
-@@ -1991,6 +1995,11 @@ main(int ac, char **av)
+@@ -1990,6 +1994,11 @@ main(int ac, char **av)
                        }
                }
 
diff --git a/debian/patches/user-group-modes.patch b/debian/patches/user-group-modes.patch
index cc9cbacad..bc2390e06 100644
--- a/debian/patches/user-group-modes.patch
+++ b/debian/patches/user-group-modes.patch
@@ -1,4 +1,4 @@
-From 840f43066f9cdf5f6bb07992aca1c5f43be8eb80 Mon Sep 17 00:00:00 2001
+From 7b931d36ad36a93d2b1811858ca29408ec44ecae 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
@@ -51,10 +51,10 @@ index 57296e1f6..546aa0495 100644
                            pw->pw_name, buf);
                        auth_debug_add("Bad file modes for %.200s", buf);
 diff --git a/auth.c b/auth.c
-index 80eb78c48..ad25631a5 100644
+index d8e6b4a3d..9d1d453f1 100644
 --- a/auth.c
 +++ b/auth.c
-@@ -469,8 +469,7 @@ check_key_in_hostfiles(struct passwd *pw, struct sshkey *key, const char *host,
+@@ -473,8 +473,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,10 +65,10 @@ index 80eb78c48..ad25631a5 100644
                            "bad owner or modes for %.200s",
                            pw->pw_name, user_hostfile);
 diff --git a/misc.c b/misc.c
-index ae4d29b84..2f3dbda0c 100644
+index bdc06fdb3..5159e6692 100644
 --- a/misc.c
 +++ b/misc.c
-@@ -57,8 +57,9 @@
+@@ -58,8 +58,9 @@
 #include <netdb.h>
 #ifdef HAVE_PATHS_H
 # include <paths.h>
@@ -79,7 +79,7 @@ index ae4d29b84..2f3dbda0c 100644
 #ifdef SSH_TUN_OPENBSD
 #include <net/if.h>
 #endif
-@@ -1024,6 +1025,55 @@ percent_expand(const char *string, ...)
+@@ -1028,6 +1029,55 @@ percent_expand(const char *string, ...)
 #undef EXPAND_MAX_KEYS
 }
 
@@ -135,7 +135,7 @@ index ae4d29b84..2f3dbda0c 100644
 int
 tun_open(int tun, int mode, char **ifname)
 {
-@@ -1782,8 +1832,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir,
+@@ -1786,8 +1836,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;
        }
@@ -145,7 +145,7 @@ index ae4d29b84..2f3dbda0c 100644
                snprintf(err, errlen, "bad ownership or modes for file %s",
                    buf);
                return -1;
-@@ -1798,8 +1847,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir,
+@@ -1802,8 +1851,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir,
                strlcpy(buf, cp, sizeof(buf));
 
                if (stat(buf, &st) < 0 ||
@@ -156,10 +156,10 @@ index ae4d29b84..2f3dbda0c 100644
                            "bad ownership or modes for directory %s", buf);
                        return -1;
 diff --git a/misc.h b/misc.h
-index 6be289fd2..213c3abb7 100644
+index 31b207a8d..aaf966e65 100644
 --- a/misc.h
 +++ b/misc.h
-@@ -167,6 +167,8 @@ int  safe_path_fd(int, const char *, struct passwd *,
+@@ -168,6 +168,8 @@ int  safe_path_fd(int, const char *, struct passwd *,
 char   *read_passphrase(const char *, int);
 int     ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
 
@@ -169,10 +169,10 @@ index 6be289fd2..213c3abb7 100644
 #define MAXIMUM(a, b)  (((a) > (b)) ? (a) : (b))
 #define ROUNDUP(x, y)   ((((x)+((y)-1))/(y))*(y))
 diff --git a/readconf.c b/readconf.c
-index 3fd0fe7b7..3ed6dfb54 100644
+index 052d4b1ac..6b01f20d2 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -1795,8 +1795,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
+@@ -1820,8 +1820,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
 
                if (fstat(fileno(f), &sb) == -1)
                        fatal("fstat %s: %s", filename, strerror(errno));
@@ -183,10 +183,10 @@ index 3fd0fe7b7..3ed6dfb54 100644
        }
 
 diff --git a/ssh.1 b/ssh.1
-index b20908a5e..cb0fdd50e 100644
+index 7760c3075..81f29af43 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -1475,6 +1475,8 @@ The file format and configuration options are described in
+@@ -1485,6 +1485,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.
@@ -196,10 +196,10 @@ index b20908a5e..cb0fdd50e 100644
 .It Pa ~/.ssh/environment
 Contains additional definitions for environment variables; see
 diff --git a/ssh_config.5 b/ssh_config.5
-index 86ada128e..03341a229 100644
+index 54e143c93..7d55fa820 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -1813,6 +1813,8 @@ The format of this file is described above.
+@@ -1835,6 +1835,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.