28 files changed, 325 insertions, 219 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 281d947f2..033091076 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,12 +1,12 @@
 # see git-dpm(1) from git-dpm package
-86fe78ef4686485394b464cf9d3393ce27b33979
-86fe78ef4686485394b464cf9d3393ce27b33979
-f0de78bd4f29fa688c5df116f3f9cd43543a76d0
-f0de78bd4f29fa688c5df116f3f9cd43543a76d0
-openssh_8.2p1.orig.tar.gz
-d1ab35a93507321c5db885e02d41ce1414f0507c
-1701197
+39b8d128ef980a410bb1ea0ee80e95ac9fff59c3
+39b8d128ef980a410bb1ea0ee80e95ac9fff59c3
+202f5a676221c244cd450086c334c2b59f339e86
+202f5a676221c244cd450086c334c2b59f339e86
+openssh_8.3p1.orig.tar.gz
+04c7adb9986f16746588db8988b910530c589819
+1706358
 debianTag="debian/%e%%%V"
 patchedTag="patched/%e%%%V"
 upstreamTag="upstream/%U"
-signature:d3814ab57572c13bdee2037ad1477e2f7c51e1b0:683:openssh_8.2p1.orig.tar.gz.asc
+signature:e3fdeb7b96543bcc2854614c6163cfe860ba5ec8:683:openssh_8.3p1.orig.tar.gz.asc
diff --git a/debian/NEWS b/debian/NEWS
index 542d38173..81cf93185 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,13 @@
+openssh (1:8.3p1-1) unstable; urgency=medium
+
+  OpenSSH 8.3 includes a number of changes that may affect existing
+  configurations:
+
+  * sftp(1): reject an argument of "-1" in the same way as ssh(1) and scp(1)
+    do instead of accepting and silently ignoring it.
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 07 Jun 2020 10:27:05 +0100
+
 openssh (1:8.2p1-1) unstable; urgency=medium
 
   OpenSSH 8.2 includes a number of changes that may affect existing
diff --git a/debian/changelog b/debian/changelog
index 69cbf0b4e..ab75bf2a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,86 @@
-openssh (1:8.2p1-5) UNRELEASED; urgency=medium
+openssh (1:8.3p1-1) UNRELEASED; urgency=medium
 
   * Fix or suppress various shellcheck errors under debian/.
-
- -- Colin Watson <cjwatson@debian.org>  Sat, 23 May 2020 12:46:19 +0100
+  * New upstream release (https://www.openssh.com/txt/release-8.3):
+    - [SECURITY] scp(1): when receiving files, scp(1) could become
+      desynchronised if a utimes(2) system call failed.  This could allow
+      file contents to be interpreted as file metadata and thereby permit an
+      adversary to craft a file system that, when copied with scp(1) in a
+      configuration that caused utimes(2) to fail (e.g. under a SELinux
+      policy or syscall sandbox), transferred different file names and
+      contents to the actual file system layout.
+    - sftp(1): reject an argument of "-1" in the same way as ssh(1) and
+      scp(1) do instead of accepting and silently ignoring it.
+    - sshd(8): make IgnoreRhosts a tri-state option: "yes" to ignore
+      rhosts/shosts, "no" to allow rhosts/shosts or (new) "shosts-only" to
+      allow .shosts files but not .rhosts.
+    - sshd(8): allow the IgnoreRhosts directive to appear anywhere in a
+      sshd_config, not just before any Match blocks.
+    - ssh(1): add %TOKEN percent expansion for the LocalForward and
+      RemoteForward keywords when used for Unix domain socket forwarding.
+    - all: allow loading public keys from the unencrypted envelope of a
+      private key file if no corresponding public key file is present.
+    - ssh(1), sshd(8): prefer to use chacha20 from libcrypto where possible
+      instead of the (slower) portable C implementation included in OpenSSH.
+    - ssh-keygen(1): add ability to dump the contents of a binary key
+      revocation list via "ssh-keygen -lQf /path".
+    - ssh(1): fix IdentitiesOnly=yes to also apply to keys loaded from a
+      PKCS11Provider.
+    - ssh-keygen(1): avoid NULL dereference when trying to convert an
+      invalid RFC4716 private key.
+    - scp(1): when performing remote-to-remote copies using "scp -3", start
+      the second ssh(1) channel with BatchMode=yes enabled to avoid
+      confusing and non-deterministic ordering of prompts.
+    - ssh(1), ssh-keygen(1): when signing a challenge using a FIDO token,
+      perform hashing of the message to be signed in the middleware layer
+      rather than in OpenSSH code.  This permits the use of security key
+      middlewares that perform the hashing implicitly, such as Windows
+      Hello.
+    - ssh(1): fix incorrect error message for "too many known hosts files."
+    - ssh(1): make failures when establishing "Tunnel" forwarding terminate
+      the connection when ExitOnForwardFailure is enabled.
+    - ssh-keygen(1): fix printing of fingerprints on private keys and add a
+      regression test for same.
+    - sshd(8): document order of checking AuthorizedKeysFile (first) and
+      AuthorizedKeysCommand (subsequently, if the file doesn't match).
+    - sshd(8): document that /etc/hosts.equiv and /etc/shosts.equiv are not
+      considered for HostbasedAuthentication when the target user is root.
+    - ssh(1), ssh-keygen(1): fix NULL dereference in private certificate key
+      parsing.
+    - ssh(1), sshd(8): more consistency between sets of %TOKENS are accepted
+      in various configuration options.
+    - ssh(1), ssh-keygen(1): improve error messages for some common PKCS#11
+      C_Login failure cases.
+    - ssh(1), sshd(8): make error messages for problems during SSH banner
+      exchange consistent with other SSH transport-layer error messages and
+      ensure they include the relevant IP addresses.
+    - ssh-keygen(1), ssh-add(1): when downloading FIDO2 resident keys from a
+      token, don't prompt for a PIN until the token has told us that it
+      needs one.  Avoids double-prompting on devices that implement
+      on-device authentication (closes: #932071).
+    - sshd(8), ssh-keygen(1): no-touch-required FIDO certificate option
+      should be an extension, not a critical option.
+    - ssh(1), ssh-keygen(1), ssh-add(1): offer a better error message when
+      trying to use a FIDO key function and SecurityKeyProvider is empty.
+    - ssh-add(1), ssh-agent(8): ensure that a key lifetime fits within the
+      values allowed by the wire format (u32).  Prevents integer wraparound
+      of the timeout values.
+    - ssh(1): detect and prevent trivial configuration loops when using
+      ProxyJump. bz#3057.
+    - On platforms that do not support setting process-wide routing domains
+      (all excepting OpenBSD at present), fail to accept a configuration
+      attempts to set one at process start time rather than fatally erroring
+      at run time.
+    - Fix theoretical infinite loop in the glob(3) replacement
+      implementation.
+  * Update GSSAPI key exchange patch from
+    https://github.com/openssh-gsskex/openssh-gsskex:
+    - Fix connection through ProxyJump in combination with "GSSAPITrustDNS
+      yes".
+    - Enable SHA2-based GSSAPI key exchange methods by default as RFC 8732
+      was published.
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 07 Jun 2020 10:25:54 +0100
 
 openssh (1:8.2p1-4) unstable; urgency=medium
 
diff --git a/debian/patches/authorized-keys-man-symlink.patch b/debian/patches/authorized-keys-man-symlink.patch
index 43a160a0f..68f5029d5 100644
--- a/debian/patches/authorized-keys-man-symlink.patch
+++ b/debian/patches/authorized-keys-man-symlink.patch
@@ -1,4 +1,4 @@
-From b0cb3badf4d423f8ea7bf950e55ca72878cc224b Mon Sep 17 00:00:00 2001
+From eb51213d1bdc8d80cd7d0578737d8a7bfde992d2 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 b68c1710f..bff1db49b 100644
+index bf1e1de47..3aa808a38 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -402,6 +402,7 @@ install-files:
+@@ -406,6 +406,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/conch-old-privkey-format.patch b/debian/patches/conch-old-privkey-format.patch
index c48220f63..dfd1058b8 100644
--- a/debian/patches/conch-old-privkey-format.patch
+++ b/debian/patches/conch-old-privkey-format.patch
@@ -1,4 +1,4 @@
-From 39d3bb41ec288e8ba2384c65248440603f65349c Mon Sep 17 00:00:00 2001
+From f2697f0c5ff23bc13dce1c90fb4c1c934c02070b 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
@@ -18,10 +18,10 @@ Patch-Name: conch-old-privkey-format.patch
  3 files changed, 14 insertions(+), 2 deletions(-)
 
 diff --git a/regress/Makefile b/regress/Makefile
-index 774c10d41..01e257a94 100644
+index 62794d25f..53a50ffca 100644
 --- a/regress/Makefile
 +++ b/regress/Makefile
-@@ -120,7 +120,7 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \
+@@ -121,7 +121,7 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \
                 rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \
                 scp-ssh-wrapper.scp setuid-allowed sftp-server.log \
                 sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \
@@ -44,10 +44,10 @@ index 6678813a2..6ff5da20b 100644
             127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY}
         if [ $? -ne 0 ]; then
 diff --git a/regress/test-exec.sh b/regress/test-exec.sh
-index f5e3ee6f5..a3a40719f 100644
+index 5dc975d07..d8491b2be 100644
 --- a/regress/test-exec.sh
 +++ b/regress/test-exec.sh
-@@ -573,6 +573,18 @@ REGRESS_INTEROP_CONCH=no
+@@ -587,6 +587,18 @@ REGRESS_INTEROP_CONCH=no
  if test -x "$CONCH" ; then
         REGRESS_INTEROP_CONCH=yes
  fi
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
index 0d998fdd4..47a2fe372 100644
--- a/debian/patches/debian-banner.patch
+++ b/debian/patches/debian-banner.patch
@@ -1,4 +1,4 @@
-From 7d20d00ea24ec0c3fffacc80ab271d0699d198c6 Mon Sep 17 00:00:00 2001
+From 90c1c8771b61dd3ee0eacb4e1cfac404dc42f4b0 Mon Sep 17 00:00:00 2001
 From: Kees Cook <kees@debian.org>
 Date: Sun, 9 Feb 2014 16:10:06 +0000
 Subject: Add DebianBanner server configuration option
@@ -8,7 +8,7 @@ initial protocol handshake, for those scared by package-versioning.patch.
 
 Bug-Debian: http://bugs.debian.org/562048
 Forwarded: not-needed
-Last-Update: 2020-02-21
+Last-Update: 2020-06-07
 
 Patch-Name: debian-banner.patch
 ---
@@ -17,24 +17,24 @@ Patch-Name: debian-banner.patch
  servconf.c    | 9 +++++++++
  servconf.h    | 2 ++
  sshconnect.c  | 2 +-
- sshd.c        | 3 ++-
+ sshd.c        | 2 +-
  sshd_config.5 | 5 +++++
- 7 files changed, 23 insertions(+), 5 deletions(-)
+ 7 files changed, 22 insertions(+), 5 deletions(-)
 
 diff --git a/kex.c b/kex.c
-index f638942d3..2abfbb95a 100644
+index 0e64bf760..aa5acaac3 100644
 --- a/kex.c
 +++ b/kex.c
-@@ -1226,7 +1226,7 @@ send_error(struct ssh *ssh, char *msg)
+@@ -1225,7 +1225,7 @@ send_error(struct ssh *ssh, char *msg)
   */
  int
  kex_exchange_identification(struct ssh *ssh, int timeout_ms,
 -    const char *version_addendum)
 +    int debian_banner, const char *version_addendum)
  {
-        int remote_major, remote_minor, mismatch;
+        int remote_major, remote_minor, mismatch, oerrno = 0;
         size_t len, i, n;
-@@ -1244,7 +1244,8 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
+@@ -1243,7 +1243,8 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
         if (version_addendum != NULL && *version_addendum == '\0')
                 version_addendum = NULL;
         if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n",
@@ -43,7 +43,7 @@ index f638942d3..2abfbb95a 100644
 +           debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM,
             version_addendum == NULL ? "" : " ",
             version_addendum == NULL ? "" : version_addendum)) != 0) {
-                error("%s: sshbuf_putf: %s", __func__, ssh_err(r));
+                oerrno = errno;
 diff --git a/kex.h b/kex.h
 index fe7141414..938dca03b 100644
 --- a/kex.h
@@ -58,7 +58,7 @@ index fe7141414..938dca03b 100644
  struct kex *kex_new(void);
  int     kex_ready(struct ssh *, char *[PROPOSAL_MAX]);
 diff --git a/servconf.c b/servconf.c
-index bf3cd84a4..7bbc25c2e 100644
+index ff5b9436c..cf4e52f3b 100644
 --- a/servconf.c
 +++ b/servconf.c
 @@ -194,6 +194,7 @@ initialize_server_options(ServerOptions *options)
@@ -94,7 +94,7 @@ index bf3cd84a4..7bbc25c2e 100644
         { NULL, sBadOption, 0 }
  };
  
