12 files changed, 236 insertions, 50 deletions
diff --git a/regress/Makefile b/regress/Makefile
index 9762ab204..f114c27e9 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,6 +1,6 @@
-#       $OpenBSD: Makefile,v 1.54 2010/06/27 19:19:56 phessler Exp $
+#       $OpenBSD: Makefile,v 1.58 2011/01/06 22:46:21 djm Exp $
-REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t-exec
+REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec
 tests:          $(REGRESS_TARGETS)
 # Interop tests are not run by default
@@ -53,14 +53,20 @@ LTESTS= 	connect \
                localcommand \
                forcecommand \
                portnum \
+                keytype \
+                kextype \
                cert-hostkey \
-                cert-userkey
+                cert-userkey \
+                host-expand
 INTEROP_TESTS=  putty-transfer putty-ciphers putty-kex conch-ciphers
 #INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
+#LTESTS=        cipher-speed
 USER!=          id -un
-CLEANFILES=     t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
+CLEANFILES=     t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
+                t8.out t8.out.pub t9.out t9.out.pub \
                authorized_keys_${USER} known_hosts pidfile \
                ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \
                rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
@@ -69,45 +75,68 @@ CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
                scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \
                sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \
                known_hosts-cert host_ca_key* cert_host_key* \
-                putty.rsa2 sshd_proxy_orig \
+                putty.rsa2 sshd_proxy_orig ssh_proxy_bak \
-                authorized_principals_${USER}
+                key.rsa-* key.dsa-* key.ecdsa-* \
+                authorized_principals_${USER} expect actual
 # Enable all malloc(3) randomisations and checks
 TEST_ENV=      "MALLOC_OPTIONS=AFGJPRX"
+TEST_SSH_SSHKEYGEN?=ssh-keygen
 t1:
