summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2018-08-30 00:58:56 +0100
committerColin Watson <cjwatson@debian.org>2020-02-21 12:10:36 +0000
commit311da721c2a5c6d147738e0699fa49d04cd5762a (patch)
tree06dc8ce3eddc6939482ba72947ec381764b25060 /regress
parent2fe72c4e855be0fc87dbdc296632394b6cfe957a (diff)
Work around conch interoperability failure
Twisted Conch fails to read private keys in the new format (https://twistedmatrix.com/trac/ticket/9515). Work around this until it can be fixed in Twisted. Forwarded: not-needed Last-Update: 2019-10-09 Patch-Name: conch-old-privkey-format.patch
Diffstat (limited to 'regress')
-rw-r--r--regress/Makefile2
-rw-r--r--regress/conch-ciphers.sh2
-rw-r--r--regress/test-exec.sh12
3 files changed, 14 insertions, 2 deletions
diff --git a/regress/Makefile b/regress/Makefile
index 774c10d41..01e257a94 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -120,7 +120,7 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \
120 rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \ 120 rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \
121 scp-ssh-wrapper.scp setuid-allowed sftp-server.log \ 121 scp-ssh-wrapper.scp setuid-allowed sftp-server.log \
122 sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \ 122 sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \
123 ssh-rsa_oldfmt \ 123 ssh-rsa_oldfmt ssh-rsa_oldfmt.pub \
124 ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \ 124 ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \
125 ssh_proxy_envpass sshd.log sshd_config sshd_config_minimal \ 125 ssh_proxy_envpass sshd.log sshd_config sshd_config_minimal \
126 sshd_config.* sshd_proxy sshd_proxy.* sshd_proxy_bak \ 126 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
+++ b/regress/conch-ciphers.sh
@@ -16,7 +16,7 @@ for c in aes256-ctr aes256-cbc aes192-ctr aes192-cbc aes128-ctr aes128-cbc \
16 rm -f ${COPY} 16 rm -f ${COPY}
17 # XXX the 2nd "cat" seems to be needed because of buggy FD handling 17 # XXX the 2nd "cat" seems to be needed because of buggy FD handling
18 # in conch 18 # in conch
19 ${CONCH} --identity $OBJ/ssh-rsa --port $PORT --user $USER -e none \ 19 ${CONCH} --identity $OBJ/ssh-rsa_oldfmt --port $PORT --user $USER -e none \
20 --known-hosts $OBJ/known_hosts --notty --noagent --nox11 -n \ 20 --known-hosts $OBJ/known_hosts --notty --noagent --nox11 -n \
21 127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY} 21 127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY}
22 if [ $? -ne 0 ]; then 22 if [ $? -ne 0 ]; then
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index f5e3ee6f5..a3a40719f 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -573,6 +573,18 @@ REGRESS_INTEROP_CONCH=no
573if test -x "$CONCH" ; then 573if test -x "$CONCH" ; then
574 REGRESS_INTEROP_CONCH=yes 574 REGRESS_INTEROP_CONCH=yes
575fi 575fi
576case "$SCRIPT" in
577*conch*) ;;
578*) REGRESS_INTEROP_CONCH=no
579esac
580
581if test "$REGRESS_INTEROP_CONCH" = "yes" ; then
582 # Convert rsa key to old format to work around
583 # https://twistedmatrix.com/trac/ticket/9515
584 cp $OBJ/ssh-rsa $OBJ/ssh-rsa_oldfmt
585 cp $OBJ/ssh-rsa.pub $OBJ/ssh-rsa_oldfmt.pub
586 ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/ssh-rsa_oldfmt >/dev/null
587fi
576 588
577# If PuTTY is present and we are running a PuTTY test, prepare keys and 589# If PuTTY is present and we are running a PuTTY test, prepare keys and
578# configuration 590# configuration