From a5e584274dfa631def56403a0b92bf354067ca5a Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 12 Mar 2008 23:58:05 +1100
Subject:    - dtucker@cvs.openbsd.org 2007/10/29 06:57:13     
 [regress/Makefile regress/localcommand.sh]      Add simple regress test for
 LocalCommand; ok djm@

---
 regress/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'regress/Makefile')

diff --git a/regress/Makefile b/regress/Makefile
index 539956398..196020db8 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.42 2006/07/19 13:34:52 dtucker Exp $
+#	$OpenBSD: Makefile,v 1.43 2007/10/29 06:57:13 dtucker Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:		$(REGRESS_TARGETS)
@@ -42,6 +42,7 @@ LTESTS= 	connect \
 		reexec \
 		brokenkeys \
 		cfgmatch \
+		localcommand \
 		forcecommand
 
 USER!=		id -un
-- 
cgit v1.2.3


From af78493bba42cd4351eded064fb63b81fa2867a9 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 13 Mar 2008 00:17:00 +1100
Subject:    - djm@cvs.openbsd.org 2007/12/21 04:13:53      [regress/Makefile
 regress/test-exec.sh regress/putty-ciphers.sh]      [regress/putty-kex.sh
 regress/putty-transfer.sh regress/ssh2putty.sh]      basic (crypto, kex and
 transfer) interop regression tests against putty      To run these, install
 putty and run "make interop-tests" from the build      directory - the tests
 aren't run by default yet.

---
 ChangeLog                 |  8 +++++++-
 regress/Makefile          | 18 +++++++++++++++---
 regress/putty-ciphers.sh  | 30 ++++++++++++++++++++++++++++++
 regress/putty-kex.sh      | 27 +++++++++++++++++++++++++++
 regress/putty-transfer.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++
 regress/ssh2putty.sh      | 31 +++++++++++++++++++++++++++++++
 regress/test-exec.sh      | 44 +++++++++++++++++++++++++++++++++++++++++---
 7 files changed, 196 insertions(+), 7 deletions(-)
 create mode 100644 regress/putty-ciphers.sh
 create mode 100644 regress/putty-kex.sh
 create mode 100644 regress/putty-transfer.sh
 create mode 100755 regress/ssh2putty.sh

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index e1d1d6e4b..b7148f7da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,12 @@
      unbreak lls command and add a regress test that would have caught the
      breakage; spotted by mouring@
      NB. sftp code change already committed.
+   - djm@cvs.openbsd.org 2007/12/21 04:13:53
+     [regress/Makefile regress/test-exec.sh regress/putty-ciphers.sh]
+     [regress/putty-kex.sh regress/putty-transfer.sh regress/ssh2putty.sh]
+     basic (crypto, kex and transfer) interop regression tests against putty
+     To run these, install putty and run "make interop-tests" from the build
+     directory - the tests aren't run by default yet.
 
 20080311
  - (dtucker) [auth-pam.c monitor.c session.c sshd.c] Bug #926: Move
@@ -3734,4 +3740,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4869 2008/03/12 12:59:43 djm Exp $
+$Id: ChangeLog,v 1.4870 2008/03/12 13:17:00 djm Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 196020db8..7b571f7ec 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,8 +1,11 @@
-#	$OpenBSD: Makefile,v 1.43 2007/10/29 06:57:13 dtucker Exp $
+#	$OpenBSD: Makefile,v 1.44 2007/12/21 04:13:53 djm Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:		$(REGRESS_TARGETS)
 
+# Interop tests are not run by default
+interop: t-exec-interop
+
 clean:
 	for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done
 distclean:	clean
@@ -45,6 +48,9 @@ LTESTS= 	connect \
 		localcommand \
 		forcecommand
 
+INTEROP_TESTS=	putty-transfer putty-ciphers putty-kex
+#INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
+
 USER!=		id -un
 CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
 		authorized_keys_${USER} known_hosts pidfile \
@@ -55,8 +61,6 @@ 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
 
-#LTESTS +=	ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
-
 t1:
 	ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
 
