diff options
author | Colin Watson <cjwatson@debian.org> | 2018-08-30 00:58:56 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:25:35 +0100 |
commit | f2697f0c5ff23bc13dce1c90fb4c1c934c02070b (patch) | |
tree | fae6fa8ce0eb2284d541e5389d92beef948130da /regress/test-exec.sh | |
parent | a31d1fdf19480d9a184a27a4d221655f408f74d7 (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/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 5dc975d07..d8491b2be 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -587,6 +587,18 @@ REGRESS_INTEROP_CONCH=no | |||
587 | if test -x "$CONCH" ; then | 587 | if test -x "$CONCH" ; then |
588 | REGRESS_INTEROP_CONCH=yes | 588 | REGRESS_INTEROP_CONCH=yes |
589 | fi | 589 | fi |
590 | case "$SCRIPT" in | ||
591 | *conch*) ;; | ||
592 | *) REGRESS_INTEROP_CONCH=no | ||
593 | esac | ||
594 | |||
595 | if test "$REGRESS_INTEROP_CONCH" = "yes" ; then | ||
596 | # Convert rsa key to old format to work around | ||
597 | # https://twistedmatrix.com/trac/ticket/9515 | ||
598 | cp $OBJ/ssh-rsa $OBJ/ssh-rsa_oldfmt | ||
599 | cp $OBJ/ssh-rsa.pub $OBJ/ssh-rsa_oldfmt.pub | ||
600 | ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/ssh-rsa_oldfmt >/dev/null | ||
601 | fi | ||
590 | 602 | ||
591 | # If PuTTY is present and we are running a PuTTY test, prepare keys and | 603 | # If PuTTY is present and we are running a PuTTY test, prepare keys and |
592 | # configuration | 604 | # configuration |