-        ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
+        ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
+        tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv
+        ${TEST_SSH_SSHKEYGEN} -if ${.OBJDIR}/rsa_ssh2_cr.prv | diff - ${.CURDIR}/rsa_openssh.prv
+        awk '{print $$0 "\r"}' ${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_crnl.prv
+        ${TEST_SSH_SSHKEYGEN} -if ${.OBJDIR}/rsa_ssh2_crnl.prv | diff - ${.CURDIR}/rsa_openssh.prv
 t2:
        cat ${.CURDIR}/rsa_openssh.prv > $(OBJ)/t2.out
        chmod 600 $(OBJ)/t2.out
-        ssh-keygen -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub
+        ${TEST_SSH_SSHKEYGEN} -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub
 t3:
-        ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/rsa_secsh.pub
+        ${TEST_SSH_SSHKEYGEN} -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/t3.out
-        ssh-keygen -if $(OBJ)/rsa_secsh.pub | diff - ${.CURDIR}/rsa_openssh.pub
+        ${TEST_SSH_SSHKEYGEN} -if $(OBJ)/t3.out | diff - ${.CURDIR}/rsa_openssh.pub
-        rm -f ${.CURDIR}/rsa_secsh.pub
 t4:
-        ssh-keygen -lf ${.CURDIR}/rsa_openssh.pub |\
+        ${TEST_SSH_SSHKEYGEN} -lf ${.CURDIR}/rsa_openssh.pub |\
                awk '{print $$2}' | diff - ${.CURDIR}/t4.ok
 t5:
-        ssh-keygen -Bf ${.CURDIR}/rsa_openssh.pub |\
+        ${TEST_SSH_SSHKEYGEN} -Bf ${.CURDIR}/rsa_openssh.pub |\
                awk '{print $$2}' | diff - ${.CURDIR}/t5.ok
 t6:
-        ssh-keygen -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1
+        ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1
-        ssh-keygen -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2
+        ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2
        chmod 600 $(OBJ)/t6.out1
-        ssh-keygen -yf $(OBJ)/t6.out1 | diff - $(OBJ)/t6.out2
+        ${TEST_SSH_SSHKEYGEN} -yf $(OBJ)/t6.out1 | diff - $(OBJ)/t6.out2
 $(OBJ)/t7.out:
-        ssh-keygen -q -t rsa -N '' -f $@
+        ${TEST_SSH_SSHKEYGEN} -q -t rsa -N '' -f $@
 t7: $(OBJ)/t7.out
-        ssh-keygen -lf $(OBJ)/t7.out > /dev/null
+        ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t7.out > /dev/null
-        ssh-keygen -Bf $(OBJ)/t7.out > /dev/null
+        ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t7.out > /dev/null
+$(OBJ)/t8.out:
+        ${TEST_SSH_SSHKEYGEN} -q -t dsa -N '' -f $@
+t8: $(OBJ)/t8.out
+        ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t8.out > /dev/null
+        ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t8.out > /dev/null
+$(OBJ)/t9.out:
+        test "${TEST_SSH_ECC}" != yes || \
+        ${TEST_SSH_SSHKEYGEN} -q -t ecdsa -N '' -f $@
+t9: $(OBJ)/t9.out
+        test "${TEST_SSH_ECC}" != yes || \
+        ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t9.out > /dev/null
+        test "${TEST_SSH_ECC}" != yes || \
+        ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null
 t-exec: ${LTESTS:=.sh}
        @if [ "x$?" = "x" ]; then exit 0; fi; \
@@ -123,3 +152,5 @@ t-exec-interop:	${INTEROP_TESTS:=.sh}
                (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
        done
+# Not run by default
+interop: ${INTEROP_TARGETS}
diff --git a/regress/agent-getpeereid.sh b/regress/agent-getpeereid.sh
index 5d7f73291..faf654c04 100644
--- a/regress/agent-getpeereid.sh
+++ b/regress/agent-getpeereid.sh
@@ -7,10 +7,9 @@ UNPRIV=nobody
 ASOCK=${OBJ}/agent
 SSH_AUTH_SOCK=/nonexistent
-if grep "#undef.*HAVE_GETPEEREID" ${BUILDDIR}/config.h >/dev/null 2>&1 && \
+if config_defined HAVE_GETPEEREID HAVE_GETPEERUCRED HAVE_SO_PEERCRED ; then
-        grep "#undef.*HAVE_GETPEERUCRED" ${BUILDDIR}/config.h >/dev/null && \
+        :
-        grep "#undef.*HAVE_SO_PEERCRED" ${BUILDDIR}/config.h >/dev/null
+else
-then
        echo "skipped (not supported on this platform)"
        exit 0
 fi
@@ -34,7 +33,7 @@ else
                fail "ssh-add failed with $r != 1"
        fi
-        < /dev/null ${SUDO} -S -u ${UNPRIV} ssh-add -l > /dev/null 2>&1
+        < /dev/null ${SUDO} -S -u ${UNPRIV} ssh-add -l 2>/dev/null
        r=$?
        if [ $r -lt 2 ]; then
                fail "ssh-add did not fail for ${UNPRIV}: $r < 2"
diff --git a/regress/agent-ptrace.sh b/regress/agent-ptrace.sh
index d5892ed03..9f29464c5 100644
--- a/regress/agent-ptrace.sh
+++ b/regress/agent-ptrace.sh
@@ -41,7 +41,7 @@ EOF
        if [ $? -ne 0 ]; then
                fail "gdb failed: exit code $?"
        fi
-        egrep 'ptrace: Operation not permitted.|procfs:.*Permission denied.|ttrace.*Permission denied.|procfs:.*: Invalid argument.' >/dev/null ${OBJ}/gdb.out
+        egrep 'ptrace: Operation not permitted.|procfs:.*Permission denied.|ttrace.*Permission denied.|procfs:.*: Invalid argument.|Unable to access task ' >/dev/null ${OBJ}/gdb.out
        r=$?
        rm -f ${OBJ}/gdb.out
        if [ $r -ne 0 ]; then
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
index 0265e8f6b..3b147b9f7 100644
--- a/regress/cert-hostkey.sh
+++ b/regress/cert-hostkey.sh
@@ -1,8 +1,14 @@
-#       $OpenBSD: cert-hostkey.sh,v 1.4 2010/04/16 01:58:45 djm Exp $
+#       $OpenBSD: cert-hostkey.sh,v 1.5 2010/08/31 12:24:09 djm Exp $
 #       Placed in the Public Domain.
 tid="certified host keys"
+# used to disable ECC based tests on platforms without ECC
+ecdsa=""
+if test "x$TEST_SSH_ECC" = "xyes"; then
+        ecdsa=ecdsa
+fi
 rm -f $OBJ/known_hosts-cert $OBJ/host_ca_key* $OBJ/cert_host_key*
 cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
@@ -18,7 +24,7 @@ ${SSHKEYGEN} -q -N '' -t rsa  -f $OBJ/host_ca_key ||\
 ) > $OBJ/known_hosts-cert
 # Generate and sign host keys
-for ktype in rsa dsa ; do 
+for ktype in rsa dsa $ecdsa ; do 
        verbose "$tid: sign host ${ktype} cert"
        # Generate and sign a host key
        ${SSHKEYGEN} -q -N '' -t ${ktype} \
@@ -28,6 +34,8 @@ for ktype in rsa dsa ; do
            -I "regress host key for $USER" \
            -n $HOSTS $OBJ/cert_host_key_${ktype} ||
                fail "couldn't sign cert_host_key_${ktype}"
+        # v00 ecdsa certs do not exist
+        test "${ktype}" = "ecdsa" && continue
        cp $OBJ/cert_host_key_${ktype} $OBJ/cert_host_key_${ktype}_v00
        cp $OBJ/cert_host_key_${ktype}.pub $OBJ/cert_host_key_${ktype}_v00.pub
        ${SSHKEYGEN} -t v00 -h -q -s $OBJ/host_ca_key \
@@ -38,7 +46,7 @@ done
 # Basic connect tests
 for privsep in yes no ; do
-        for ktype in rsa dsa rsa_v00 dsa_v00; do 
+        for ktype in rsa dsa $ecdsa rsa_v00 dsa_v00; do 
                verbose "$tid: host ${ktype} cert connect privsep $privsep"
                (
                        cat $OBJ/sshd_proxy_bak
@@ -64,6 +72,11 @@ done
        echon '@revoked '
        echon "* "
        cat $OBJ/cert_host_key_rsa.pub
+        if test "x$TEST_SSH_ECC" = "xyes"; then
+                echon '@revoked '
+                echon "* "
+                cat $OBJ/cert_host_key_ecdsa.pub
+        fi
        echon '@revoked '
        echon "* "
        cat $OBJ/cert_host_key_dsa.pub
@@ -75,7 +88,7 @@ done
        cat $OBJ/cert_host_key_dsa_v00.pub
 ) > $OBJ/known_hosts-cert
 for privsep in yes no ; do
-        for ktype in rsa dsa rsa_v00 dsa_v00; do 
+        for ktype in rsa dsa $ecdsa rsa_v00 dsa_v00; do 
                verbose "$tid: host ${ktype} revoked cert privsep $privsep"
                (
                        cat $OBJ/sshd_proxy_bak
@@ -102,7 +115,7 @@ done
        echon "* "
        cat $OBJ/host_ca_key.pub
 ) > $OBJ/known_hosts-cert
-for ktype in rsa dsa rsa_v00 dsa_v00 ; do 
+for ktype in rsa dsa $ecdsa rsa_v00 dsa_v00 ; do 
        verbose "$tid: host ${ktype} revoked cert"
        (
                cat $OBJ/sshd_proxy_bak
@@ -173,7 +186,9 @@ test_one "cert has constraints"	failure "-h -Oforce-command=false"
 # Check downgrade of cert to raw key when no CA found
 for v in v01 v00 ;  do 
-        for ktype in rsa dsa ; do 
+        for ktype in rsa dsa $ecdsa ; do 
+                # v00 ecdsa certs do not exist.
+                test "${v}${ktype}" = "v00ecdsa" && continue
                rm -f $OBJ/known_hosts-cert $OBJ/cert_host_key*
                verbose "$tid: host ${ktype} ${v} cert downgrade to raw key"
                # Generate and sign a host key
@@ -210,7 +225,9 @@ done
        cat $OBJ/host_ca_key.pub
 ) > $OBJ/known_hosts-cert
 for v in v01 v00 ;  do 
-        for kt in rsa dsa ; do 
+        for kt in rsa dsa $ecdsa ; do 
+                # v00 ecdsa certs do not exist.
+                test "${v}${ktype}" = "v00ecdsa" && continue
                rm -f $OBJ/cert_host_key*
                # Self-sign key
                ${SSHKEYGEN} -q -N '' -t ${kt} \
diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
index a41a9a9c0..fcca3708b 100644
--- a/regress/cert-userkey.sh
+++ b/regress/cert-userkey.sh
@@ -1,8 +1,14 @@
-#       $OpenBSD: cert-userkey.sh,v 1.6 2010/06/29 23:59:54 djm Exp $
+#       $OpenBSD: cert-userkey.sh,v 1.7 2010/08/31 12:24:09 djm Exp $
 #       Placed in the Public Domain.
 tid="certified user keys"
+# used to disable ECC based tests on platforms without ECC
+ecdsa=""
+if test "x$TEST_SSH_ECC" = "xyes"; then
+        ecdsa=ecdsa
+fi
 rm -f $OBJ/authorized_keys_$USER $OBJ/user_ca_key* $OBJ/cert_user_key*
 cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
@@ -11,7 +17,7 @@ ${SSHKEYGEN} -q -N '' -t rsa  -f $OBJ/user_ca_key ||\
        fail "ssh-keygen of user_ca_key failed"
 # Generate and sign user keys
-for ktype in rsa dsa ; do 
+for ktype in rsa dsa $ecdsa ; do 
        verbose "$tid: sign user ${ktype} cert"
        ${SSHKEYGEN} -q -N '' -t ${ktype} \
            -f $OBJ/cert_user_key_${ktype} || \
@@ -20,6 +26,8 @@ for ktype in rsa dsa ; do
            "regress user key for $USER" \
            -n ${USER},mekmitasdigoat $OBJ/cert_user_key_${ktype} ||
                fail "couldn't sign cert_user_key_${ktype}"
+        # v00 ecdsa certs do not exist
+        test "{ktype}" = "ecdsa" && continue
        cp $OBJ/cert_user_key_${ktype} $OBJ/cert_user_key_${ktype}_v00
        cp $OBJ/cert_user_key_${ktype}.pub $OBJ/cert_user_key_${ktype}_v00.pub
        ${SSHKEYGEN} -q -t v00 -s $OBJ/user_ca_key -I \
@@ -29,7 +37,7 @@ for ktype in rsa dsa ; do
 done
 # Test explicitly-specified principals
-for ktype in rsa dsa rsa_v00 dsa_v00 ; do 
+for ktype in rsa dsa $ecdsa rsa_v00 dsa_v00 ; do 
        for privsep in yes no ; do
                _prefix="${ktype} privsep $privsep"
@@ -155,7 +163,7 @@ basic_tests() {
                extra_sshd="TrustedUserCAKeys $OBJ/user_ca_key.pub"
        fi
        
-        for ktype in rsa dsa rsa_v00 dsa_v00 ; do 
+        for ktype in rsa dsa $ecdsa rsa_v00 dsa_v00 ; do 
                for privsep in yes no ; do
                        _prefix="${ktype} privsep $privsep $auth"
                        # Simple connect
@@ -230,6 +238,11 @@ test_one() {
        for auth in $auth_choice ; do
                for ktype in rsa rsa_v00 ; do
+                        case $ktype in
+                        *_v00) keyv="-t v00" ;;
+                        *) keyv="" ;;
+                        esac
                        cat $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy
                        if test "x$auth" = "xauthorized_keys" ; then
                                # Add CA to authorized_keys
@@ -249,7 +262,7 @@ test_one() {
                        verbose "$tid: $ident auth $auth expect $result $ktype"
                        ${SSHKEYGEN} -q -s $OBJ/user_ca_key \
                            -I "regress user key for $USER" \
-                            $sign_opts \
+                            $sign_opts $keyv \
                            $OBJ/cert_user_key_${ktype} ||
                                fail "couldn't sign cert_user_key_${ktype}"
@@ -302,7 +315,7 @@ test_one "principals key option no principals" failure "" \
 # Wrong certificate
 cat $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy
-for ktype in rsa dsa rsa_v00 dsa_v00 ; do 
+for ktype in rsa dsa $ecdsa rsa_v00 dsa_v00 ; do 
        case $ktype in
        *_v00) args="-t v00" ;;
        *) args="" ;;
