1 files changed, 72 insertions, 3 deletions

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 59ae33c08..b54448912 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.28 2005/05/20 23:14:15 djm Exp $
+#       $OpenBSD: test-exec.sh,v 1.35 2008/06/28 13:57:25 djm Exp $
 #       Placed in the Public Domain.
 
 #SUDO=sudo
@@ -69,6 +69,11 @@ SFTP=sftp
 SFTPSERVER=/usr/libexec/openssh/sftp-server
 SCP=scp
 
+# Interop testing
+PLINK=plink
+PUTTYGEN=puttygen
+CONCH=conch
+
 if [ "x$TEST_SSH_SSH" != "x" ]; then
         SSH="${TEST_SSH_SSH}"
 fi
@@ -96,6 +101,27 @@ fi
 if [ "x$TEST_SSH_SCP" != "x" ]; then
         SCP="${TEST_SSH_SCP}"
 fi
+if [ "x$TEST_SSH_PLINK" != "x" ]; then
+        # Find real binary, if it exists
+        case "${TEST_SSH_PLINK}" in
+        /*) PLINK="${TEST_SSH_PLINK}" ;;
+        *) PLINK=`which ${TEST_SSH_PLINK} 2>/dev/null` ;;
+        esac
+fi
+if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then
+        # Find real binary, if it exists
+        case "${TEST_SSH_PUTTYGEN}" in
+        /*) PUTTYGEN="${TEST_SSH_PUTTYGEN}" ;;
+        *) PUTTYGEN=`which ${TEST_SSH_PUTTYGEN} 2>/dev/null` ;;
+        esac
+fi
+if [ "x$TEST_SSH_CONCH" != "x" ]; then
+        # Find real binary, if it exists
+        case "${TEST_SSH_CONCH}" in
+        /*) CONCH="${TEST_SSH_CONCH}" ;;
+        *) CONCH=`which ${TEST_SSH_CONCH} 2>/dev/null` ;;
+        esac
+fi
 
 # Path to sshd must be absolute for rexec
 case "$SSHD" in
@@ -269,6 +295,49 @@ for t in rsa rsa1; do
 done
 chmod 644 $OBJ/authorized_keys_$USER
 
+# Activate Twisted Conch tests if the binary is present
+REGRESS_INTEROP_CONCH=no
+if test -x "$CONCH" ; then
+        REGRESS_INTEROP_CONCH=yes
+fi
+
+# If PuTTY is present and we are running a PuTTY test, prepare keys and
+# configuration
+REGRESS_INTEROP_PUTTY=no
+if test -x "$PUTTYGEN" -a -x "$PLINK" ; then
+        REGRESS_INTEROP_PUTTY=yes
+fi
+case "$SCRIPT" in
+*putty*)        ;;
+*)              REGRESS_INTEROP_PUTTY=no ;;
+esac
+
+if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then
+        mkdir -p ${OBJ}/.putty
+
+        # Add a PuTTY key to authorized_keys
+        rm -f ${OBJ}/putty.rsa2
+        puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null
+        puttygen -O public-openssh ${OBJ}/putty.rsa2 \
+            >> $OBJ/authorized_keys_$USER
+
+        # Convert rsa2 host key to PuTTY format
+        ${SRC}/ssh2putty.sh 127.0.0.1 $PORT $OBJ/rsa > \
+            ${OBJ}/.putty/sshhostkeys
+        ${SRC}/ssh2putty.sh 127.0.0.1 22 $OBJ/rsa >> \
+            ${OBJ}/.putty/sshhostkeys
+
+        # Setup proxied session
+        mkdir -p ${OBJ}/.putty/sessions
+        rm -f ${OBJ}/.putty/sessions/localhost_proxy
+        echo "Hostname=127.0.0.1" >> ${OBJ}/.putty/sessions/localhost_proxy
+        echo "PortNumber=$PORT" >> ${OBJ}/.putty/sessions/localhost_proxy
+        echo "ProxyMethod=5" >> ${OBJ}/.putty/sessions/localhost_proxy
+        echo "ProxyTelnetCommand=sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSH_LOGFILE} -i -f $OBJ/sshd_proxy" >> ${OBJ}/.putty/sessions/localhost_proxy 
+
+        REGRESS_INTEROP_PUTTY=yes
+fi
+
 # create a proxy version of the client config
 (
         cat $OBJ/ssh_config
@@ -281,8 +350,8 @@ ${SSHD} -t -f $OBJ/sshd_proxy	|| fatal "sshd_proxy broken"
 start_sshd ()
 {
         # start sshd
-        $SUDO ${SSHD} -f $OBJ/sshd_config -t    || fatal "sshd_config broken"
-        $SUDO ${SSHD} -f $OBJ/sshd_config -e >>$TEST_SSH_LOGFILE 2>&1
+        $SUDO ${SSHD} -f $OBJ/sshd_config "$@" -t || fatal "sshd_config broken"
+        $SUDO ${SSHD} -f $OBJ/sshd_config -e "$@" >>$TEST_SSH_LOGFILE 2>&1
 
         trace "wait for sshd"
         i=0;