summaryrefslogtreecommitdiff
path: root/regress/test-exec.sh
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2018-08-30 00:58:56 +0100
committerColin Watson <cjwatson@debian.org>2019-06-21 16:14:04 +0100
commita20835ce2f9899305421bc478ba29d6524e89433 (patch)
tree487dd092ddd127620acf17a68fa2ce3a2edfb39c /regress/test-exec.sh
parent42519a0f32765726ccd18a14aa6e877413a69662 (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-06-14 Patch-Name: conch-old-privkey-format.patch
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r--regress/test-exec.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index efde6a173..83c7d02e6 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -500,6 +500,18 @@ REGRESS_INTEROP_CONCH=no
500if test -x "$CONCH" ; then 500if test -x "$CONCH" ; then
501 REGRESS_INTEROP_CONCH=yes 501 REGRESS_INTEROP_CONCH=yes
502fi 502fi
503case "$SCRIPT" in
504*conch*) ;;
505*) REGRESS_INTEROP_CONCH=no
506esac
507
508if test "$REGRESS_INTEROP_CONCH" = "yes" ; then
509 # Convert rsa key to old format to work around
510 # https://twistedmatrix.com/trac/ticket/9515
511 cp $OBJ/ssh-rsa $OBJ/ssh-rsa_oldfmt
512 cp $OBJ/ssh-rsa.pub $OBJ/ssh-rsa_oldfmt.pub
513 ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/ssh-rsa_oldfmt >/dev/null
514fi
503 515
504# If PuTTY is present and we are running a PuTTY test, prepare keys and 516# If PuTTY is present and we are running a PuTTY test, prepare keys and
505# configuration 517# configuration