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>2018-10-20 22:54:09 +0100
commit1d2a55436d4b556269f42ad5f7e16608b5a8ed74 (patch)
treea0e031c2e9ab78b7bc2d8a26b29e74d756ba4926 /regress/test-exec.sh
parent9ce189b9f22890421b7f8d3f49a39186d3ce3e14 (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: 2018-08-30 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 40d46e3cd..1bbd47f25 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -504,6 +504,18 @@ REGRESS_INTEROP_CONCH=no
504if test -x "$CONCH" ; then 504if test -x "$CONCH" ; then
505 REGRESS_INTEROP_CONCH=yes 505 REGRESS_INTEROP_CONCH=yes
506fi 506fi
507case "$SCRIPT" in
508*conch*) ;;
509*) REGRESS_INTEROP_CONCH=no
510esac
511
512if test "$REGRESS_INTEROP_CONCH" = "yes" ; then
513 # Convert rsa key to old format to work around
514 # https://twistedmatrix.com/trac/ticket/9515
515 cp $OBJ/rsa $OBJ/rsa_oldfmt
516 cp $OBJ/rsa.pub $OBJ/rsa_oldfmt.pub
517 ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/rsa_oldfmt >/dev/null
518fi
507 519
508# If PuTTY is present and we are running a PuTTY test, prepare keys and 520# If PuTTY is present and we are running a PuTTY test, prepare keys and
509# configuration 521# configuration