1 files changed, 25 insertions, 15 deletions

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 1b6526d0b..bfa48803b 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.53 2016/04/15 02:57:10 djm Exp $
+#       $OpenBSD: test-exec.sh,v 1.58 2016/12/16 01:06:27 dtucker Exp $
 #       Placed in the Public Domain.
 
 #SUDO=sudo
@@ -130,7 +130,8 @@ if [ "x$TEST_SSH_CONCH" != "x" ]; then
         esac
 fi
 
-SSH_PROTOCOLS=`$SSH -Q protocol-version`
+SSH_PROTOCOLS=2
+#SSH_PROTOCOLS=`$SSH -Q protocol-version`
 if [ "x$TEST_SSH_PROTOCOLS" != "x" ]; then
         SSH_PROTOCOLS="${TEST_SSH_PROTOCOLS}"
 fi
@@ -292,16 +293,8 @@ md5 () {
 }
 # End of portable specific functions
 
-# helper
-cleanup ()
+stop_sshd ()
 {
-        if [ "x$SSH_PID" != "x" ]; then
-                if [ $SSH_PID -lt 2 ]; then
-                        echo bad pid for ssh: $SSH_PID
-                else
-                        kill $SSH_PID
-                fi
-        fi
         if [ -f $PIDFILE ]; then
                 pid=`$SUDO cat $PIDFILE`
                 if [ "X$pid" = "X" ]; then
@@ -324,6 +317,19 @@ cleanup ()
         fi
 }
 
+# helper
+cleanup ()
+{
+        if [ "x$SSH_PID" != "x" ]; then
+                if [ $SSH_PID -lt 2 ]; then
+                        echo bad pid for ssh: $SSH_PID
+                else
+                        kill $SSH_PID
+                fi
+        fi
+        stop_sshd
+}
+
 start_debug_log ()
 {
         echo "trace: $@" >$TEST_REGRESS_LOGFILE
@@ -400,7 +406,6 @@ fi
 cat << EOF > $OBJ/sshd_config
         StrictModes             no
         Port                    $PORT
-        Protocol                $PROTO
         AddressFamily           inet
         ListenAddress           127.0.0.1
         #ListenAddress          ::1
@@ -433,7 +438,6 @@ echo 'StrictModes no' >> $OBJ/sshd_proxy
 # create client config
 cat << EOF > $OBJ/ssh_config
 Host *
-        Protocol                $PROTO
         Hostname                127.0.0.1
         HostKeyAlias            localhost-with-alias
         Port                    $PORT
@@ -513,7 +517,11 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then
 
         # Add a PuTTY key to authorized_keys
         rm -f ${OBJ}/putty.rsa2
-        puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null
+        if ! puttygen -t rsa -o ${OBJ}/putty.rsa2 \
+            --new-passphrase /dev/null < /dev/null > /dev/null; then
+                echo "Your installed version of PuTTY is too old to support --new-passphrase; trying without (may require manual interaction) ..." >&2
+                puttygen -t rsa -o ${OBJ}/putty.rsa2 < /dev/null > /dev/null
+        fi
         puttygen -O public-openssh ${OBJ}/putty.rsa2 \
             >> $OBJ/authorized_keys_$USER
 
@@ -526,10 +534,12 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then
         # 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 "Protocol=ssh" >> ${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 ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy" >> ${OBJ}/.putty/sessions/localhost_proxy
+        echo "ProxyLocalhost=1" >> ${OBJ}/.putty/sessions/localhost_proxy
 
         REGRESS_INTEROP_PUTTY=yes
 fi