diff options
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 |