diff --git a/regress/host-expand.sh b/regress/host-expand.sh
new file mode 100644
index 000000000..a0188363d
--- /dev/null
+++ b/regress/host-expand.sh
@@ -0,0 +1,18 @@
+#       Placed in the Public Domain.
+tid="expand %h and %n"
+echo 'PermitLocalCommand yes' >> $OBJ/ssh_proxy
+printf 'LocalCommand printf "%%%%s\\n" "%%n" "%%h"\n' >> $OBJ/ssh_proxy
+cat >$OBJ/expect <<EOE
+somehost
+127.0.0.1
+EOE
+for p in 1 2; do
+        verbose "test $tid: proto $p"
+        ${SSH} -F $OBJ/ssh_proxy -$p somehost true >$OBJ/actual
+        diff $OBJ/expect $OBJ/actual || fail "$tid proto $p"
+done
diff --git a/regress/kextype.sh b/regress/kextype.sh
new file mode 100644
index 000000000..79c0817bb
--- /dev/null
+++ b/regress/kextype.sh
@@ -0,0 +1,30 @@
+#       $OpenBSD: kextype.sh,v 1.1 2010/09/22 12:26:05 djm Exp $
+#       Placed in the Public Domain.
+tid="login with different key exchange algorithms"
+TIME=/usr/bin/time
+cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
+cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
+if test "$TEST_SSH_ECC" = "yes"; then
+        kextypes="ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521"
+fi
+if test "$TEST_SSH_SHA256" = "yes"; then
+        kextypes="$kextypes diffie-hellman-group-exchange-sha256"
+fi
+kextypes="$kextypes diffie-hellman-group-exchange-sha1"
+kextypes="$kextypes diffie-hellman-group14-sha1"
+kextypes="$kextypes diffie-hellman-group1-sha1"
+tries="1 2 3 4"
+for k in $kextypes; do 
+        verbose "kex $k"
+        for i in $tries; do
+                ${SSH} -F $OBJ/ssh_proxy -o KexAlgorithms=$k x true
+                if [ $? -ne 0 ]; then
+                        fail "ssh kex $k"
+                fi
+        done
+done
diff --git a/regress/keytype.sh b/regress/keytype.sh
new file mode 100644
index 000000000..2cbf132bd
--- /dev/null
+++ b/regress/keytype.sh
@@ -0,0 +1,55 @@
+#       $OpenBSD: keytype.sh,v 1.1 2010/09/02 16:12:55 markus Exp $
+#       Placed in the Public Domain.
+tid="login with different key types"
+TIME=`which time` 2>/dev/null
+if test ! -x "$TIME"; then
+        TIME=""
+fi
+cp $OBJ/sshd_proxy $OBJ/sshd_proxy_bak
+cp $OBJ/ssh_proxy $OBJ/ssh_proxy_bak
+ktypes="dsa-1024 rsa-2048 rsa-3072"
+if test "$TEST_SSH_ECC" = "yes"; then
+        ktypes="$ktypes ecdsa-256 ecdsa-384 ecdsa-521"
+fi
+for kt in $ktypes; do 
+        rm -f $OBJ/key.$kt
+        bits=`echo ${kt} | awk -F- '{print $2}'`
+        type=`echo ${kt}  | awk -F- '{print $1}'`
+        printf "keygen $type, $bits bits:\t"
+        ${TIME} ${SSHKEYGEN} -b $bits -q -N '' -t $type  -f $OBJ/key.$kt ||\
+                fail "ssh-keygen for type $type, $bits bits failed"
+done
+tries="1 2 3"
+for ut in $ktypes; do 
+        htypes=$ut
+        #htypes=$ktypes
+        for ht in $htypes; do 
+                trace "ssh connect, userkey $ut, hostkey $ht"
+                (
+                        grep -v HostKey $OBJ/sshd_proxy_bak
+                        echo HostKey $OBJ/key.$ht 
+                ) > $OBJ/sshd_proxy
+                (
+                        grep -v IdentityFile $OBJ/ssh_proxy_bak
+                        echo IdentityFile $OBJ/key.$ut 
+                ) > $OBJ/ssh_proxy
+                (
+                        echon 'localhost-with-alias,127.0.0.1,::1 '
+                        cat $OBJ/key.$ht.pub
+                ) > $OBJ/known_hosts
+                cat $OBJ/key.$ut.pub > $OBJ/authorized_keys_$USER
+                for i in $tries; do
+                        printf "userkey $ut, hostkey ${ht}:\t"
+                        ${TIME} ${SSH} -F $OBJ/ssh_proxy 999.999.999.999 true
+                        if [ $? -ne 0 ]; then
+                                fail "ssh userkey $ut, hostkey $ht failed"
+                        fi
+                done
+        done
+done
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 8a98a6e54..b94cdf02f 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -5,8 +5,7 @@ CTL=/tmp/openssh.regress.ctl-sock.$$
 tid="connection multiplexing"
