5 files changed, 43 insertions, 4 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index f73621e9d..c60a212e2 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-e293f21da513a7db59fe1997c9e90e2e9cdbceda
-e293f21da513a7db59fe1997c9e90e2e9cdbceda
+bd081a1ae125c7c6b2cfec89746d1298a306ad78
+bd081a1ae125c7c6b2cfec89746d1298a306ad78
 62f54f20bf351468e0124f63cc2902ee40d9b0e9
 62f54f20bf351468e0124f63cc2902ee40d9b0e9
 openssh_7.6p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index f7a823c27..75eb0dd13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ openssh (1:7.6p1-3) UNRELEASED; urgency=medium
     installations should just enable GSSAPIAuthentication and
     GSSAPIKeyExchange in sshd_config (closes: #878626).
   * Support the "noudeb" build profile.
+  * Fix putty-transfer regression test.
 
   [ Anders Kaseorg ]
   * debian/systemd/ssh-agent.service: Add missing dbus dependency.
diff --git a/debian/patches/fix-regress-putty-transfer.patch b/debian/patches/fix-regress-putty-transfer.patch
new file mode 100644
index 000000000..cfec3a9d2
--- /dev/null
+++ b/debian/patches/fix-regress-putty-transfer.patch
@@ -0,0 +1,37 @@
+From bd081a1ae125c7c6b2cfec89746d1298a306ad78 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Tue, 16 Jan 2018 17:38:36 +0000
+Subject: Fix putty-transfer regression test
+
+The test key file is still called putty.rsa2, not putty.rsa.
+
+Forwarded: no
+Last-Update: 2018-01-16
+
+Patch-Name: fix-regress-putty-transfer.patch
+---
+ regress/putty-transfer.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/regress/putty-transfer.sh b/regress/putty-transfer.sh
+index 32c79f9e..57e46540 100644
+--- a/regress/putty-transfer.sh
++++ b/regress/putty-transfer.sh
+@@ -15,7 +15,7 @@ for c in 0 1 ; do
+            ${OBJ}/.putty/sessions/compression_$c
+        echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k
+        env HOME=$PWD ${PLINK} -load compression_$c -batch \
+-           -i putty.rsa cat ${DATA} > ${COPY}
++           -i putty.rsa2 cat ${DATA} > ${COPY}
+        if [ $? -ne 0 ]; then
+                fail "ssh cat $DATA failed"
+        fi
+@@ -26,7 +26,7 @@ for c in 0 1 ; do
+                rm -f ${COPY}
+                dd if=$DATA obs=${s} 2> /dev/null | \
+                        env HOME=$PWD ${PLINK} -load compression_$c \
+-                           -batch -i putty.rsa \
++                           -batch -i putty.rsa2 \
+                            "cat > ${COPY}"
+                if [ $? -ne 0 ]; then
+                        fail "ssh cat $DATA failed"
diff --git a/debian/patches/series b/debian/patches/series
index 7b9d0e39b..01aa2c87c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ seccomp-s390-flock-ipc.patch
 seccomp-getuid-geteuid.patch
 seccomp-s390-ioctl-ep11-crypto.patch
 permitopen-argument-handling.patch
+fix-regress-putty-transfer.patch
diff --git a/regress/putty-transfer.sh b/regress/putty-transfer.sh
index 32c79f9ea..57e465404 100644
--- a/regress/putty-transfer.sh
+++ b/regress/putty-transfer.sh
@@ -15,7 +15,7 @@ for c in 0 1 ; do
             ${OBJ}/.putty/sessions/compression_$c
         echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k
         env HOME=$PWD ${PLINK} -load compression_$c -batch \
-            -i putty.rsa cat ${DATA} > ${COPY}
+            -i putty.rsa2 cat ${DATA} > ${COPY}
         if [ $? -ne 0 ]; then
                 fail "ssh cat $DATA failed"
         fi
@@ -26,7 +26,7 @@ for c in 0 1 ; do
                 rm -f ${COPY}
                 dd if=$DATA obs=${s} 2> /dev/null | \
                         env HOME=$PWD ${PLINK} -load compression_$c \
-                            -batch -i putty.rsa \
+                            -batch -i putty.rsa2 \
                             "cat > ${COPY}"
                 if [ $? -ne 0 ]; then
                         fail "ssh cat $DATA failed"