diff options
author | Colin Watson <cjwatson@debian.org> | 2018-08-30 00:58:56 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-02-19 11:49:55 +0000 |
commit | 2e889a135439e6234502c813fa0ef2eb1fcd733c (patch) | |
tree | 50ec162b4c93037649a2cc18c9a43a2acabcaac0 /regress/test-exec.sh | |
parent | 5c1ed7182e928fcf03d11c1bcc51c26c2c42629d (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 508b93284..5e48bfbe3 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -510,6 +510,18 @@ REGRESS_INTEROP_CONCH=no | |||
510 | if test -x "$CONCH" ; then | 510 | if test -x "$CONCH" ; then |
511 | REGRESS_INTEROP_CONCH=yes | 511 | REGRESS_INTEROP_CONCH=yes |
512 | fi | 512 | fi |
513 | case "$SCRIPT" in | ||
514 | *conch*) ;; | ||
515 | *) REGRESS_INTEROP_CONCH=no | ||
516 | esac | ||
517 | |||
518 | if test "$REGRESS_INTEROP_CONCH" = "yes" ; then | ||
519 | # Convert rsa key to old format to work around | ||
520 | # https://twistedmatrix.com/trac/ticket/9515 | ||
521 | cp $OBJ/ssh-rsa $OBJ/ssh-rsa_oldfmt | ||
522 | cp $OBJ/ssh-rsa.pub $OBJ/ssh-rsa_oldfmt.pub | ||
523 | ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/ssh-rsa_oldfmt >/dev/null | ||
524 | fi | ||
513 | 525 | ||
514 | # If PuTTY is present and we are running a PuTTY test, prepare keys and | 526 | # If PuTTY is present and we are running a PuTTY test, prepare keys and |
515 | # configuration | 527 | # configuration |