-if grep "#define.*DISABLE_FD_PASSING" ${BUILDDIR}/config.h >/dev/null 2>&1
+if config_defined DISABLE_FD_PASSING ; then
-then
        echo "skipped (not supported on this platform)"
        exit 0
 fi
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index c4d6ae2de..1c67b6476 100644
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: sftp-cmds.sh,v 1.10 2009/08/13 01:11:55 djm Exp $
+#       $OpenBSD: sftp-cmds.sh,v 1.11 2010/12/04 00:21:19 djm Exp $
 #       Placed in the Public Domain.
 # XXX - TODO: 
@@ -209,7 +209,13 @@ test -d ${COPY}.dd2 || fail "missing newname after rename directory"
 verbose "$tid: ln"
 echo "ln ${COPY}.1 ${COPY}.2" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 || fail "ln failed"
-test -h ${COPY}.2 || fail "missing file after ln"
+test -f ${COPY}.2 || fail "missing file after ln"
+cmp ${COPY}.1 ${COPY}.2 || fail "created file is not equal after ln"
+verbose "$tid: ln -s"
+rm -f ${COPY}.2
+echo "ln -s ${COPY}.1 ${COPY}.2" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 || fail "ln -s failed"
+test -h ${COPY}.2 || fail "missing file after ln -s"
 verbose "$tid: mkdir"
 echo "mkdir ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \
diff --git a/regress/sftp-glob.sh b/regress/sftp-glob.sh
index 72bb17d75..8d4df2c98 100644
--- a/regress/sftp-glob.sh
+++ b/regress/sftp-glob.sh
@@ -3,11 +3,18 @@
 tid="sftp glob"
