diff options
author | Colin Watson <cjwatson@debian.org> | 2018-08-30 00:58:56 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2018-08-30 00:58:56 +0100 |
commit | 38966b4afedee3bb57d3b1b0a7df4ff438fb9fd0 (patch) | |
tree | 589f791b5e4ae2804ea3f8f8bc54a59abe8fe07f /regress/test-exec.sh | |
parent | 16a47fc4b04977a14f44dd433c8da1499fa80671 (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.sh | 12 |
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 | |||
504 | if test -x "$CONCH" ; then | 504 | if test -x "$CONCH" ; then |
505 | REGRESS_INTEROP_CONCH=yes | 505 | REGRESS_INTEROP_CONCH=yes |
506 | fi | 506 | fi |
507 | case "$SCRIPT" in | ||
508 | *conch*) ;; | ||
509 | *) REGRESS_INTEROP_CONCH=no | ||
510 | esac | ||
511 | |||
512 | if 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 | ||
518 | fi | ||
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 |