@@ -97,3 +101,11 @@ t-exec:	${LTESTS:=.sh}
 		echo "run test $${TEST}" ... 1>&2; \
 		(env SUDO=${SUDO} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
 	done
+
+t-exec-interop:	${INTEROP_TESTS:=.sh}
+	@if [ "x$?" = "x" ]; then exit 0; fi; \
+	for TEST in ""$?; do \
+		echo "run test $${TEST}" ... 1>&2; \
+		(env SUDO=${SUDO} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+	done
+
diff --git a/regress/putty-ciphers.sh b/regress/putty-ciphers.sh
new file mode 100644
index 000000000..e9196d621
--- /dev/null
+++ b/regress/putty-ciphers.sh
@@ -0,0 +1,30 @@
+#	$OpenBSD: putty-ciphers.sh,v 1.1 2007/12/21 04:13:53 djm Exp $
+#	Placed in the Public Domain.
+
+tid="putty ciphers"
+
+DATA=/bin/ls
+COPY=${OBJ}/copy
+
+set -e
+
+if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
+	fatal "putty interop tests not enabled"
+fi
+
+for c in aes blowfish 3des arcfour ; do
+	verbose "$tid: cipher $c"
+	cp ${OBJ}/.putty/sessions/localhost_proxy \
+	    ${OBJ}/.putty/sessions/cipher_$c
+	echo "Cipher=$c" >> ${OBJ}/.putty/sessions/cipher_$c
+
+	rm -f ${COPY}
+	env HOME=$PWD ${PLINK} -load cipher_$c -batch -i putty.rsa2 \
+	    127.0.0.1 cat ${DATA} > ${COPY}
+	if [ $? -ne 0 ]; then
+		fail "ssh cat $DATA failed"
+	fi
+	cmp ${DATA} ${COPY}		|| fail "corrupted copy"
+done
+rm -f ${COPY}
+
diff --git a/regress/putty-kex.sh b/regress/putty-kex.sh
new file mode 100644
index 000000000..d0437c6d5
--- /dev/null
+++ b/regress/putty-kex.sh
@@ -0,0 +1,27 @@
+#	$OpenBSD: putty-kex.sh,v 1.1 2007/12/21 04:13:53 djm Exp $
+#	Placed in the Public Domain.
+
+tid="putty KEX"
+
+DATA=/bin/ls
+COPY=${OBJ}/copy
+
+set -e
+
+if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
+	fatal "putty interop tests not enabled"
+fi
+
+for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ; do
+	verbose "$tid: kex $k"
+	cp ${OBJ}/.putty/sessions/localhost_proxy \
+	    ${OBJ}/.putty/sessions/kex_$k
+	echo "KEX=$k" >> ${OBJ}/.putty/sessions/kex_$k
+
+	env HOME=$PWD ${PLINK} -load kex_$k -batch -i putty.rsa2 \
+	    127.0.0.1 true
+	if [ $? -ne 0 ]; then
+		fail "KEX $k failed"
+	fi
+done
+
diff --git a/regress/putty-transfer.sh b/regress/putty-transfer.sh
new file mode 100644
index 000000000..0a4f34ee6
--- /dev/null
+++ b/regress/putty-transfer.sh
@@ -0,0 +1,45 @@
+#	$OpenBSD: putty-transfer.sh,v 1.1 2007/12/21 04:13:53 djm Exp $
+#	Placed in the Public Domain.
+
+tid="putty transfer data"
+
+DATA=/bin/ls
+COPY=${OBJ}/copy
+
+set -e
+
+if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
+	fatal "putty interop tests not enabled"
+fi
+
+# XXX support protocol 1 too
+for p in 2; do
+	for c in 0 1 ; do 
+	verbose "$tid: proto $p compression $c"
+		rm -f ${COPY}
+		cp ${OBJ}/.putty/sessions/localhost_proxy \
+		    ${OBJ}/.putty/sessions/compression_$c
+		echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k
+		env HOME=$PWD ${PLINK} -load compression_$c -batch \
+		    -i putty.rsa$p 127.0.0.1 cat ${DATA} > ${COPY}
+		if [ $? -ne 0 ]; then
+			fail "ssh cat $DATA failed"
+		fi
+		cmp ${DATA} ${COPY}		|| fail "corrupted copy"
+	
+		for s in 10 100 1k 32k 64k 128k 256k; do
+			trace "proto $p compression $c dd-size ${s}"
+			rm -f ${COPY}
+			dd if=$DATA obs=${s} 2> /dev/null | \
+				env HOME=$PWD ${PLINK} -load compression_$c \
+				    -batch -i putty.rsa$p 127.0.0.1 \
+				    "cat > ${COPY}"
+			if [ $? -ne 0 ]; then
+				fail "ssh cat $DATA failed"
+			fi
+			cmp $DATA ${COPY}	|| fail "corrupted copy"
+		done
+	done
+done
+rm -f ${COPY}
+
diff --git a/regress/ssh2putty.sh b/regress/ssh2putty.sh
new file mode 100755
index 000000000..82dd44787
--- /dev/null
+++ b/regress/ssh2putty.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+if test "x$1" = "x" -o "x$2" = "x" -o "x$3" = "x" ; then
+	echo "Usage: ssh2putty hostname port ssh-private-key"
+	exit 1
+fi
+
+HOST=$1
+PORT=$2
+KEYFILE=$3
+
+# XXX - support DSA keys too
+if ! grep -q "BEGIN RSA PRIVATE KEY" $KEYFILE ; then
+	echo "Unsupported private key format"
+	exit 1
+fi
+
+public_exponent=`
+	openssl rsa -noout -text -in $KEYFILE | grep ^publicExponent | 
+	sed 's/.*(//;s/).*//'
+`
+test $? -ne 0 && exit 1
+
+modulus=`
+	openssl rsa -noout -modulus -in $KEYFILE | grep ^Modulus= | 
+	sed 's/^Modulus=/0x/' | tr A-Z a-z
+`
+test $? -ne 0 && exit 1
+
+echo "rsa2@$PORT:$HOST $public_exponent,$modulus"
+
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index e44778065..1eb9ff729 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.30 2007/10/26 05:30:01 djm Exp $
+#	$OpenBSD: test-exec.sh,v 1.31 2007/12/21 04:13:53 djm Exp $
 #	Placed in the Public Domain.
 
 #SUDO=sudo
@@ -69,6 +69,10 @@ SFTP=sftp
 SFTPSERVER=/usr/libexec/openssh/sftp-server
 SCP=scp
 
+# Interop testing
+PLINK=/usr/local/bin/plink
+PUTTYGEN=/usr/local/bin/puttygen
+
 if [ "x$TEST_SSH_SSH" != "x" ]; then
 	SSH="${TEST_SSH_SSH}"
 fi
@@ -96,6 +100,12 @@ fi
 if [ "x$TEST_SSH_SCP" != "x" ]; then
 	SCP="${TEST_SSH_SCP}"
 fi
+if [ "x$TEST_SSH_PLINK" != "x" ]; then
+	PLINK="${TEST_SSH_PLINK}"
+fi
+if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then
+	PUTTYGEN="${TEST_SSH_PUTTYGEN}"
+fi
 
 # Path to sshd must be absolute for rexec
 case "$SSHD" in
@@ -269,6 +279,34 @@ for t in rsa rsa1; do
 done
 chmod 644 $OBJ/authorized_keys_$USER
 
+# If PuTTY is present, prepare keys and configuration
+REGRESS_INTEROP_PUTTY=no
+if test -x $PUTTYGEN -a -x $PLINK ; 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 +319,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;
-- 
cgit v1.2.3


From 664299613492f3c1227cba631c3dc0d75965d622 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 13 Mar 2008 12:05:40 +1100
Subject:  - (djm) [Makefile.in regress/Makefile] Fix interop-tests target
 (note to    self: make changes to Makefile.in next time, not the generated
 Makefile).

---
 ChangeLog        | 8 ++++++--
 Makefile.in      | 4 ++--
 regress/Makefile | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index b7148f7da..8a23cac87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-20080311
+20080313
+ - (djm) [Makefile.in regress/Makefile] Fix interop-tests target (note to
+   self: make changes to Makefile.in next time, not the generated Makefile).
+
+20080312
  - (djm) OpenBSD CVS Sync
    - dtucker@cvs.openbsd.org 2007/10/29 06:57:13
      [regress/Makefile regress/localcommand.sh]
@@ -3740,4 +3744,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4870 2008/03/12 13:17:00 djm Exp $
+$Id: ChangeLog,v 1.4871 2008/03/13 01:05:40 djm Exp $
diff --git a/Makefile.in b/Makefile.in
index 8049f1423..3dc71feee 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.287 2008/02/10 11:44:20 djm Exp $
+# $Id: Makefile.in,v 1.288 2008/03/13 01:05:40 djm Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -378,7 +378,7 @@ uninstall:
 	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
 	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
 
-tests:	$(TARGETS)
+tests interop-tests:	$(TARGETS)
 	BUILDDIR=`pwd`; \
 	[ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress; \
 	[ -f `pwd`/regress/Makefile ]  || \
diff --git a/regress/Makefile b/regress/Makefile
index 7b571f7ec..8224c11c2 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -4,7 +4,7 @@ REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:		$(REGRESS_TARGETS)
 
 # Interop tests are not run by default
-interop: t-exec-interop
+interop interop-tests: t-exec-interop
 
 clean:
 	for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done
-- 
cgit v1.2.3


From 9c8a427453a0a354d7251600872f9c9c0a924a9e Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 27 Mar 2008 17:42:06 +1100
Subject:  - (djm) [regress/Makefile] cleanup PuTTY interop test droppings

---
 ChangeLog        | 3 ++-
 regress/Makefile | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index 4c2df0181..3b5e6f179 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@
      by dkrause@
  - (djm) [configure.ac] fix alignment of --without-stackprotect description
  - (djm) [configure.ac] --with-selinux too
+ - (djm) [regress/Makefile] cleanup PuTTY interop test droppings
 
 20080315
  - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
@@ -3820,4 +3821,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4893 2008/03/27 01:33:07 djm Exp $
+$Id: ChangeLog,v 1.4894 2008/03/27 06:42:06 djm Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 8224c11c2..b229fca48 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -8,6 +8,8 @@ interop interop-tests: t-exec-interop
 
 clean:
 	for F in $(CLEANFILES); do rm -f $(OBJ)$$F; done
+	rm -rf $(OBJ).putty
+
 distclean:	clean
 
 LTESTS= 	connect \
@@ -59,7 +61,8 @@ CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
 		rsa-agent rsa-agent.pub rsa1-agent rsa1-agent.pub \
 		ls.copy banner.in banner.out empty.in \
 		scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \
-		sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv
+		sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \
+		putty.rsa2
 
 t1:
 	ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
-- 
cgit v1.2.3


From 10f9242b86bc570638b5c0e985e4f4b98c1dd073 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 10 Jun 2008 23:16:46 +1000
Subject:    - dtucker@cvs.openbsd.org 2008/06/10 05:23:32      [addrmatch.sh
 Makefile]      Regress test for Match CIDR rules.  ok djm@

---
 ChangeLog            |  5 ++++-
 regress/Makefile     |  1 +
 regress/addrmatch.sh | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 regress/addrmatch.sh

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index 1bccb8904..cb589bc6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,9 @@
    - dtucker@cvs.openbsd.org 2008/06/09 18:06:32
      [regress/test-exec.sh]
      Don't generate putty keys if we're not going to use them.  ok djm
+   - dtucker@cvs.openbsd.org 2008/06/10 05:23:32
+     [regress/addrmatch.sh regress/Makefile]
+     Regress test for Match CIDR rules.  ok djm@
 
 20080609
  - (dtucker) OpenBSD CVS Sync
@@ -4115,4 +4118,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4954 2008/06/10 13:15:54 dtucker Exp $
+$Id: ChangeLog,v 1.4955 2008/06/10 13:16:46 dtucker Exp $
diff --git a/regress/Makefile b/regress/Makefile
index b229fca48..bae34de4a 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -47,6 +47,7 @@ LTESTS= 	connect \
 		reexec \
 		brokenkeys \
 		cfgmatch \
+		addrmatch \
 		localcommand \
 		forcecommand
 
diff --git a/regress/addrmatch.sh b/regress/addrmatch.sh
new file mode 100644
index 000000000..f89e9f053
--- /dev/null
+++ b/regress/addrmatch.sh
@@ -0,0 +1,41 @@
+#	$OpenBSD: addrmatch.sh,v 1.0 2008/06/10 05:23:32 dtucker Exp $
+#	Placed in the Public Domain.
+
+tid="address match"
+
+mv $OBJ/sshd_proxy $OBJ/sshd_proxy_orig
+
+run_trial()
+{
+	user="$1"; addr="$2"; host="$3"; expected="$4"; descr="$5"
+
+	verbose "test $descr for $user $addr $host"
+	result=`${SSHD} -f $OBJ/sshd_proxy -T \
+	    -C user=${user},addr=${addr},host=${host} | \
+	    awk '/passwordauthentication/ {print $2}'`
+	if [ "$result" != "$expected" ]; then
+		fail "failed for $user $addr $host: expected $expected, got $result"
+	fi
+}
+
+cp $OBJ/sshd_proxy_orig $OBJ/sshd_proxy
+cat >>$OBJ/sshd_proxy <<EOD
+PasswordAuthentication no
+Match Address 192.168.0.0/16,!192.168.30.0/24,10.0.0.0/8,host.example.com
+	PasswordAuthentication yes
+Match Address 1.1.1.1,::1,!::3,2000::/16
+	PasswordAuthentication yes
+EOD
+
+run_trial user 192.168.0.1 somehost yes		"permit, first entry"
+run_trial user 192.168.30.1 somehost no		"deny, negative match"
+run_trial user 19.0.0.1 somehost no		"deny, no match"
+run_trial user 10.255.255.254 somehost yes	"permit, list middle"
+run_trial user 192.168.30.1 192.168.0.1 no	"deny, faked IP in hostname"
+run_trial user 1.1.1.1 somehost.example.com yes	"permit, bare IP4 address"
+run_trial user ::1 somehost.example.com	 yes	"permit, bare IP6 address"
+run_trial user ::2 somehost.exaple.com no	"deny IPv6"
+run_trial user ::3 somehost no			"deny IP6 negated"
+run_trial user ::4 somehost no			"deny, IP6 no match"
+run_trial user 2000::1 somehost yes		"permit, IP6 network"
+run_trial user 2001::1 somehost no		"deny, IP6 network"
-- 
cgit v1.2.3


From 75a55bf0c74c13ef596f31f54be421f17cb25e36 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 11 Jun 2008 01:33:21 +1000
Subject: fix version tag

---
 regress/Makefile     | 2 +-
 regress/addrmatch.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'regress/Makefile')

diff --git a/regress/Makefile b/regress/Makefile
index bae34de4a..aa4e6525d 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.44 2007/12/21 04:13:53 djm Exp $
+#	$OpenBSD: Makefile,v 1.45 2008/06/10 05:23:32 dtucker Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:		$(REGRESS_TARGETS)
diff --git a/regress/addrmatch.sh b/regress/addrmatch.sh
index f89e9f053..a05df1539 100644
--- a/regress/addrmatch.sh
+++ b/regress/addrmatch.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: addrmatch.sh,v 1.0 2008/06/10 05:23:32 dtucker Exp $
+#	$OpenBSD: addrmatch.sh,v 1.1 2008/06/10 05:23:32 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="address match"
-- 
cgit v1.2.3


From 2e80cf2b63ada08b7ff7d6a80fca254c231559aa Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 30 Jun 2008 08:06:25 +1000
Subject:    - dtucker@cvs.openbsd.org 2008/06/10 23:13:43     
 [regress/Makefile regress/key-options.sh]      Add regress test for key
 options.  ok djm@

---
 ChangeLog        | 8 +++++++-
 regress/Makefile | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index 605e982b4..5fc9c204a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20080630
+ - (djm) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2008/06/10 23:13:43
+     [regress/Makefile regress/key-options.sh]
+     Add regress test for key options.  ok djm@
+
 20080629
  - (djm) OpenBSD CVS Sync
    - martynas@cvs.openbsd.org 2008/06/21 07:46:46
@@ -4465,4 +4471,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5034 2008/06/29 14:07:00 djm Exp $
+$Id: ChangeLog,v 1.5035 2008/06/29 22:06:25 djm Exp $
diff --git a/regress/Makefile b/regress/Makefile
index aa4e6525d..492f84d7c 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.45 2008/06/10 05:23:32 dtucker Exp $
+#	$OpenBSD: Makefile,v 1.46 2008/06/10 23:13:43 dtucker Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:		$(REGRESS_TARGETS)
@@ -34,6 +34,7 @@ LTESTS= 	connect \
 		agent-ptrace \
 		keyscan \
 		keygen-change \
+		key-options \
 		scp \
 		sftp \
 		sftp-cmds \
@@ -49,6 +50,7 @@ LTESTS= 	connect \
 		cfgmatch \
 		addrmatch \
 		localcommand \
+		cipher-speed \
 		forcecommand
 
 INTEROP_TESTS=	putty-transfer putty-ciphers putty-kex
-- 
cgit v1.2.3


From d9bfce83b73409f1e37cb051aaa28c307e0e28e1 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 30 Jun 2008 08:06:51 +1000
Subject:    - dtucker@cvs.openbsd.org 2008/06/11 23:11:40      [Makefile]     
 Don't run cipher-speed test by default; mistakenly enabled by me

---
 ChangeLog        | 5 ++++-
 regress/Makefile | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index 5fc9c204a..3e2a3fd99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - dtucker@cvs.openbsd.org 2008/06/10 23:13:43
      [regress/Makefile regress/key-options.sh]
      Add regress test for key options.  ok djm@
+   - dtucker@cvs.openbsd.org 2008/06/11 23:11:40
+     [Makefile]
+     Don't run cipher-speed test by default; mistakenly enabled by me
 
 20080629
  - (djm) OpenBSD CVS Sync
@@ -4471,4 +4474,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5035 2008/06/29 22:06:25 djm Exp $
+$Id: ChangeLog,v 1.5036 2008/06/29 22:06:51 djm Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 492f84d7c..6ec310fb7 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.46 2008/06/10 23:13:43 dtucker Exp $
+#	$OpenBSD: Makefile,v 1.47 2008/06/11 23:11:40 dtucker Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:		$(REGRESS_TARGETS)
@@ -50,7 +50,6 @@ LTESTS= 	connect \
 		cfgmatch \
 		addrmatch \
 		localcommand \
-		cipher-speed \
 		forcecommand
 
 INTEROP_TESTS=	putty-transfer putty-ciphers putty-kex
-- 
cgit v1.2.3


From 4268a136d4da035a3d53dd6bc52ff1221240d9d8 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 30 Jun 2008 08:07:56 +1000
Subject:    - djm@cvs.openbsd.org 2008/06/28 13:57:25      [regress/Makefile
 regress/test-exec.sh regress/conch-ciphers.sh]      very basic regress test
 against Twisted Conch in "make interop"      target (conch is available in
 ports/devel/py-twisted/conch);      ok markus@

---
 ChangeLog                |  9 +++++++--
 regress/Makefile         |  4 ++--
 regress/conch-ciphers.sh | 30 ++++++++++++++++++++++++++++++
 regress/test-exec.sh     | 12 +++++++++++-
 4 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 regress/conch-ciphers.sh

(limited to 'regress/Makefile')

diff --git a/ChangeLog b/ChangeLog
index 3e2a3fd99..9d9a60541 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,8 +4,13 @@
      [regress/Makefile regress/key-options.sh]
      Add regress test for key options.  ok djm@
    - dtucker@cvs.openbsd.org 2008/06/11 23:11:40
-     [Makefile]
+     [regress/Makefile]
      Don't run cipher-speed test by default; mistakenly enabled by me
+   - djm@cvs.openbsd.org 2008/06/28 13:57:25
+     [regress/Makefile regress/test-exec.sh regress/conch-ciphers.sh]
+     very basic regress test against Twisted Conch in "make interop"
+     target (conch is available in ports/devel/py-twisted/conch);
+     ok markus@
 
 20080629
  - (djm) OpenBSD CVS Sync
@@ -4474,4 +4479,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5036 2008/06/29 22:06:51 djm Exp $
+$Id: ChangeLog,v 1.5037 2008/06/29 22:07:56 djm Exp $
diff --git a/regress/Makefile b/regress/Makefile
index 6ec310fb7..3b8ea245b 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.47 2008/06/11 23:11:40 dtucker Exp $
+#	$OpenBSD: Makefile,v 1.48 2008/06/28 13:57:25 djm Exp $
 
 REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:		$(REGRESS_TARGETS)
@@ -52,7 +52,7 @@ LTESTS= 	connect \
 		localcommand \
 		forcecommand
 
-INTEROP_TESTS=	putty-transfer putty-ciphers putty-kex
+INTEROP_TESTS=	putty-transfer putty-ciphers putty-kex conch-ciphers
 #INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
 
 USER!=		id -un
diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh
new file mode 100644
index 000000000..c371d3030
--- /dev/null
+++ b/regress/conch-ciphers.sh
@@ -0,0 +1,30 @@
+#	$OpenBSD: conch-ciphers.sh,v 1.1 2008/06/28 13:57:25 djm Exp $
+#	Placed in the Public Domain.
+
+tid="conch ciphers"
+
+DATA=/bin/ls
+COPY=${OBJ}/copy
+
+set -e
+
+if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then
+	fatal "conch interop tests not enabled"
+fi
+
+start_sshd
+
+for c in aes256-ctr aes256-cbc aes192-ctr aes192-cbc aes128-ctr aes128-cbc \
+         cast128-cbc blowfish 3des-cbc ; do
+	verbose "$tid: cipher $c"
+	rm -f ${COPY}
+	${CONCH} --identity $OBJ/rsa --port $PORT --user $USER \
+	         --known-hosts $OBJ/known_hosts \
+	         127.0.0.1 cat ${DATA} > ${COPY} 2>/dev/null
+	if [ $? -ne 0 ]; then
+		fail "ssh cat $DATA failed"
+	fi
+	cmp ${DATA} ${COPY}		|| fail "corrupted copy"
+done
+rm -f ${COPY}
+
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 72fc99951..652bd49d3 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.34 2008/06/10 15:28:49 dtucker Exp $
+#	$OpenBSD: test-exec.sh,v 1.35 2008/06/28 13:57:25 djm Exp $
 #	Placed in the Public Domain.
 
 #SUDO=sudo
@@ -72,6 +72,7 @@ SCP=scp
 # Interop testing
 PLINK=/usr/local/bin/plink
 PUTTYGEN=/usr/local/bin/puttygen
+CONCH=/usr/local/bin/conch
 
 if [ "x$TEST_SSH_SSH" != "x" ]; then
 	SSH="${TEST_SSH_SSH}"
@@ -114,6 +115,9 @@ if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then
 	*) PUTTYGEN=`which ${TEST_SSH_PUTTYGEN} 2>/dev/null` ;;
 	esac
 fi
+if [ "x$TEST_SSH_CONCH" != "x" ]; then
+	CONCH="${TEST_SSH_CONCH}"
+fi
 
 # Path to sshd must be absolute for rexec
 case "$SSHD" in
@@ -287,6 +291,12 @@ 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
-- 
cgit v1.2.3