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 f5e3ee6f5..a3a40719f 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -573,6 +573,18 @@ REGRESS_INTEROP_CONCH=no | |||
573 | if test -x "$CONCH" ; then | 573 | if test -x "$CONCH" ; then |
574 | REGRESS_INTEROP_CONCH=yes | 574 | REGRESS_INTEROP_CONCH=yes |
575 | fi | 575 | fi |
576 | case "$SCRIPT" in | ||
577 | *conch*) ;; | ||
578 | *) REGRESS_INTEROP_CONCH=no | ||
579 | esac | ||
580 | |||
581 | if test "$REGRESS_INTEROP_CONCH" = "yes" ; then | ||
582 | # Convert rsa key to old format to work around | ||
583 | # https://twistedmatrix.com/trac/ticket/9515 | ||
584 | cp $OBJ/ssh-rsa $OBJ/ssh-rsa_oldfmt | ||
585 | cp $OBJ/ssh-rsa.pub $OBJ/ssh-rsa_oldfmt.pub | ||
586 | ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/ssh-rsa_oldfmt >/dev/null | ||
587 | fi | ||
576 | 588 | ||
577 | # If PuTTY is present and we are running a PuTTY test, prepare keys and | 589 | # If PuTTY is present and we are running a PuTTY test, prepare keys and |
578 | # configuration | 590 | # configuration |