1 files changed, 6 insertions, 6 deletions

diff --git a/debian/patches/conch-old-privkey-format.patch b/debian/patches/conch-old-privkey-format.patch
index ce7dc266e..b04c21060 100644
--- a/debian/patches/conch-old-privkey-format.patch
+++ b/debian/patches/conch-old-privkey-format.patch
@@ -1,4 +1,4 @@
-From 2e889a135439e6234502c813fa0ef2eb1fcd733c Mon Sep 17 00:00:00 2001
+From 311da721c2a5c6d147738e0699fa49d04cd5762a 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 34c47e8cb..17e0a06e8 100644
+index 774c10d41..01e257a94 100644
 --- a/regress/Makefile
 +++ b/regress/Makefile
-@@ -119,7 +119,7 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \
+@@ -120,7 +120,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 \
@@ -29,7 +29,7 @@ index 34c47e8cb..17e0a06e8 100644
 +               ssh-rsa_oldfmt ssh-rsa_oldfmt.pub \
                 ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \
                 ssh_proxy_envpass sshd.log sshd_config sshd_config_minimal \
-                sshd_config.orig sshd_proxy sshd_proxy.* sshd_proxy_bak \
+                sshd_config.* sshd_proxy sshd_proxy.* sshd_proxy_bak \
 diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh
 index 6678813a2..6ff5da20b 100644
 --- a/regress/conch-ciphers.sh
@@ -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 508b93284..5e48bfbe3 100644
+index f5e3ee6f5..a3a40719f 100644
 --- a/regress/test-exec.sh
 +++ b/regress/test-exec.sh
-@@ -510,6 +510,18 @@ REGRESS_INTEROP_CONCH=no
+@@ -573,6 +573,18 @@ REGRESS_INTEROP_CONCH=no
  if test -x "$CONCH" ; then
         REGRESS_INTEROP_CONCH=yes
  fi