-@@ -2382,6 +2387,10 @@ process_server_config_line_depth(ServerOptions *options, char *line,
+@@ -2393,6 +2398,10 @@ process_server_config_line_depth(ServerOptions *options, char *line,
                         *charptr = xstrdup(arg);
                 break;
  
@@ -106,10 +106,10 @@ index bf3cd84a4..7bbc25c2e 100644
         case sIgnore:
         case sUnsupported:
 diff --git a/servconf.h b/servconf.h
-index 3f47ea25e..3fa05fcac 100644
+index 253cad97e..5a2b60512 100644
 --- a/servconf.h
 +++ b/servconf.h
-@@ -221,6 +221,8 @@ typedef struct {
+@@ -226,6 +226,8 @@ typedef struct {
         int     expose_userauth_info;
         u_int64_t timing_secret;
         char   *sk_provider;
@@ -119,37 +119,36 @@ index 3f47ea25e..3fa05fcac 100644
  
  /* Information about the incoming connection as used by Match */
 diff --git a/sshconnect.c b/sshconnect.c
-index b796d3c8a..9f2412e0d 100644
+index f20d3e792..1e5b8ea5a 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
-@@ -1292,7 +1292,7 @@ ssh_login(struct ssh *ssh, Sensitive *sensitive, const char *orighost,
+@@ -1293,7 +1293,7 @@ ssh_login(struct ssh *ssh, Sensitive *sensitive, const char *orighost,
         lowercase(host);
  
         /* Exchange protocol version identification strings with the server. */
--       if (kex_exchange_identification(ssh, timeout_ms, NULL) != 0)
-+       if (kex_exchange_identification(ssh, timeout_ms, 1, NULL) != 0)
-                cleanup_exit(255); /* error already logged */
+-       if ((r = kex_exchange_identification(ssh, timeout_ms, NULL)) != 0)
++       if ((r = kex_exchange_identification(ssh, timeout_ms, 1, NULL)) != 0)
+                sshpkt_fatal(ssh, r, "banner exchange");
  
         /* Put the connection into non-blocking mode. */
 diff --git a/sshd.c b/sshd.c
-index 65916fc6d..da876a900 100644
+index e8b332ca4..baee13506 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -2187,7 +2187,8 @@ main(int ac, char **av)
+@@ -2181,7 +2181,7 @@ main(int ac, char **av)
         if (!debug_flag)
                 alarm(options.login_grace_time);
  
--       if (kex_exchange_identification(ssh, -1, options.version_addendum) != 0)
-+       if (kex_exchange_identification(ssh, -1, options.debian_banner,
-+           options.version_addendum) != 0)
-                cleanup_exit(255); /* error already logged */
+-       if ((r = kex_exchange_identification(ssh, -1,
++       if ((r = kex_exchange_identification(ssh, -1, options.debian_banner,
+            options.version_addendum)) != 0)
+                sshpkt_fatal(ssh, r, "banner exchange");
  
-        ssh_packet_set_nonblocking(ssh);
 diff --git a/sshd_config.5 b/sshd_config.5
-index ebd09f891..c926f584c 100644
+index 9f093be1f..753ceda10 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -542,6 +542,11 @@ or
+@@ -540,6 +540,11 @@ or
  .Cm no .
  The default is
  .Cm yes .
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index 35c71b0e9..d01331cc3 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,4 +1,4 @@
-From 8086961f9f4ad834e9c3b09b6e2c80273be1c506 Mon Sep 17 00:00:00 2001
+From 08ca1225e6979fc6b5b6e7f85ce5cb0ac5cc7405 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
@@ -43,10 +43,10 @@ Patch-Name: debian-config.patch
  6 files changed, 98 insertions(+), 9 deletions(-)
 
 diff --git a/readconf.c b/readconf.c
-index 7f251dd4a..e82024678 100644
+index 5bf0afbb4..87b0dc62a 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -2087,7 +2087,7 @@ fill_default_options(Options * options)
+@@ -2111,7 +2111,7 @@ fill_default_options(Options * options)
         if (options->forward_x11 == -1)
                 options->forward_x11 = 0;
         if (options->forward_x11_trusted == -1)
@@ -56,10 +56,10 @@ index 7f251dd4a..e82024678 100644
                 options->forward_x11_timeout = 1200;
         /*
 diff --git a/ssh.1 b/ssh.1
-index b33a8049f..a8967c2f8 100644
+index 5a31b5dde..035823da3 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -809,6 +809,16 @@ directive in
+@@ -812,6 +812,16 @@ directive in
  .Xr ssh_config 5
  for more information.
  .Pp
@@ -76,7 +76,7 @@ index b33a8049f..a8967c2f8 100644
  .It Fl x
  Disables X11 forwarding.
  .Pp
-@@ -817,6 +827,20 @@ Enables trusted X11 forwarding.
+@@ -820,6 +830,20 @@ Enables trusted X11 forwarding.
  Trusted X11 forwardings are not subjected to the X11 SECURITY extension
  controls.
  .Pp
@@ -123,7 +123,7 @@ index 1ff999b68..8a55237b9 100644
 +    HashKnownHosts yes
 +    GSSAPIAuthentication yes
 diff --git a/ssh_config.5 b/ssh_config.5
-index c6eaa63e7..34dc2d51b 100644
+index dd8241df1..aac3fabb7 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -71,6 +71,29 @@ Since the first obtained value for each parameter is used, more
@@ -229,7 +229,7 @@ index 2c48105f8..459c1b230 100644
  # Example of overriding settings on a per-user basis
  #Match User anoncvs
 diff --git a/sshd_config.5 b/sshd_config.5
-index 25f4b8117..e8271be74 100644
+index c27f99937..b38025dbf 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
 @@ -56,6 +56,35 @@ Arguments may optionally be enclosed in double quotes
diff --git a/debian/patches/dnssec-sshfp.patch b/debian/patches/dnssec-sshfp.patch
index 3744218ff..3b9e8df3c 100644
--- a/debian/patches/dnssec-sshfp.patch
+++ b/debian/patches/dnssec-sshfp.patch
@@ -1,4 +1,4 @@
-From 74c1c0ef7689ea68dc8263f73c00ff8675f9f0fe Mon Sep 17 00:00:00 2001
+From ca39bb2ab1f56d8ecdeadc32d6bda1a8e73301ac 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 b0faea78c..f58bbaeee 100644
--- a/debian/patches/doc-hash-tab-completion.patch
+++ b/debian/patches/doc-hash-tab-completion.patch
@@ -1,4 +1,4 @@
-From a14ddfc3f607b0bf29046bfb4b26a6d827fa58c7 Mon Sep 17 00:00:00 2001
+From 0402bdf307736b3afae8c80c84f04b0295990c45 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,7 +13,7 @@ Patch-Name: doc-hash-tab-completion.patch
  1 file changed, 3 insertions(+)
 
 diff --git a/ssh_config.5 b/ssh_config.5
-index e61a0fd43..c6eaa63e7 100644
+index d814147d4..dd8241df1 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -848,6 +848,9 @@ Note that existing names and addresses in known hosts files
diff --git a/debian/patches/gnome-ssh-askpass2-icon.patch b/debian/patches/gnome-ssh-askpass2-icon.patch
index 35b370752..7436be62d 100644
--- a/debian/patches/gnome-ssh-askpass2-icon.patch
+++ b/debian/patches/gnome-ssh-askpass2-icon.patch
@@ -1,4 +1,4 @@
-From 63da84c3570afb4fa6bab38fdac3e9af45d0ec54 Mon Sep 17 00:00:00 2001
+From 9b1d6a32944943b6b18861b97868c463bf5a6e8c 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 4bf1d3f73..685923e47 100644
--- a/debian/patches/gssapi.patch
+++ b/debian/patches/gssapi.patch
@@ -1,4 +1,4 @@
-From 34aff3aa136e5a65f441b25811dd466488fda087 Mon Sep 17 00:00:00 2001
+From 79f9d21b406c172878896ef41cdc2502fc2f84a7 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
@@ -16,9 +16,12 @@ have it merged into the main openssh package rather than having separate
 -krb5 packages (as we used to have).  It seems to have a generally good
 security history.
 
+Author: Simon Wilkinson <simon@sxw.org.uk>
+Author: Colin Watson <cjwatson@debian.org>
+Author: Jakub Jelen <jjelen@redhat.com>
 Origin: other, https://github.com/openssh-gsskex/openssh-gsskex/commits/debian/master
 Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242
-Last-Updated: 2020-02-21
+Last-Updated: 2020-06-07
 
 Patch-Name: gssapi.patch
 ---
@@ -49,23 +52,23 @@ Patch-Name: gssapi.patch
  servconf.c      |  47 ++++
  servconf.h      |   3 +
  session.c       |  10 +-
- ssh-gss.h       |  50 +++-
+ ssh-gss.h       |  54 ++++-
  ssh.1           |   8 +
  ssh.c           |   6 +-
  ssh_config      |   2 +
  ssh_config.5    |  57 +++++
- sshconnect2.c   | 142 +++++++++++-
+ sshconnect2.c   | 154 +++++++++++-
  sshd.c          |  62 ++++-
  sshd_config     |   2 +
  sshd_config.5   |  30 +++
  sshkey.c        |   3 +-
  sshkey.h        |   1 +
- 38 files changed, 2624 insertions(+), 160 deletions(-)
+ 38 files changed, 2640 insertions(+), 160 deletions(-)
  create mode 100644 kexgssc.c
  create mode 100644 kexgsss.c
 
 diff --git a/Makefile.in b/Makefile.in
-index e7549470c..b68c1710f 100644
+index c9e4294d3..bf1e1de47 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -109,6 +109,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
@@ -336,7 +339,7 @@ index 9351e0428..d6446c0cf 100644
         "gssapi-with-mic",
         userauth_gssapi,
 diff --git a/auth2.c b/auth2.c
-index 0e7762242..1c217268c 100644
+index 91aaf34a6..a4a5e0069 100644
 --- a/auth2.c
 +++ b/auth2.c
 @@ -73,6 +73,7 @@ extern Authmethod method_passwd;
@@ -474,7 +477,7 @@ index 26d62855a..0cadc9f18 100644
  int             get_peer_port(int);
  char           *get_local_ipaddr(int);
 diff --git a/clientloop.c b/clientloop.c
-index ebd0dbca1..1bdac6a46 100644
+index da396c72a..42ace7789 100644
 --- a/clientloop.c
 +++ b/clientloop.c
 @@ -112,6 +112,10 @@
@@ -488,7 +491,7 @@ index ebd0dbca1..1bdac6a46 100644
  /* import options */
  extern Options options;
  
-@@ -1379,9 +1383,18 @@ client_loop(struct ssh *ssh, int have_pty, int escape_char_arg,
+@@ -1361,9 +1365,18 @@ client_loop(struct ssh *ssh, int have_pty, int escape_char_arg,
                         break;
  
                 /* Do channel operations unless rekeying in progress. */
@@ -509,10 +512,10 @@ index ebd0dbca1..1bdac6a46 100644
                 client_process_net_input(ssh, readset);
  
 diff --git a/configure.ac b/configure.ac
-index b689db4b5..efafb6bd8 100644
+index 460383757..d98e6f74a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -674,6 +674,30 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
+@@ -676,6 +676,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])
@@ -1053,11 +1056,11 @@ index a151bc1e4..ef9beb67c 100644
  
  #endif /* KRB5 */
 diff --git a/gss-serv.c b/gss-serv.c
-index ab3a15f0f..1d47870e7 100644
+index b5d4bb2d1..55f4d4bda 100644
 --- a/gss-serv.c
 +++ b/gss-serv.c
 @@ -1,7 +1,7 @@
- /* $OpenBSD: gss-serv.c,v 1.31 2018/07/09 21:37:55 markus Exp $ */
+ /* $OpenBSD: gss-serv.c,v 1.32 2020/03/13 03:17:07 djm Exp $ */
  
  /*
 - * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -1327,7 +1330,7 @@ index ab3a15f0f..1d47870e7 100644
  
  /* Privileged */
 diff --git a/kex.c b/kex.c
-index ce85f0439..574c76093 100644
+index 09c7258e0..144dee512 100644
 --- a/kex.c
 +++ b/kex.c
 @@ -57,11 +57,16 @@
@@ -1439,7 +1442,7 @@ index ce85f0439..574c76093 100644
  /* put algorithm proposal into buffer */
  int
  kex_prop2buf(struct sshbuf *b, char *proposal[PROPOSAL_MAX])
-@@ -698,6 +755,9 @@ kex_free(struct kex *kex)
+@@ -697,6 +754,9 @@ kex_free(struct kex *kex)
         sshbuf_free(kex->server_version);
         sshbuf_free(kex->client_pub);
         free(kex->session_id);
@@ -2653,7 +2656,7 @@ index 000000000..60bc02deb
 +}
 +#endif /* defined(GSSAPI) && defined(WITH_OPENSSL) */
 diff --git a/monitor.c b/monitor.c
-index 2ce89fe90..ebf76c7f9 100644
+index b6e855d5d..5347e900d 100644
 --- a/monitor.c
 +++ b/monitor.c
 @@ -148,6 +148,8 @@ int mm_answer_gss_setup_ctx(struct ssh *, int, struct sshbuf *);
@@ -2706,7 +2709,7 @@ index 2ce89fe90..ebf76c7f9 100644
  
         if (auth_opts->permit_pty_flag) {
                 monitor_permit(mon_dispatch, MONITOR_REQ_PTY, 1);
-@@ -1713,6 +1730,17 @@ monitor_apply_keystate(struct ssh *ssh, struct monitor *pmonitor)
+@@ -1712,6 +1729,17 @@ monitor_apply_keystate(struct ssh *ssh, struct monitor *pmonitor)
  # ifdef OPENSSL_HAS_ECC
                 kex->kex[KEX_ECDH_SHA2] = kex_gen_server;
  # endif
@@ -2724,7 +2727,7 @@ index 2ce89fe90..ebf76c7f9 100644
  #endif /* WITH_OPENSSL */
                 kex->kex[KEX_C25519_SHA256] = kex_gen_server;
                 kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_server;
-@@ -1806,8 +1834,8 @@ mm_answer_gss_setup_ctx(struct ssh *ssh, int sock, struct sshbuf *m)
+@@ -1805,8 +1833,8 @@ mm_answer_gss_setup_ctx(struct ssh *ssh, int sock, struct sshbuf *m)
         u_char *p;
         int r;
  
@@ -2735,7 +2738,7 @@ index 2ce89fe90..ebf76c7f9 100644
  
         if ((r = sshbuf_get_string(m, &p, &len)) != 0)
                 fatal("%s: buffer error: %s", __func__, ssh_err(r));
-@@ -1839,8 +1867,8 @@ mm_answer_gss_accept_ctx(struct ssh *ssh, int sock, struct sshbuf *m)
+@@ -1838,8 +1866,8 @@ mm_answer_gss_accept_ctx(struct ssh *ssh, int sock, struct sshbuf *m)
         OM_uint32 flags = 0; /* GSI needs this */
         int r;
  
@@ -2746,7 +2749,7 @@ index 2ce89fe90..ebf76c7f9 100644
  
         if ((r = ssh_gssapi_get_buffer_desc(m, &in)) != 0)
                 fatal("%s: buffer error: %s", __func__, ssh_err(r));
-@@ -1860,6 +1888,7 @@ mm_answer_gss_accept_ctx(struct ssh *ssh, int sock, struct sshbuf *m)
+@@ -1859,6 +1887,7 @@ mm_answer_gss_accept_ctx(struct ssh *ssh, 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);
@@ -2754,7 +2757,7 @@ index 2ce89fe90..ebf76c7f9 100644
         }
         return (0);
  }
-@@ -1871,8 +1900,8 @@ mm_answer_gss_checkmic(struct ssh *ssh, int sock, struct sshbuf *m)
+@@ -1870,8 +1899,8 @@ mm_answer_gss_checkmic(struct ssh *ssh, int sock, struct sshbuf *m)
         OM_uint32 ret;
         int r;
  
@@ -2765,7 +2768,7 @@ index 2ce89fe90..ebf76c7f9 100644
  
         if ((r = ssh_gssapi_get_buffer_desc(m, &gssbuf)) != 0 ||
             (r = ssh_gssapi_get_buffer_desc(m, &mic)) != 0)
-@@ -1898,13 +1927,17 @@ mm_answer_gss_checkmic(struct ssh *ssh, int sock, struct sshbuf *m)
+@@ -1897,13 +1926,17 @@ mm_answer_gss_checkmic(struct ssh *ssh, int sock, struct sshbuf *m)
  int
  mm_answer_gss_userok(struct ssh *ssh, int sock, struct sshbuf *m)
  {
@@ -2787,7 +2790,7 @@ index 2ce89fe90..ebf76c7f9 100644
  
         sshbuf_reset(m);
         if ((r = sshbuf_put_u32(m, authenticated)) != 0)
-@@ -1913,7 +1946,11 @@ mm_answer_gss_userok(struct ssh *ssh, int sock, struct sshbuf *m)
+@@ -1912,7 +1945,11 @@ mm_answer_gss_userok(struct ssh *ssh, int sock, struct sshbuf *m)
         debug3("%s: sending result %d", __func__, authenticated);
         mm_request_send(sock, MONITOR_ANS_GSSUSEROK, m);
  
@@ -2800,7 +2803,7 @@ index 2ce89fe90..ebf76c7f9 100644
  
         if ((displayname = ssh_gssapi_displayname()) != NULL)
                 auth2_record_info(authctxt, "%s", displayname);
-@@ -1921,5 +1958,85 @@ mm_answer_gss_userok(struct ssh *ssh, int sock, struct sshbuf *m)
+@@ -1920,5 +1957,85 @@ mm_answer_gss_userok(struct ssh *ssh, int sock, struct sshbuf *m)
         /* Monitor loop will terminate if authenticated */
         return (authenticated);
  }
@@ -2995,7 +2998,7 @@ index 23ab096aa..485590c18 100644
  
  #ifdef USE_PAM
 diff --git a/readconf.c b/readconf.c
-index f3cac6b3a..da8022dd0 100644
+index 2afcbaeca..fb585e248 100644
 --- a/readconf.c
 +++ b/readconf.c
 @@ -67,6 +67,7 @@
@@ -3038,7 +3041,7 @@ index f3cac6b3a..da8022dd0 100644
  #endif
  #ifdef ENABLE_PKCS11
         { "pkcs11provider", oPKCS11Provider },
-@@ -1029,10 +1044,42 @@ parse_time:
+@@ -1053,10 +1068,42 @@ parse_time:
                 intptr = &options->gss_authentication;
                 goto parse_flag;
  
@@ -3081,7 +3084,7 @@ index f3cac6b3a..da8022dd0 100644
         case oBatchMode:
                 intptr = &options->batch_mode;
                 goto parse_flag;
-@@ -1911,7 +1958,13 @@ initialize_options(Options * options)
+@@ -1935,7 +1982,13 @@ initialize_options(Options * options)
         options->pubkey_authentication = -1;
         options->challenge_response_authentication = -1;
         options->gss_authentication = -1;
@@ -3095,7 +3098,7 @@ index f3cac6b3a..da8022dd0 100644
         options->password_authentication = -1;
         options->kbd_interactive_authentication = -1;
         options->kbd_interactive_devices = NULL;
-@@ -2059,8 +2112,18 @@ fill_default_options(Options * options)
+@@ -2083,8 +2136,18 @@ fill_default_options(Options * options)
                 options->challenge_response_authentication = 1;
         if (options->gss_authentication == -1)
                 options->gss_authentication = 0;
@@ -3114,7 +3117,7 @@ index f3cac6b3a..da8022dd0 100644
         if (options->password_authentication == -1)
                 options->password_authentication = 1;
         if (options->kbd_interactive_authentication == -1)
-@@ -2702,7 +2765,14 @@ dump_client_config(Options *o, const char *host)
+@@ -2726,7 +2789,14 @@ dump_client_config(Options *o, const char *host)
         dump_cfg_fmtint(oGatewayPorts, o->fwd_opts.gateway_ports);
  #ifdef GSSAPI
         dump_cfg_fmtint(oGssAuthentication, o->gss_authentication);
@@ -3130,7 +3133,7 @@ index f3cac6b3a..da8022dd0 100644
         dump_cfg_fmtint(oHashKnownHosts, o->hash_known_hosts);
         dump_cfg_fmtint(oHostbasedAuthentication, o->hostbased_authentication);
 diff --git a/readconf.h b/readconf.h
-index feedb3d20..a8a8870d7 100644
+index e143a1082..c405b837f 100644
 --- a/readconf.h
 +++ b/readconf.h
 @@ -41,7 +41,13 @@ typedef struct {
@@ -3148,7 +3151,7 @@ index feedb3d20..a8a8870d7 100644
                                                  * authentication. */
         int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
 diff --git a/servconf.c b/servconf.c
-index 70f5f73f0..191575a16 100644
+index ba0a92c7b..f38ba9e44 100644
 --- a/servconf.c
 +++ b/servconf.c
 @@ -69,6 +69,7 @@
@@ -3221,7 +3224,7 @@ index 70f5f73f0..191575a16 100644
         { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
         { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
         { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },
-@@ -1548,6 +1571,10 @@ process_server_config_line_depth(ServerOptions *options, char *line,
+@@ -1555,6 +1578,10 @@ process_server_config_line_depth(ServerOptions *options, char *line,
                 intptr = &options->gss_authentication;
                 goto parse_flag;
  
@@ -3232,7 +3235,7 @@ index 70f5f73f0..191575a16 100644
         case sGssCleanupCreds:
                 intptr = &options->gss_cleanup_creds;
                 goto parse_flag;
-@@ -1556,6 +1583,22 @@ process_server_config_line_depth(ServerOptions *options, char *line,
+@@ -1563,6 +1590,22 @@ process_server_config_line_depth(ServerOptions *options, char *line,
                 intptr = &options->gss_strict_acceptor;
                 goto parse_flag;
  
@@ -3255,7 +3258,7 @@ index 70f5f73f0..191575a16 100644
         case sPasswordAuthentication:
                 intptr = &options->password_authentication;
                 goto parse_flag;
-@@ -2777,6 +2820,10 @@ dump_config(ServerOptions *o)
+@@ -2791,6 +2834,10 @@ dump_config(ServerOptions *o)
  #ifdef GSSAPI
         dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
         dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
@@ -3267,10 +3270,10 @@ index 70f5f73f0..191575a16 100644
         dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
         dump_cfg_fmtint(sKbdInteractiveAuthentication,
 diff --git a/servconf.h b/servconf.h
-index 4202a2d02..3f47ea25e 100644
+index a420f398d..253cad97e 100644
 --- a/servconf.h
 +++ b/servconf.h
-@@ -132,8 +132,11 @@ typedef struct {
+@@ -137,8 +137,11 @@ 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 */
@@ -3283,7 +3286,7 @@ index 4202a2d02..3f47ea25e 100644
                                                  * authentication. */
         int     kbd_interactive_authentication; /* If true, permit */
 diff --git a/session.c b/session.c
-index 8c0e54f79..06a33442a 100644
+index 18cdfa8cf..f9c2c866e 100644
 --- a/session.c
 +++ b/session.c
 @@ -2678,13 +2678,19 @@ do_cleanup(struct ssh *ssh, Authctxt *authctxt)
@@ -3309,7 +3312,7 @@ index 8c0e54f79..06a33442a 100644
  
         /* remove agent socket */
 diff --git a/ssh-gss.h b/ssh-gss.h
-index 36180d07a..70dd36658 100644
+index 36180d07a..50d80bbca 100644
 --- a/ssh-gss.h
 +++ b/ssh-gss.h
 @@ -1,6 +1,6 @@
@@ -3320,7 +3323,7 @@ index 36180d07a..70dd36658 100644
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
-@@ -61,10 +61,30 @@
+@@ -61,10 +61,34 @@
  
  #define SSH_GSS_OIDTYPE 0x06
  
@@ -3340,8 +3343,12 @@ index 36180d07a..70dd36658 100644
 +#define KEX_GSS_C25519_SHA256_ID                       "gss-curve25519-sha256-"
 +
 +#define        GSS_KEX_DEFAULT_KEX \
-+       KEX_GSS_GEX_SHA1_ID "," \
-+       KEX_GSS_GRP14_SHA1_ID
++       KEX_GSS_GRP14_SHA256_ID "," \
++       KEX_GSS_GRP16_SHA512_ID "," \
++       KEX_GSS_NISTP256_SHA256_ID "," \
++       KEX_GSS_C25519_SHA256_ID "," \
++       KEX_GSS_GRP14_SHA1_ID "," \
++       KEX_GSS_GEX_SHA1_ID
 +
  typedef struct {
         char *filename;
@@ -3351,7 +3358,7 @@ index 36180d07a..70dd36658 100644
         void *data;
  } ssh_gssapi_ccache;
  
-@@ -72,8 +92,11 @@ typedef struct {
+@@ -72,8 +96,11 @@ typedef struct {
         gss_buffer_desc displayname;
         gss_buffer_desc exportedname;
         gss_cred_id_t creds;
@@ -3363,7 +3370,7 @@ index 36180d07a..70dd36658 100644
  } ssh_gssapi_client;
  
  typedef struct ssh_gssapi_mech_struct {
-@@ -84,6 +107,7 @@ typedef struct ssh_gssapi_mech_struct {
+@@ -84,6 +111,7 @@ typedef struct ssh_gssapi_mech_struct {
         int (*userok) (ssh_gssapi_client *, char *);
         int (*localname) (ssh_gssapi_client *, char **);
         void (*storecreds) (ssh_gssapi_client *);
@@ -3371,7 +3378,7 @@ index 36180d07a..70dd36658 100644
  } ssh_gssapi_mech;
  
  typedef struct {
-@@ -94,10 +118,11 @@ typedef struct {
+@@ -94,10 +122,11 @@ typedef struct {
         gss_OID         oid; /* client */
         gss_cred_id_t   creds; /* server */
         gss_name_t      client; /* server */
@@ -3384,7 +3391,7 @@ index 36180d07a..70dd36658 100644
  
  int  ssh_gssapi_check_oid(Gssctxt *, void *, size_t);
  void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t);
-@@ -109,6 +134,7 @@ OM_uint32 ssh_gssapi_test_oid_supported(OM_uint32 *, gss_OID, int *);
+@@ -109,6 +138,7 @@ OM_uint32 ssh_gssapi_test_oid_supported(OM_uint32 *, gss_OID, int *);
  
  struct sshbuf;
  int ssh_gssapi_get_buffer_desc(struct sshbuf *, gss_buffer_desc *);
@@ -3392,7 +3399,7 @@ index 36180d07a..70dd36658 100644
  
  OM_uint32 ssh_gssapi_import_name(Gssctxt *, const char *);
  OM_uint32 ssh_gssapi_init_ctx(Gssctxt *, int,
-@@ -123,17 +149,33 @@ void ssh_gssapi_delete_ctx(Gssctxt **);
+@@ -123,17 +153,33 @@ void ssh_gssapi_delete_ctx(Gssctxt **);
  OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
  void ssh_gssapi_buildmic(struct sshbuf *, const char *,
      const char *, const char *);
@@ -3429,10 +3436,10 @@ index 36180d07a..70dd36658 100644
  
  #endif /* _SSH_GSS_H */
 diff --git a/ssh.1 b/ssh.1
-index 60de6087a..db5c65bc7 100644
+index dce5f404b..7a3ba31ab 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -503,7 +503,13 @@ For full details of the options listed below, and their possible values, see
+@@ -506,7 +506,13 @@ For full details of the options listed below, and their possible values, see
  .It GatewayPorts
  .It GlobalKnownHostsFile
  .It GSSAPIAuthentication
@@ -3446,7 +3453,7 @@ index 60de6087a..db5c65bc7 100644
  .It HashKnownHosts
  .It Host
  .It HostbasedAuthentication
-@@ -579,6 +585,8 @@ flag),
+@@ -582,6 +588,8 @@ flag),
  (supported message integrity codes),
  .Ar kex
  (key exchange algorithms),
@@ -3456,10 +3463,10 @@ index 60de6087a..db5c65bc7 100644
  (key types),
  .Ar key-cert
 diff --git a/ssh.c b/ssh.c
-index 15aee569e..110cf9c19 100644
+index 98b6ce788..4a81ef810 100644
 --- a/ssh.c
 +++ b/ssh.c
-@@ -747,6 +747,8 @@ main(int ac, char **av)
+@@ -773,6 +773,8 @@ main(int ac, char **av)
                         else if (strcmp(optarg, "kex") == 0 ||
                             strcasecmp(optarg, "KexAlgorithms") == 0)
                                 cp = kex_alg_list('\n');
@@ -3468,7 +3475,7 @@ index 15aee569e..110cf9c19 100644
                         else if (strcmp(optarg, "key") == 0)
                                 cp = sshkey_alg_list(0, 0, 0, '\n');
                         else if (strcmp(optarg, "key-cert") == 0)
-@@ -772,8 +774,8 @@ main(int ac, char **av)
+@@ -798,8 +800,8 @@ main(int ac, char **av)
                         } else if (strcmp(optarg, "help") == 0) {
                                 cp = xstrdup(
                                     "cipher\ncipher-auth\ncompression\nkex\n"
@@ -3493,7 +3500,7 @@ index 5e8ef548b..1ff999b68 100644
  #   CheckHostIP yes
  #   AddressFamily any
 diff --git a/ssh_config.5 b/ssh_config.5
-index 06a32d314..3f4906972 100644
+index dc010ccbd..e2a2359f9 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -766,10 +766,67 @@ The default is
@@ -3559,13 +3566,13 @@ index 06a32d314..3f4906972 100644
 +.Ed
 +.Pp
 +The default is
-+.Dq gss-gex-sha1-,gss-group14-sha1- .
-+This option only applies to protocol version 2 connections using GSSAPI.
++.Dq gss-group14-sha256-,gss-group16-sha512-,gss-nistp256-sha256-,gss-curve25519-sha256-,gss-gex-sha1-,gss-group14-sha1- .
++This option only applies to connections using GSSAPI.
  .It Cm HashKnownHosts
  Indicates that
  .Xr ssh 1
 diff --git a/sshconnect2.c b/sshconnect2.c
-index af00fb30c..03bc87eb4 100644
+index 1a6545edf..79a22e600 100644
 --- a/sshconnect2.c
 +++ b/sshconnect2.c
 @@ -80,8 +80,6 @@
@@ -3589,7 +3596,7 @@ index af00fb30c..03bc87eb4 100644
         xxx_host = host;
         xxx_hostaddr = hostaddr;
  
-@@ -206,6 +209,35 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port)
+@@ -206,6 +209,41 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port)
                     compat_pkalg_proposal(options.hostkeyalgorithms);
         }
  
@@ -3599,12 +3606,18 @@ index af00fb30c..03bc87eb4 100644
 +                * client to the key exchange algorithm proposal */
 +               orig = myproposal[PROPOSAL_KEX_ALGS];
 +
-+               if (options.gss_server_identity)
++               if (options.gss_server_identity) {
 +                       gss_host = xstrdup(options.gss_server_identity);
-+               else if (options.gss_trust_dns)
++               } else if (options.gss_trust_dns) {
 +                       gss_host = remote_hostname(ssh);
-+               else
++                       /* Fall back to specified host if we are using proxy command
++                        * and can not use DNS on that socket */
++                       if (strcmp(gss_host, "UNKNOWN") == 0) {
++                               gss_host = xstrdup(host);
++                       }
++               } else {
 +                       gss_host = xstrdup(host);
++               }
 +
 +               gss = ssh_gssapi_client_mechanisms(gss_host,
 +                   options.gss_client_identity, options.gss_kex_algorithms);
@@ -3625,7 +3638,7 @@ index af00fb30c..03bc87eb4 100644
         if (options.rekey_limit || options.rekey_interval)
                 ssh_packet_set_rekey_limits(ssh, options.rekey_limit,
                     options.rekey_interval);
-@@ -224,16 +256,46 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port)
+@@ -224,16 +262,46 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port)
  # ifdef OPENSSL_HAS_ECC
         ssh->kex->kex[KEX_ECDH_SHA2] = kex_gen_client;
  # endif
@@ -3673,7 +3686,7 @@ index af00fb30c..03bc87eb4 100644
         if ((r = kex_prop2buf(ssh->kex->my, myproposal)) != 0)
                 fatal("kex_prop2buf: %s", ssh_err(r));
  
-@@ -330,6 +392,7 @@ static int input_gssapi_response(int type, u_int32_t, struct ssh *);
+@@ -330,6 +398,7 @@ static int input_gssapi_response(int type, u_int32_t, struct ssh *);
  static int input_gssapi_token(int type, u_int32_t, struct ssh *);
  static int input_gssapi_error(int, u_int32_t, struct ssh *);
  static int input_gssapi_errtok(int, u_int32_t, struct ssh *);
@@ -3681,7 +3694,7 @@ index af00fb30c..03bc87eb4 100644
  #endif
  
  void   userauth(struct ssh *, char *);
-@@ -346,6 +409,11 @@ static char *authmethods_get(void);
+@@ -346,6 +415,11 @@ static char *authmethods_get(void);
  
  Authmethod authmethods[] = {
  #ifdef GSSAPI
@@ -3693,18 +3706,24 @@ index af00fb30c..03bc87eb4 100644
         {"gssapi-with-mic",
                 userauth_gssapi,
                 userauth_gssapi_cleanup,
-@@ -716,12 +784,25 @@ userauth_gssapi(struct ssh *ssh)
+@@ -716,12 +790,31 @@ userauth_gssapi(struct ssh *ssh)
         OM_uint32 min;
         int r, ok = 0;
         gss_OID mech = NULL;
 +       char *gss_host;
 +
-+       if (options.gss_server_identity)
++       if (options.gss_server_identity) {
 +               gss_host = xstrdup(options.gss_server_identity);
-+       else if (options.gss_trust_dns)
++       } else if (options.gss_trust_dns) {
 +               gss_host = remote_hostname(ssh);
-+       else
++               /* Fall back to specified host if we are using proxy command
++                * and can not use DNS on that socket */
++               if (strcmp(gss_host, "UNKNOWN") == 0) {
++                       gss_host = authctxt->host;
++               }
++       } else {
 +               gss_host = xstrdup(authctxt->host);
++       }
  
         /* Try one GSSAPI method at a time, rather than sending them all at
          * once. */
@@ -3720,7 +3739,7 @@ index af00fb30c..03bc87eb4 100644
  
         /* Check to see whether the mechanism is usable before we offer it */
         while (authctxt->mech_tried < authctxt->gss_supported_mechs->count &&
-@@ -730,13 +811,15 @@ userauth_gssapi(struct ssh *ssh)
+@@ -730,13 +823,15 @@ userauth_gssapi(struct ssh *ssh)
                     elements[authctxt->mech_tried];
                 /* My DER encoding requires length<128 */
                 if (mech->length < 128 && ssh_gssapi_check_mechanism(&gssctxt,
@@ -3737,7 +3756,7 @@ index af00fb30c..03bc87eb4 100644
         if (!ok || mech == NULL)
                 return 0;
  
-@@ -976,6 +1059,55 @@ input_gssapi_error(int type, u_int32_t plen, struct ssh *ssh)
+@@ -976,6 +1071,55 @@ input_gssapi_error(int type, u_int32_t plen, struct ssh *ssh)
         free(lang);
         return r;
  }
@@ -3794,10 +3813,10 @@ index af00fb30c..03bc87eb4 100644
  
  static int
 diff --git a/sshd.c b/sshd.c
-index 60b2aaf73..d92f03aaf 100644
+index 6f8f11a3b..02fca5c28 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -817,8 +817,8 @@ notify_hostkeys(struct ssh *ssh)
+@@ -816,8 +816,8 @@ notify_hostkeys(struct ssh *ssh)
         }
         debug3("%s: sent %u hostkeys", __func__, nkeys);
         if (nkeys == 0)
@@ -3808,7 +3827,7 @@ index 60b2aaf73..d92f03aaf 100644
                 sshpkt_fatal(ssh, r, "%s: send", __func__);
         sshbuf_free(buf);
  }
-@@ -1852,7 +1852,8 @@ main(int ac, char **av)
+@@ -1851,7 +1851,8 @@ main(int ac, char **av)
                 free(fp);
         }
         accumulate_host_timing_secret(cfg, NULL);
@@ -3818,7 +3837,7 @@ index 60b2aaf73..d92f03aaf 100644
                 logit("sshd: no hostkeys available -- exiting.");
                 exit(1);
         }
-@@ -2347,6 +2348,48 @@ do_ssh2_kex(struct ssh *ssh)
+@@ -2342,6 +2343,48 @@ do_ssh2_kex(struct ssh *ssh)
         myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal(
             list_hostkey_types());
  
@@ -3867,7 +3886,7 @@ index 60b2aaf73..d92f03aaf 100644
         /* start key exchange */
         if ((r = kex_setup(ssh, myproposal)) != 0)
                 fatal("kex_setup: %s", ssh_err(r));
-@@ -2362,7 +2405,18 @@ do_ssh2_kex(struct ssh *ssh)
+@@ -2357,7 +2400,18 @@ do_ssh2_kex(struct ssh *ssh)
  # ifdef OPENSSL_HAS_ECC
         kex->kex[KEX_ECDH_SHA2] = kex_gen_server;
  # endif
@@ -3901,10 +3920,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 70ccea449..f6b41a2f8 100644
+index b294efc2d..360e5fb1a 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -646,6 +646,11 @@ Specifies whether to automatically destroy the user's credentials cache
+@@ -644,6 +644,11 @@ Specifies whether to automatically destroy the user's credentials cache
  on logout.
  The default is
  .Cm yes .
@@ -3916,7 +3935,7 @@ index 70ccea449..f6b41a2f8 100644
  .It Cm GSSAPIStrictAcceptorCheck
  Determines whether to be strict about the identity of the GSSAPI acceptor
  a client authenticates against.
-@@ -660,6 +665,31 @@ machine's default store.
+@@ -658,6 +663,31 @@ machine's default store.
  This facility is provided to assist with operation on multi homed machines.
  The default is
  .Cm yes .
@@ -3943,13 +3962,13 @@ index 70ccea449..f6b41a2f8 100644
 +.Ed
 +.Pp
 +The default is
-+.Dq gss-gex-sha1-,gss-group14-sha1- .
-+This option only applies to protocol version 2 connections using GSSAPI.
++.Dq gss-group14-sha256-,gss-group16-sha512-,gss-nistp256-sha256-,gss-curve25519-sha256-,gss-gex-sha1-,gss-group14-sha1- .
++This option only applies to connections using GSSAPI.
  .It Cm HostbasedAcceptedKeyTypes
  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 57995ee68..fd5b77246 100644
+index 1571e3d93..1ac32a0ec 100644
 --- a/sshkey.c
 +++ b/sshkey.c
 @@ -154,6 +154,7 @@ static const struct keytype keytypes[] = {
@@ -3970,7 +3989,7 @@ index 57995ee68..fd5b77246 100644
                 if (!include_sigonly && kt->sigonly)
                         continue;
 diff --git a/sshkey.h b/sshkey.h
-index 71a3fddcb..37a43a67a 100644
+index 9c1d4f637..f586e8967 100644
 --- a/sshkey.h
 +++ b/sshkey.h
 @@ -69,6 +69,7 @@ enum sshkey_types {
diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index 734118a19..4a26d9d31 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -1,4 +1,4 @@
-From 3558be2914c0127489faae40ce2eae66142c3287 Mon Sep 17 00:00:00 2001
+From 24c9c811bfd227e467ab1ce00503f08dcc22c0f4 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
@@ -26,7 +26,7 @@ Patch-Name: keepalive-extensions.patch
  3 files changed, 34 insertions(+), 4 deletions(-)
 
 diff --git a/readconf.c b/readconf.c
-index 0fc996871..2399208f8 100644
+index 2ccc48572..431243193 100644
 --- a/readconf.c
 +++ b/readconf.c
 @@ -176,6 +176,7 @@ typedef enum {
@@ -46,7 +46,7 @@ index 0fc996871..2399208f8 100644
  
         { NULL, oBadOption }
  };
-@@ -1495,6 +1498,8 @@ parse_keytypes:
+@@ -1519,6 +1522,8 @@ parse_keytypes:
                 goto parse_flag;
  
         case oServerAliveInterval:
@@ -55,7 +55,7 @@ index 0fc996871..2399208f8 100644
                 intptr = &options->server_alive_interval;
                 goto parse_time;
  
-@@ -2198,8 +2203,13 @@ fill_default_options(Options * options)
+@@ -2222,8 +2227,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 0fc996871..2399208f8 100644
                 options->server_alive_count_max = 3;
         if (options->control_master == -1)
 diff --git a/ssh_config.5 b/ssh_config.5
-index 3f4906972..3079db19b 100644
+index e2a2359f9..85ab7447f 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -266,9 +266,13 @@ If set to
@@ -90,7 +90,7 @@ index 3f4906972..3079db19b 100644
  The argument must be
  .Cm yes
  or
-@@ -1593,7 +1597,14 @@ from the server,
+@@ -1604,7 +1608,14 @@ from the server,
  will send a message through the encrypted
  channel to request a response from the server.
  The default
@@ -106,7 +106,7 @@ index 3f4906972..3079db19b 100644
  .It Cm SetEnv
  Directly specify one or more environment variables and their contents to
  be sent to the server.
-@@ -1673,6 +1684,12 @@ Specifies whether the system should send TCP keepalive messages to the
+@@ -1684,6 +1695,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.
@@ -120,10 +120,10 @@ index 3f4906972..3079db19b 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 f6b41a2f8..ebd09f891 100644
+index 360e5fb1a..9f093be1f 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -1668,6 +1668,9 @@ This avoids infinitely hanging sessions.
+@@ -1680,6 +1680,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 6d48d7589..50b51619c 100644
--- a/debian/patches/mention-ssh-keygen-on-keychange.patch
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -1,4 +1,4 @@
-From c18e3c8125fc4553951705a1da8c86395d219bb1 Mon Sep 17 00:00:00 2001
+From 8ec2f85d03524a6b4954f0a29496b5a301f92080 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,7 +14,7 @@ Patch-Name: mention-ssh-keygen-on-keychange.patch
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/sshconnect.c b/sshconnect.c
-index 4a5d4a003..b796d3c8a 100644
+index bfbf80e92..f20d3e792 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
 @@ -991,9 +991,13 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
diff --git a/debian/patches/no-openssl-version-status.patch b/debian/patches/no-openssl-version-status.patch
index 02a798b85..b91cbd4ea 100644
--- a/debian/patches/no-openssl-version-status.patch
+++ b/debian/patches/no-openssl-version-status.patch
@@ -1,4 +1,4 @@
-From ba0377ab3e6b68f7ab747f500991a0445c7f4086 Mon Sep 17 00:00:00 2001
+From a5d0b90bbd2c5a6bdec17b1abc5dca8166ae73f7 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 34ec87094..342487057 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -1,4 +1,4 @@
-From 39fe318a4b572deeb3f7d03e55d319c0ab112a28 Mon Sep 17 00:00:00 2001
+From 34bf12a8e8fcc7720168dac307ef9388af93b947 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,10 +44,10 @@ index ef0de0850..149846c8c 100644
  .Sh SEE ALSO
  .Xr ssh-keygen 1 ,
 diff --git a/ssh-keygen.1 b/ssh-keygen.1
-index 7af564297..d6a7870e0 100644
+index 059c1b034..45866f931 100644
 --- a/ssh-keygen.1
 +++ b/ssh-keygen.1
-@@ -196,9 +196,7 @@ key in
+@@ -197,9 +197,7 @@ key in
  .Pa ~/.ssh/id_ed25519_sk
  or
  .Pa ~/.ssh/id_rsa .
@@ -58,7 +58,7 @@ index 7af564297..d6a7870e0 100644
  .Pp
  Normally this program generates the key and asks for a file in which
  to store the private key.
-@@ -261,9 +259,7 @@ If
+@@ -262,9 +260,7 @@ If
  .Fl f
  has also been specified, its argument is used as a prefix to the
  default path for the resulting host key files.
@@ -69,7 +69,7 @@ index 7af564297..d6a7870e0 100644
  .It Fl a Ar rounds
  When saving a private key, this option specifies the number of KDF
  (key derivation function) rounds used.
-@@ -783,7 +779,7 @@ option.
+@@ -787,7 +783,7 @@ option.
  Valid generator values are 2, 3, and 5.
  .Pp
  Screened DH groups may be installed in
@@ -78,7 +78,7 @@ index 7af564297..d6a7870e0 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.
  .Pp
-@@ -1154,7 +1150,7 @@ on all machines
+@@ -1158,7 +1154,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 7af564297..d6a7870e0 100644
  The file format is described in
  .Xr moduli 5 .
 diff --git a/ssh.1 b/ssh.1
-index cf991e4ee..17b0e984f 100644
+index a80be8efe..566fdba6b 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -887,6 +887,10 @@ implements public key authentication protocol automatically,
+@@ -890,6 +890,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,10 +133,10 @@ index 730520231..5ce0ea4fa 100644
  .Xr sshd_config 5 ,
  .Xr inetd 8 ,
 diff --git a/sshd_config.5 b/sshd_config.5
-index c926f584c..25f4b8117 100644
+index 753ceda10..c27f99937 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -387,8 +387,7 @@ Certificates signed using other algorithms will not be accepted for
+@@ -385,8 +385,7 @@ Certificates signed using other algorithms will not be accepted for
  public key or host-based authentication.
  .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 32a7a1fed..a560ae940 100644
--- a/debian/patches/package-versioning.patch
+++ b/debian/patches/package-versioning.patch
@@ -1,4 +1,4 @@
-From a4f868858c3395cacb59c58786b501317b9a3d03 Mon Sep 17 00:00:00 2001
+From d66c30698f807ab95aee7ea4a882c192884df047 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
@@ -18,10 +18,10 @@ Patch-Name: package-versioning.patch
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/kex.c b/kex.c
-index 574c76093..f638942d3 100644
+index 144dee512..0e64bf760 100644
 --- a/kex.c
 +++ b/kex.c
-@@ -1244,7 +1244,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
+@@ -1243,7 +1243,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
         if (version_addendum != NULL && *version_addendum == '\0')
                 version_addendum = NULL;
         if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n",
@@ -29,13 +29,13 @@ index 574c76093..f638942d3 100644
 +          PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
             version_addendum == NULL ? "" : " ",
             version_addendum == NULL ? "" : version_addendum)) != 0) {
-                error("%s: sshbuf_putf: %s", __func__, ssh_err(r));
+                oerrno = errno;
 diff --git a/version.h b/version.h
-index c2affcb2a..d79126cc3 100644
+index a2eca3ec8..158eaee70 100644
 --- a/version.h
 +++ b/version.h
 @@ -3,4 +3,9 @@
- #define SSH_VERSION    "OpenSSH_8.2"
+ #define SSH_VERSION    "OpenSSH_8.3"
  
  #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 aa6f4cc31..e32c31717 100644
--- a/debian/patches/restore-authorized_keys2.patch
+++ b/debian/patches/restore-authorized_keys2.patch
@@ -1,4 +1,4 @@
-From 58390cbd5e07df92729b794beb491f7352b26993 Mon Sep 17 00:00:00 2001
+From a31d1fdf19480d9a184a27a4d221655f408f74d7 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 d73cc283c..e544e3874 100644
--- a/debian/patches/restore-tcp-wrappers.patch
+++ b/debian/patches/restore-tcp-wrappers.patch
@@ -1,4 +1,4 @@
-From 31d42cd8624f29508f772447e617ab043a6487d9 Mon Sep 17 00:00:00 2001
+From 7e3de67f8447064d6963e8299653d8e01baaef1e 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 efafb6bd8..cee7cbc51 100644
+index d98e6f74a..812b7218f 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1556,6 +1556,62 @@ else
+@@ -1558,6 +1558,62 @@ else
         AC_MSG_RESULT([no])
  fi
  
@@ -94,7 +94,7 @@ index efafb6bd8..cee7cbc51 100644
  # Check whether user wants to use ldns
  LDNS_MSG="no"
  AC_ARG_WITH(ldns,
-@@ -5413,6 +5469,7 @@ echo "                       PAM support: $PAM_MSG"
+@@ -5479,6 +5535,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 c5f8987d2..730520231 100644
  .Xr moduli 5 ,
  .Xr sshd_config 5 ,
 diff --git a/sshd.c b/sshd.c
-index d92f03aaf..62dc55cf2 100644
+index 02fca5c28..e96d90809 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -124,6 +124,13 @@
@@ -145,7 +145,7 @@ index d92f03aaf..62dc55cf2 100644
  /* Re-exec fds */
  #define REEXEC_DEVCRYPTO_RESERVED_FD   (STDERR_FILENO + 1)
  #define REEXEC_STARTUP_PIPE_FD         (STDERR_FILENO + 2)
-@@ -2138,6 +2145,24 @@ main(int ac, char **av)
+@@ -2132,6 +2139,24 @@ main(int ac, char **av)
  #ifdef SSH_AUDIT_EVENTS
         audit_connection_from(remote_ip, remote_port);
  #endif
diff --git a/debian/patches/revert-ipqos-defaults.patch b/debian/patches/revert-ipqos-defaults.patch
index 13192e380..0ec75419a 100644
--- a/debian/patches/revert-ipqos-defaults.patch
+++ b/debian/patches/revert-ipqos-defaults.patch
@@ -1,4 +1,4 @@
-From 86fe78ef4686485394b464cf9d3393ce27b33979 Mon Sep 17 00:00:00 2001
+From 39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Mon, 8 Apr 2019 10:46:29 +0100
 Subject: Revert "upstream: Update default IPQoS in ssh(1), sshd(8) to DSCP
@@ -24,10 +24,10 @@ Patch-Name: revert-ipqos-defaults.patch
  4 files changed, 8 insertions(+), 12 deletions(-)
 
 diff --git a/readconf.c b/readconf.c
-index e82024678..1b9494d7c 100644
+index 87b0dc62a..9a646dcaa 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -2230,9 +2230,9 @@ fill_default_options(Options * options)
+@@ -2254,9 +2254,9 @@ fill_default_options(Options * options)
         if (options->visual_host_key == -1)
                 options->visual_host_key = 0;
         if (options->ip_qos_interactive == -1)
@@ -40,7 +40,7 @@ index e82024678..1b9494d7c 100644
                 options->request_tty = REQUEST_TTY_AUTO;
         if (options->proxy_use_fdpass == -1)
 diff --git a/servconf.c b/servconf.c
-index 7bbc25c2e..470ad3619 100644
+index cf4e52f3b..c290e9786 100644
 --- a/servconf.c
 +++ b/servconf.c
 @@ -452,9 +452,9 @@ fill_default_server_options(ServerOptions *options)
@@ -56,7 +56,7 @@ index 7bbc25c2e..470ad3619 100644
                 options->version_addendum = xstrdup("");
         if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1)
 diff --git a/ssh_config.5 b/ssh_config.5
-index 34dc2d51b..91beb6f50 100644
+index aac3fabb7..2574b1004 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -1140,11 +1140,9 @@ If one argument is specified, it is used as the packet class unconditionally.
@@ -74,10 +74,10 @@ index 34dc2d51b..91beb6f50 100644
  .It Cm KbdInteractiveAuthentication
  Specifies whether to use keyboard-interactive authentication.
 diff --git a/sshd_config.5 b/sshd_config.5
-index e8271be74..d25b2f3d5 100644
+index b38025dbf..88db4db07 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -914,11 +914,9 @@ If one argument is specified, it is used as the packet class unconditionally.
+@@ -925,11 +925,9 @@ If one argument is specified, it is used as the packet class unconditionally.
  If two values are specified, the first is automatically selected for
  interactive sessions and the second for non-interactive sessions.
  The default is
diff --git a/debian/patches/scp-quoting.patch b/debian/patches/scp-quoting.patch
index 8935b8e04..0166c914a 100644
--- a/debian/patches/scp-quoting.patch
+++ b/debian/patches/scp-quoting.patch
@@ -1,4 +1,4 @@
-From 5166a6af68da4778c7e2c2d117bb56361c7aa361 Mon Sep 17 00:00:00 2001
+From 2520672d1ccfd88744c93bac102f461f9b1e0cf3 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,7 +17,7 @@ Patch-Name: scp-quoting.patch
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/scp.c b/scp.c
-index 6901e0c94..9b64aa5f4 100644
+index b4492a062..66b4af8e8 100644
 --- a/scp.c
 +++ b/scp.c
 @@ -201,8 +201,16 @@ do_local_cmd(arglist *a)
diff --git a/debian/patches/selinux-role.patch b/debian/patches/selinux-role.patch
index 63e44af55..b0088c104 100644
--- a/debian/patches/selinux-role.patch
+++ b/debian/patches/selinux-role.patch
@@ -1,4 +1,4 @@
-From b108c6bbe4b3691600a272b27fa24d9080018db7 Mon Sep 17 00:00:00 2001
+From 8641a3f57e67e087b4500beb9916e06c4d0ba94c 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 becc672b5..5da9fe75f 100644
         /* Method lists for multiple authentication */
         char            **auth_methods; /* modified from server config */
 diff --git a/auth2.c b/auth2.c
-index 1c217268c..92a6bcaf4 100644
+index a4a5e0069..05d6c2447 100644
 --- a/auth2.c
 +++ b/auth2.c
 @@ -265,7 +265,7 @@ input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
@@ -81,7 +81,7 @@ index 1c217268c..92a6bcaf4 100644
                 if (auth2_setup_methods_lists(authctxt) != 0)
                         ssh_packet_disconnect(ssh,
 diff --git a/monitor.c b/monitor.c
-index ebf76c7f9..947fdfadc 100644
+index 5347e900d..8002aca86 100644
 --- a/monitor.c
 +++ b/monitor.c
 @@ -118,6 +118,7 @@ int mm_answer_sign(struct ssh *, int, struct sshbuf *);
@@ -154,7 +154,7 @@ index ebf76c7f9..947fdfadc 100644
         return (0);
  }
  
-@@ -1554,7 +1583,7 @@ mm_answer_pty(struct ssh *ssh, int sock, struct sshbuf *m)
+@@ -1553,7 +1582,7 @@ mm_answer_pty(struct ssh *ssh, int sock, struct sshbuf *m)
         res = pty_allocate(&s->ptyfd, &s->ttyfd, s->tty, sizeof(s->tty));
         if (res == 0)
                 goto error;
@@ -245,7 +245,7 @@ index 485590c18..370b08e17 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 622988822..3e6e07670 100644
+index f46094faf..56f1d2c1e 100644
 --- a/openbsd-compat/port-linux.c
 +++ b/openbsd-compat/port-linux.c
 @@ -56,7 +56,7 @@ ssh_selinux_enabled(void)
@@ -363,7 +363,7 @@ 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 06a33442a..871799590 100644
+index f9c2c866e..837a8bacf 100644
 --- a/session.c
 +++ b/session.c
 @@ -1360,7 +1360,7 @@ safely_chroot(const char *path, uid_t uid)
@@ -425,10 +425,10 @@ index ce59dabd9..675c91146 100644
  const char     *session_get_remote_name_or_ip(struct ssh *, u_int, int);
  
 diff --git a/sshd.c b/sshd.c
-index 62dc55cf2..65916fc6d 100644
+index e96d90809..e8b332ca4 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -595,7 +595,7 @@ privsep_postauth(struct ssh *ssh, Authctxt *authctxt)
+@@ -594,7 +594,7 @@ privsep_postauth(struct ssh *ssh, Authctxt *authctxt)
         reseed_prngs();
  
         /* Drop privileges */
diff --git a/debian/patches/shell-path.patch b/debian/patches/shell-path.patch
index 43fb1d145..4752e2a71 100644
--- a/debian/patches/shell-path.patch
+++ b/debian/patches/shell-path.patch
@@ -1,4 +1,4 @@
-From c19bcc02b07b450d585d0fd10ccd96174aeb3b7c Mon Sep 17 00:00:00 2001
+From b78e6371a98460f5d12683406674e117d64b35f2 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 4711af782..4a5d4a003 100644
+index af08be415..bfbf80e92 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
 @@ -260,7 +260,7 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, const char *host_arg,
@@ -28,7 +28,7 @@ index 4711af782..4a5d4a003 100644
                 perror(argv[0]);
                 exit(1);
         }
-@@ -1388,7 +1388,7 @@ ssh_local_cmd(const char *args)
+@@ -1389,7 +1389,7 @@ ssh_local_cmd(const char *args)
         if (pid == 0) {
                 ssh_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 e7849e6c3..ed23334d9 100644
--- a/debian/patches/ssh-agent-setgid.patch
+++ b/debian/patches/ssh-agent-setgid.patch
@@ -1,4 +1,4 @@
-From ad09303388f0172ab6e028aaf27d87cf873d123d Mon Sep 17 00:00:00 2001
+From 303cbd5533df863d518bc61d837ce56a93166b11 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 8f796719d..52e5bf70b 100644
--- a/debian/patches/ssh-argv0.patch
+++ b/debian/patches/ssh-argv0.patch
@@ -1,4 +1,4 @@
-From 4b1e0000a099f988553ccc4b274e1790b5114c12 Mon Sep 17 00:00:00 2001
+From 81723f749647928d918de21057d9dbfbebaa8e53 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 17b0e984f..b33a8049f 100644
+index 566fdba6b..5a31b5dde 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -1610,6 +1610,7 @@ if an error occurred.
+@@ -1613,6 +1613,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 99116e9c4..cc2656bda 100644
--- a/debian/patches/ssh-vulnkey-compat.patch
+++ b/debian/patches/ssh-vulnkey-compat.patch
@@ -1,4 +1,4 @@
-From 11d571f137c76d8c2e38b1c1a537b04cc279f8e3 Mon Sep 17 00:00:00 2001
+From 6ed578a01fd61f9c930ef46cfefc467203ddd6c0 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 da8022dd0..0fc996871 100644
+index fb585e248..2ccc48572 100644
 --- a/readconf.c
 +++ b/readconf.c
 @@ -191,6 +191,7 @@ static struct {
@@ -29,7 +29,7 @@ index da8022dd0..0fc996871 100644
         { "useroaming", oDeprecated },
         { "usersh", oDeprecated },
 diff --git a/servconf.c b/servconf.c
-index 191575a16..bf3cd84a4 100644
+index f38ba9e44..ff5b9436c 100644
 --- a/servconf.c
 +++ b/servconf.c
 @@ -656,6 +656,7 @@ static struct {
diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch
index 234d95ad2..273f8069f 100644
--- a/debian/patches/syslog-level-silent.patch
+++ b/debian/patches/syslog-level-silent.patch
@@ -1,4 +1,4 @@
-From 387c2c1954773733bae9fca21a92db62c31180bd Mon Sep 17 00:00:00 2001
+From f2c3eb379d31f24de20dc9a2e0089ed84f52055b Mon Sep 17 00:00:00 2001
 From: Natalie Amery <nmamery@chiark.greenend.org.uk>
 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 110cf9c19..6138fd4d3 100644
+index 4a81ef810..7879d4f4d 100644
 --- a/ssh.c
 +++ b/ssh.c
-@@ -1305,7 +1305,7 @@ main(int ac, char **av)
+@@ -1339,7 +1339,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 fdcfca30d..a85ed6732 100644
--- a/debian/patches/systemd-readiness.patch
+++ b/debian/patches/systemd-readiness.patch
@@ -1,4 +1,4 @@
-From a208834b2d1811dac7054d7fdcdd04672f8b19f6 Mon Sep 17 00:00:00 2001
+From fe8c9983321154a61f4f06be602f925f1fd24ee7 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 cee7cbc51..5db3013de 100644
+index 812b7218f..7e0584d2c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4664,6 +4664,29 @@ AC_ARG_WITH([kerberos5],
+@@ -4730,6 +4730,29 @@ AC_ARG_WITH([kerberos5],
  AC_SUBST([GSSLIBS])
  AC_SUBST([K5LIBS])
  
@@ -47,7 +47,7 @@ index cee7cbc51..5db3013de 100644
  # Looking for programs, paths and files
  
  PRIVSEP_PATH=/var/empty
-@@ -5476,6 +5499,7 @@ echo "                   libldns support: $LDNS_MSG"
+@@ -5542,6 +5565,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 cee7cbc51..5db3013de 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 da876a900..c069505a0 100644
+index baee13506..d2d1877d4 100644
 --- a/sshd.c
 +++ b/sshd.c
 @@ -85,6 +85,10 @@
@@ -70,7 +70,7 @@ index da876a900..c069505a0 100644
  #include "xmalloc.h"
  #include "ssh.h"
  #include "ssh2.h"
-@@ -2027,6 +2031,11 @@ main(int ac, char **av)
+@@ -2026,6 +2030,11 @@ main(int ac, char **av)
                         }
                 }
  
diff --git a/debian/patches/user-group-modes.patch b/debian/patches/user-group-modes.patch
index 8bd35addf..19c1809d9 100644
--- a/debian/patches/user-group-modes.patch
+++ b/debian/patches/user-group-modes.patch
@@ -1,4 +1,4 @@
-From 3309e464e5ae6c940ddd584eed4d2d403f4c168c Mon Sep 17 00:00:00 2001
+From cb72edd9757c469f3b5dc9cde374715ae8b54509 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
@@ -27,7 +27,7 @@ Patch-Name: user-group-modes.patch
  7 files changed, 63 insertions(+), 13 deletions(-)
 
 diff --git a/auth-rhosts.c b/auth-rhosts.c
-index 7a10210b6..587f53721 100644
+index e81321b49..3bcc73766 100644
 --- a/auth-rhosts.c
 +++ b/auth-rhosts.c
 @@ -260,8 +260,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
@@ -65,7 +65,7 @@ index 687c57b42..aed3c13ac 100644
                             "bad owner or modes for %.200s",
                             pw->pw_name, user_hostfile);
 diff --git a/misc.c b/misc.c
-index 3a31d5c18..073d3be19 100644
+index 554ceb0b1..75fe4dfea 100644
 --- a/misc.c
 +++ b/misc.c
 @@ -61,8 +61,9 @@
@@ -169,10 +169,10 @@ index 4a05db2da..5db594b91 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 2399208f8..7f251dd4a 100644
+index 431243193..5bf0afbb4 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -1902,8 +1902,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
+@@ -1926,8 +1926,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 2399208f8..7f251dd4a 100644
         }
  
 diff --git a/ssh.1 b/ssh.1
-index db5c65bc7..cf991e4ee 100644
+index 7a3ba31ab..a80be8efe 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -1506,6 +1506,8 @@ The file format and configuration options are described in
+@@ -1509,6 +1509,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 db5c65bc7..cf991e4ee 100644
  .It Pa ~/.ssh/environment
  Contains additional definitions for environment variables; see
 diff --git a/ssh_config.5 b/ssh_config.5
-index 3079db19b..e61a0fd43 100644
+index 85ab7447f..d814147d4 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -1952,6 +1952,8 @@ The format of this file is described above.
+@@ -1957,6 +1957,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 writable by others.