1 files changed, 79 insertions, 9 deletions

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index a1bab832f..0f766620d 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.48 2014/07/06 07:42:03 djm Exp $
+#       $OpenBSD: test-exec.sh,v 1.51 2015/03/03 22:35:19 markus Exp $
 #       Placed in the Public Domain.
 
 #SUDO=sudo
@@ -130,6 +130,11 @@ if [ "x$TEST_SSH_CONCH" != "x" ]; then
         esac
 fi
 
+SSH_PROTOCOLS=`$SSH -Q protocol-version`
+if [ "x$TEST_SSH_PROTOCOLS" != "x" ]; then
+        SSH_PROTOCOLS="${TEST_SSH_PROTOCOLS}"
+fi
+
 # Path to sshd must be absolute for rexec
 case "$SSHD" in
 /*) ;;
@@ -141,6 +146,55 @@ case "$SSHAGENT" in
 *) SSHAGENT=`which $SSHAGENT` ;;
 esac
 
+# Record the actual binaries used.
+SSH_BIN=${SSH}
+SSHD_BIN=${SSHD}
+SSHAGENT_BIN=${SSHAGENT}
+SSHADD_BIN=${SSHADD}
+SSHKEYGEN_BIN=${SSHKEYGEN}
+SSHKEYSCAN_BIN=${SSHKEYSCAN}
+SFTP_BIN=${SFTP}
+SFTPSERVER_BIN=${SFTPSERVER}
+SCP_BIN=${SCP}
+
+if [ "x$USE_VALGRIND" != "x" ]; then
+        mkdir -p $OBJ/valgrind-out
+        VG_TEST=`basename $SCRIPT .sh`
+
+        # Some tests are difficult to fix.
+        case "$VG_TEST" in
+        connect-privsep|reexec)
+                VG_SKIP=1 ;;
+        esac
+
+        if [ x"$VG_SKIP" = "x" ]; then
+                VG_IGNORE="/bin/*,/sbin/*,/usr/*,/var/*"
+                VG_LOG="$OBJ/valgrind-out/${VG_TEST}."
+                VG_OPTS="--track-origins=yes --leak-check=full"
+                VG_OPTS="$VG_OPTS --trace-children=yes"
+                VG_OPTS="$VG_OPTS --trace-children-skip=${VG_IGNORE}"
+                VG_PATH="valgrind"
+                if [ "x$VALGRIND_PATH" != "x" ]; then
+                        VG_PATH="$VALGRIND_PATH"
+                fi
+                VG="$VG_PATH $VG_OPTS"
+                SSH="$VG --log-file=${VG_LOG}ssh.%p $SSH"
+                SSHD="$VG --log-file=${VG_LOG}sshd.%p $SSHD"
+                SSHAGENT="$VG --log-file=${VG_LOG}ssh-agent.%p $SSHAGENT"
+                SSHADD="$VG --log-file=${VG_LOG}ssh-add.%p $SSHADD"
+                SSHKEYGEN="$VG --log-file=${VG_LOG}ssh-keygen.%p $SSHKEYGEN"
+                SSHKEYSCAN="$VG --log-file=${VG_LOG}ssh-keyscan.%p $SSHKEYSCAN"
+                SFTP="$VG --log-file=${VG_LOG}sftp.%p ${SFTP}"
+                SCP="$VG --log-file=${VG_LOG}scp.%p $SCP"
+                cat > $OBJ/valgrind-sftp-server.sh << EOF
+#!/bin/sh
+exec $VG --log-file=${VG_LOG}sftp-server.%p $SFTPSERVER "\$@"
+EOF
+                chmod a+rx $OBJ/valgrind-sftp-server.sh
+                SFTPSERVER="$OBJ/valgrind-sftp-server.sh"
+        fi
+fi
+
 # Logfiles.
 # SSH_LOGFILE should be the debug output of ssh(1) only
 # SSHD_LOGFILE should be the debug output of sshd(8) only
@@ -175,7 +229,7 @@ SSH="$SSHLOGWRAP"
 # [kbytes] to ensure the file is at least that large.
 DATANAME=data
 DATA=$OBJ/${DATANAME}
-cat ${SSHAGENT} >${DATA}
+cat ${SSHAGENT_BIN} >${DATA}
 chmod u+w ${DATA}
 COPY=$OBJ/copy
 rm -f ${COPY}
@@ -183,7 +237,7 @@ rm -f ${COPY}
 increase_datafile_size()
 {
         while [ `du -k ${DATA} | cut -f1` -lt $1 ]; do
-                cat ${SSHAGENT} >>${DATA}
+                cat ${SSHAGENT_BIN} >>${DATA}
         done
 }
 
@@ -325,16 +379,27 @@ fatal ()
         exit $RESULT
 }
 
+ssh_version ()
+{
+        echo ${SSH_PROTOCOLS} | grep "$1" >/dev/null
+}
+
 RESULT=0
 PIDFILE=$OBJ/pidfile
 
 trap fatal 3 2
 
+if ssh_version 1; then
+        PROTO="2,1"
+else
+        PROTO="2"
+fi
+
 # create server config
 cat << EOF > $OBJ/sshd_config
         StrictModes             no
         Port                    $PORT
-        Protocol                2,1
+        Protocol                $PROTO
         AddressFamily           inet
         ListenAddress           127.0.0.1
         #ListenAddress          ::1
@@ -360,7 +425,7 @@ echo 'StrictModes no' >> $OBJ/sshd_proxy
 # create client config
 cat << EOF > $OBJ/ssh_config
 Host *
-        Protocol                2,1
+        Protocol                $PROTO
         Hostname                127.0.0.1
         HostKeyAlias            localhost-with-alias
         Port                    $PORT
@@ -385,10 +450,15 @@ fi
 
 rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER
 
+if ssh_version 1; then
+        SSH_KEYTYPES="rsa rsa1"
+else
+        SSH_KEYTYPES="rsa ed25519"
+fi
 trace "generate keys"
-for t in rsa rsa1; do
+for t in ${SSH_KEYTYPES}; do
         # generate user key
-        if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN} -nt $OBJ/$t ]; then
+        if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN_BIN} -nt $OBJ/$t ]; then
                 rm -f $OBJ/$t
                 ${SSHKEYGEN} -q -N '' -t $t  -f $OBJ/$t ||\
                         fail "ssh-keygen for $t failed"
@@ -451,7 +521,7 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then
         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_SSHD_LOGFILE} -i -f $OBJ/sshd_proxy" >> ${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
 
         REGRESS_INTEROP_PUTTY=yes
 fi
@@ -459,7 +529,7 @@ fi
 # create a proxy version of the client config
 (
         cat $OBJ/ssh_config
-        echo proxycommand ${SUDO} sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSHD_LOGFILE} -i -f $OBJ/sshd_proxy
+        echo proxycommand ${SUDO} sh ${SRC}/sshd-log-wrapper.sh ${TEST_SSHD_LOGFILE} ${SSHD} -i -f $OBJ/sshd_proxy
 ) > $OBJ/ssh_proxy
 
 # check proxy config