1 files changed, 0 insertions, 36 deletions

diff --git a/debian/patches/backport-fix-first-kex-follows.patch b/debian/patches/backport-fix-first-kex-follows.patch
deleted file mode 100644
index 0039a55a6..000000000
--- a/debian/patches/backport-fix-first-kex-follows.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 31cc76b587fe2305eab8f7788c5dc6c876aff60e Mon Sep 17 00:00:00 2001
-From: Damien Miller <djm@mindrot.org>
-Date: Tue, 15 Dec 2015 15:25:04 +0000
-Subject: upstream commit
-
-unbreak connections with peers that set first_kex_follows;
-fix from Matt Johnston va bz#2515
-
-Origin: backport, http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/kex.c.diff?r1=1.114&r2=1.115
-Forwarded: not-needed
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1526357
-
-Patch-Name: backport-fix-first-kex-follows.patch
----
- kex.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/kex.c b/kex.c
-index 39a6f98..12f3e41 100644
---- a/kex.c
-+++ b/kex.c
-@@ -286,11 +286,11 @@ kex_buf2prop(struct sshbuf *raw, int *first_kex_follows, char ***propp)
-                debug2("kex_parse_kexinit: %s", proposal[i]);
-        }
-        /* first kex follows / reserved */
--       if ((r = sshbuf_get_u8(b, &v)) != 0 ||
--           (r = sshbuf_get_u32(b, &i)) != 0)
-+       if ((r = sshbuf_get_u8(b, &v)) != 0 ||  /* first_kex_follows */
-+           (r = sshbuf_get_u32(b, &i)) != 0)   /* reserved */
-                goto out;
-        if (first_kex_follows != NULL)
--               *first_kex_follows = i;
-+               *first_kex_follows = v;
-        debug2("kex_parse_kexinit: first_kex_follows %d ", v);
-        debug2("kex_parse_kexinit: reserved %u ", i);
-        r = 0;