Merge 3.8.1p1 to the trunk, minus RFC.nroff (#211640).

11 files changed, 81 insertions, 18 deletions

diff --git a/regress/Makefile b/regress/Makefile
index 76e28d36d..cf65b3630 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.26 2003/10/11 11:49:49 dtucker Exp $
+#       $OpenBSD: Makefile,v 1.27 2004/02/17 08:23:20 dtucker Exp $
 
 REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:          $(REGRESS_TARGETS)
@@ -21,6 +21,7 @@ LTESTS= 	connect \
                 broken-pipe \
                 try-ciphers \
                 yes-head \
+                login-timeout \
                 agent \
                 agent-getpeereid \
                 agent-timeout \
diff --git a/regress/README.regress b/regress/README.regress
index b479c6c07..6ff032b68 100644
--- a/regress/README.regress
+++ b/regress/README.regress
@@ -90,5 +90,8 @@ Known Issues.
   fail (because it's not a tcp socket) and will be identified as
   "unknown", which is then checked against tcpwrappers.
 
+- If your build requires ssh-rand-helper regress tests will fail
+  unless ssh-rand-helper is in pre-installed (the path to
+  ssh-rand-helper is hard coded).
 
-$Id: README.regress,v 1.3 2004/01/28 01:26:14 dtucker Exp $
+$Id: README.regress,v 1.4 2004/03/08 20:12:18 tim Exp $
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index 2b0b825d0..3a6e5c1ef 100644
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: dynamic-forward.sh,v 1.2 2003/07/03 08:21:46 markus Exp $
+#       $OpenBSD: dynamic-forward.sh,v 1.3 2004/02/28 12:16:57 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="dynamic forwarding"
@@ -7,7 +7,7 @@ PORT=4242
 FWDPORT=4243
 DATA=/bin/ls${EXEEXT}
 
-if have_prog nc && nc -h 2>&1 | grep "x proxy address" >/dev/null; then
+if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then
         proxycmd="nc -x 127.0.0.1:$FWDPORT -X"
 elif have_prog connect; then
         proxycmd="connect -S 127.0.0.1:$FWDPORT -"
diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh
new file mode 100644
index 000000000..dfc6e6b44
--- /dev/null
+++ b/regress/login-timeout.sh
@@ -0,0 +1,29 @@
+#       $OpenBSD: login-timeout.sh,v 1.1 2004/02/17 08:23:20 dtucker Exp $
+#       Placed in the Public Domain.
+
+tid="connect after login grace timeout"
+
+trace "test login grace with privsep"
+echo "LoginGraceTime 10s" >> $OBJ/sshd_config
+echo "MaxStartups 1" >> $OBJ/sshd_config
+start_sshd
+
+(echo SSH-2.0-fake; sleep 60) | telnet localhost ${PORT} >/dev/null 2>&1 & 
+sleep 15
+${SSH} -F $OBJ/ssh_config somehost true
+if [ $? -ne 0 ]; then
+        fail "ssh connect after login grace timeout failed with privsep"
+fi
+
+kill `cat $PIDFILE`
+
+trace "test login grace without privsep"
+echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config
+start_sshd
+
+(echo SSH-2.0-fake; sleep 60) | telnet localhost ${PORT} >/dev/null 2>&1 & 
+sleep 15
+${SSH} -F $OBJ/ssh_config somehost true
+if [ $? -ne 0 ]; then
+        fail "ssh connect after login grace timeout failed without privsep"
+fi
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index 3669b19ff..31b21d1f2 100644
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -85,6 +85,7 @@ echo "get \"$DATA\" $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
         || fail "get failed"
 cmp $DATA ${COPY} || fail "corrupted copy after get"
 
+if [ "$os" != "cygwin" ]; then
 rm -f ${QUOTECOPY}
 cp $DATA ${QUOTECOPY}
 verbose "$tid: get filename with quotes"
@@ -92,6 +93,7 @@ echo "get \"$QUOTECOPY_ARG\" ${COPY}" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1
         || fail "put failed"
 cmp ${COPY} ${QUOTECOPY} || fail "corrupted copy after get with quotes"
 rm -f ${QUOTECOPY} ${COPY}
+fi
 
 rm -f ${COPY}.dd/*
 verbose "$tid: get to directory"
diff --git a/regress/ssh-com-client.sh b/regress/ssh-com-client.sh
index fc953228e..324a0a723 100644
--- a/regress/ssh-com-client.sh
+++ b/regress/ssh-com-client.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: ssh-com-client.sh,v 1.5 2003/05/14 22:08:27 markus Exp $
+#       $OpenBSD: ssh-com-client.sh,v 1.6 2004/02/24 17:06:52 markus Exp $
 #       Placed in the Public Domain.
 
 tid="connect with ssh.com client"
@@ -19,6 +19,9 @@ VERSIONS="
         3.2.0
         3.2.2
         3.2.3
+        3.2.5
+        3.2.9
+        3.2.9.1
         3.3.0"
 
 # 2.0.10 2.0.12 2.0.13 don't like the test setup
diff --git a/regress/ssh-com-keygen.sh b/regress/ssh-com-keygen.sh
index dbe9b0a6b..29b02d946 100644
--- a/regress/ssh-com-keygen.sh
+++ b/regress/ssh-com-keygen.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: ssh-com-keygen.sh,v 1.3 2003/05/14 22:08:27 markus Exp $
+#       $OpenBSD: ssh-com-keygen.sh,v 1.4 2004/02/24 17:06:52 markus Exp $
 #       Placed in the Public Domain.
 
 tid="ssh.com key import"
@@ -22,6 +22,9 @@ VERSIONS="
         3.2.0
         3.2.2
         3.2.3
+        3.2.5
+        3.2.9
+        3.2.9.1
         3.3.0"
 
 COMPRV=${OBJ}/comkey
diff --git a/regress/ssh-com-sftp.sh b/regress/ssh-com-sftp.sh
index 6ca7dad51..936b4cca7 100644
--- a/regress/ssh-com-sftp.sh
+++ b/regress/ssh-com-sftp.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: ssh-com-sftp.sh,v 1.4 2003/05/14 22:08:27 markus Exp $
+#       $OpenBSD: ssh-com-sftp.sh,v 1.5 2004/02/24 17:06:52 markus Exp $
 #       Placed in the Public Domain.
 
 tid="basic sftp put/get with ssh.com server"
@@ -35,6 +35,9 @@ VERSIONS="
         3.2.0
         3.2.2
         3.2.3
+        3.2.5
+        3.2.9
+        3.2.9.1
         3.3.0"
 
 # go for it
diff --git a/regress/ssh-com.sh b/regress/ssh-com.sh
index c3715a242..7bcd85b65 100644
--- a/regress/ssh-com.sh
+++ b/regress/ssh-com.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: ssh-com.sh,v 1.6 2003/11/07 10:16:44 jmc Exp $
+#       $OpenBSD: ssh-com.sh,v 1.7 2004/02/24 17:06:52 markus Exp $
 #       Placed in the Public Domain.
 
 tid="connect to ssh.com server"
@@ -20,6 +20,9 @@ VERSIONS="
         3.2.0
         3.2.2
         3.2.3
+        3.2.5
+        3.2.9
+        3.2.9.1
         3.3.0"
 # 2.0.10 does not support UserConfigDirectory
 # 2.3.1 requires a config in $HOME/.ssh2
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 98851dc97..986d99287 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.14 2002/04/15 15:19:48 markus Exp $
+#       $OpenBSD: test-exec.sh,v 1.15 2004/02/24 16:56:30 markus Exp $
 #       Placed in the Public Domain.
 
 PORT=4242
@@ -49,28 +49,28 @@ SFTP=sftp
 SFTPSERVER=/usr/libexec/openssh/sftp-server
 
 if [ "x$TEST_SSH_SSH" != "x" ]; then
-        SSH=${TEST_SSH_SSH}
+        SSH="${TEST_SSH_SSH}"
 fi
 if [ "x$TEST_SSH_SSHD" != "x" ]; then
-        SSHD=${TEST_SSH_SSHD}
+        SSHD="${TEST_SSH_SSHD}"
 fi
 if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then
-        SSHAGENT=${TEST_SSH_SSHAGENT}
+        SSHAGENT="${TEST_SSH_SSHAGENT}"
 fi
 if [ "x$TEST_SSH_SSHADD" != "x" ]; then
-        SSHADD=${TEST_SSH_SSHADD}
+        SSHADD="${TEST_SSH_SSHADD}"
 fi
 if [ "x$TEST_SSH_SSHKEYGEN" != "x" ]; then
-        SSHKEYGEN=${TEST_SSH_SSHKEYGEN}
+        SSHKEYGEN="${TEST_SSH_SSHKEYGEN}"
 fi
 if [ "x$TEST_SSH_SSHKEYSCAN" != "x" ]; then
-        SSHKEYSCAN=${TEST_SSH_SSHKEYSCAN}
+        SSHKEYSCAN="${TEST_SSH_SSHKEYSCAN}"
 fi
 if [ "x$TEST_SSH_SFTP" != "x" ]; then
-        SFTP=${TEST_SSH_SFTP}
+        SFTP="${TEST_SSH_SFTP}"
 fi
 if [ "x$TEST_SSH_SFTPSERVER" != "x" ]; then
-        SFTPSERVER=${TEST_SSH_SFTPSERVER}
+        SFTPSERVER="${TEST_SSH_SFTPSERVER}"
 fi
 
 # these should be used in tests
diff --git a/regress/try-ciphers.sh b/regress/try-ciphers.sh
index 2c727f66c..15827e250 100644
--- a/regress/try-ciphers.sh
+++ b/regress/try-ciphers.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: try-ciphers.sh,v 1.8 2003/06/12 15:40:01 markus Exp $
+#       $OpenBSD: try-ciphers.sh,v 1.9 2004/02/28 13:44:45 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="try ciphers"
@@ -28,3 +28,19 @@ for c in $ciphers; do
                 fail "ssh -1 failed with cipher $c"
         fi
 done
+
+if ! ${SSH} -oCiphers=acss@openssh.org 2>&1 | grep "Bad SSH2 cipher" >/dev/null
+then
+
+echo "Ciphers acss@openssh.org" >> $OBJ/sshd_proxy
+c=acss@openssh.org
+for m in $macs; do
+        trace "proto 2 $c mac $m"
+        verbose "test $tid: proto 2 cipher $c mac $m"
+        ${SSH} -F $OBJ/ssh_proxy -2 -m $m -c $c somehost true
+        if [ $? -ne 0 ]; then
+                fail "ssh -2 failed with mac $m cipher $c"
+        fi
+done
+
+fi