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
 if test -x "$CONCH" ; then
         REGRESS_INTEROP_CONCH=yes
 fi
+case "$SCRIPT" in
+*conch*)        ;;
+*)              REGRESS_INTEROP_CONCH=no
+esac
+
+if test "$REGRESS_INTEROP_CONCH" = "yes" ; then
+        # Convert rsa key to old format to work around
+        # https://twistedmatrix.com/trac/ticket/9515
+        cp $OBJ/ssh-rsa $OBJ/ssh-rsa_oldfmt
+        cp $OBJ/ssh-rsa.pub $OBJ/ssh-rsa_oldfmt.pub
+        ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/ssh-rsa_oldfmt >/dev/null
+fi
 
 # If PuTTY is present and we are running a PuTTY test, prepare keys and
 # configuration