+config_defined FILESYSTEM_NO_BACKSLASH && nobs="not supported on this platform"
 sftp_ls() {
        target=$1
        errtag=$2
        expected=$3
        unexpected=$4
+        skip=$5
+        if test "x$skip" != "x" ; then
+                verbose "$tid: $errtag (skipped: $skip)"
+                return
+        fi
        verbose "$tid: $errtag"
        printf "ls -l %s" "${target}" | \
                ${SFTP} -b - -D ${SFTPSERVER} 2>/dev/null | \
@@ -44,8 +51,8 @@ SPACE="${DIR}/g-q space"
 rm -rf ${BASE}
 mkdir -p ${DIR}
-touch "${DATA}" "${GLOB1}" "${GLOB2}" "${QUOTE}"
+touch "${DATA}" "${GLOB1}" "${GLOB2}" "${QUOTE}" "${SPACE}"
-touch "${QSLASH}" "${ESLASH}" "${SLASH}" "${SPACE}"
+test "x$nobs" = "x" && touch "${QSLASH}" "${ESLASH}" "${SLASH}"
 #       target                   message                expected     unexpected
 sftp_ls "${DIR}/fil*"            "file glob"            "${DATA}"    ""
@@ -55,14 +62,14 @@ sftp_ls "${DIR}/g-wild\*"        "escaped glob"         "g-wild*"    "g-wildx"
 sftp_ls "${DIR}/g-quote\\\""     "escaped quote"        "g-quote\""  ""
 sftp_ls "\"${DIR}/g-quote\\\"\"" "quoted quote"         "g-quote\""  ""
 sftp_ls "'${DIR}/g-quote\"'"     "single-quoted quote"  "g-quote\""  ""
-sftp_ls "${DIR}/g-sl\\\\ash"     "escaped slash"        "g-sl\\ash"  ""
-sftp_ls "'${DIR}/g-sl\\\\ash'"   "quoted slash"         "g-sl\\ash"  ""
-sftp_ls "${DIR}/g-slash\\\\"     "escaped slash at EOL" "g-slash\\"  ""
-sftp_ls "'${DIR}/g-slash\\\\'"   "quoted slash at EOL"  "g-slash\\"  ""
-sftp_ls "${DIR}/g-qs\\\\\\\""    "escaped slash+quote"  "g-qs\\\""   ""
-sftp_ls "'${DIR}/g-qs\\\\\"'"    "quoted slash+quote"   "g-qs\\\""   ""
 sftp_ls "${DIR}/g-q\\ space"     "escaped space"        "g-q space"  ""
 sftp_ls "'${DIR}/g-q space'"     "quoted space"         "g-q space"  ""
+sftp_ls "${DIR}/g-sl\\\\ash"     "escaped slash"        "g-sl\\ash"  "" "$nobs"
+sftp_ls "'${DIR}/g-sl\\\\ash'"   "quoted slash"         "g-sl\\ash"  "" "$nobs"
+sftp_ls "${DIR}/g-slash\\\\"     "escaped slash at EOL" "g-slash\\"  "" "$nobs"
+sftp_ls "'${DIR}/g-slash\\\\'"   "quoted slash at EOL"  "g-slash\\"  "" "$nobs"
+sftp_ls "${DIR}/g-qs\\\\\\\""    "escaped slash+quote"  "g-qs\\\""   "" "$nobs"
+sftp_ls "'${DIR}/g-qs\\\\\"'"    "quoted slash+quote"   "g-qs\\\""   "" "$nobs"
 rm -rf ${BASE}
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index b64dcdbcf..5c56aefff 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -221,6 +221,17 @@ fatal ()
        exit $RESULT
 }
+# Check whether preprocessor symbols are defined in config.h.
+config_defined ()
+{
+        str=$1
+        while test "x$2" != "x" ; do
+                str="$str|$2"
+                shift
+        done
+        egrep "^#define.*($str)" ${BUILDDIR}/config.h >/dev/null 2>&1
+}
 RESULT=0
 PIDFILE=$OBJ/pidfile