Fix interop tests for recent regress changes

1 files changed, 20 insertions, 23 deletions

diff --git a/debian/patches/conch-old-privkey-format.patch b/debian/patches/conch-old-privkey-format.patch
index 40fe32898..6de8d391b 100644
--- a/debian/patches/conch-old-privkey-format.patch
+++ b/debian/patches/conch-old-privkey-format.patch
@@ -1,4 +1,4 @@
-From 9c01e0ae9889c05bfe68b2f1f1c5e5019e63ff0b Mon Sep 17 00:00:00 2001
+From 715b72009450c3448de10729817687c53554efb2 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
@@ -8,46 +8,43 @@ Twisted Conch fails to read private keys in the new format
 can be fixed in Twisted.
 
 Forwarded: not-needed
-Last-Update: 2018-08-30
+Last-Update: 2019-06-14
 
 Patch-Name: conch-old-privkey-format.patch
 ---
- regress/Makefile         |  5 +++--
+ regress/Makefile         |  2 +-
  regress/conch-ciphers.sh |  2 +-
  regress/test-exec.sh     | 12 ++++++++++++
- 3 files changed, 16 insertions(+), 3 deletions(-)
+ 3 files changed, 14 insertions(+), 2 deletions(-)
 
 diff --git a/regress/Makefile b/regress/Makefile
-index 925edf71a..6fdfcc8ca 100644
+index 781400fd0..491a3a46a 100644
 --- a/regress/Makefile
 +++ b/regress/Makefile
-@@ -110,8 +110,9 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \
-                modpipe netcat no_identity_config \
-                pidfile putty.rsa2 ready regress.log \
-                remote_pid revoked-* rsa rsa-agent rsa-agent.pub rsa.pub \
--               rsa1 rsa1-agent rsa1-agent.pub rsa1.pub rsa_ssh2_cr.prv \
--               rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \
-+               rsa1 rsa1-agent rsa1-agent.pub rsa1.pub \
-+               rsa_oldfmt rsa_oldfmt.pub \
-+               rsa_ssh2_cr.prv rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \
+@@ -114,7 +114,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 \
-                ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \
+                sftp-server.sh sftp.log ssh-log-wrapper.sh \
+-               ssh-rsa_oldfmt \
++               ssh-rsa_oldfmt ssh-rsa_oldfmt.pub \
+                ssh.log 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 \
 diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh
-index 199d863a0..c7df19fd4 100644
+index 51e3b705f..fa24552b0 100644
 --- a/regress/conch-ciphers.sh
 +++ b/regress/conch-ciphers.sh
 @@ -16,7 +16,7 @@ for c in aes256-ctr aes256-cbc aes192-ctr aes192-cbc aes128-ctr aes128-cbc \
         rm -f ${COPY}
         # XXX the 2nd "cat" seems to be needed because of buggy FD handling
         # in conch
--       ${CONCH} --identity $OBJ/rsa --port $PORT --user $USER  -e none \
-+       ${CONCH} --identity $OBJ/rsa_oldfmt --port $PORT --user $USER  -e none \
+-       ${CONCH} --identity $OBJ/ssh-rsa --port $PORT --user $USER -e none \
++       ${CONCH} --identity $OBJ/ssh-rsa_oldfmt --port $PORT --user $USER -e none \
             --known-hosts $OBJ/known_hosts --notty --noagent --nox11 -n \
             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 b8e2009de..08338121b 100644
+index efde6a173..83c7d02e6 100644
 --- a/regress/test-exec.sh
 +++ b/regress/test-exec.sh
 @@ -500,6 +500,18 @@ REGRESS_INTEROP_CONCH=no
@@ -62,9 +59,9 @@ index b8e2009de..08338121b 100644
 +if test "$REGRESS_INTEROP_CONCH" = "yes" ; then
 +       # Convert rsa key to old format to work around
 +       # https://twistedmatrix.com/trac/ticket/9515
-+       cp $OBJ/rsa $OBJ/rsa_oldfmt
-+       cp $OBJ/rsa.pub $OBJ/rsa_oldfmt.pub
-+       ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/rsa_oldfmt >/dev/null
++       cp $OBJ/ssh-rsa $OBJ/ssh-rsa_oldfmt
++       cp $OBJ/ssh-rsa.pub $OBJ/ssh-rsa_oldfmt.pub
++       ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/ssh-rsa_oldfmt >/dev/null
 +fi
  
  # If PuTTY is present and we are running a PuTTY test, prepare keys and