diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | regress/Makefile | 4 | ||||
-rw-r--r-- | regress/conch-ciphers.sh | 30 | ||||
-rw-r--r-- | regress/test-exec.sh | 12 |
4 files changed, 50 insertions, 5 deletions
@@ -4,8 +4,13 @@ | |||
4 | [regress/Makefile regress/key-options.sh] | 4 | [regress/Makefile regress/key-options.sh] |
5 | Add regress test for key options. ok djm@ | 5 | Add regress test for key options. ok djm@ |
6 | - dtucker@cvs.openbsd.org 2008/06/11 23:11:40 | 6 | - dtucker@cvs.openbsd.org 2008/06/11 23:11:40 |
7 | [Makefile] | 7 | [regress/Makefile] |
8 | Don't run cipher-speed test by default; mistakenly enabled by me | 8 | Don't run cipher-speed test by default; mistakenly enabled by me |
9 | - djm@cvs.openbsd.org 2008/06/28 13:57:25 | ||
10 | [regress/Makefile regress/test-exec.sh regress/conch-ciphers.sh] | ||
11 | very basic regress test against Twisted Conch in "make interop" | ||
12 | target (conch is available in ports/devel/py-twisted/conch); | ||
13 | ok markus@ | ||
9 | 14 | ||
10 | 20080629 | 15 | 20080629 |
11 | - (djm) OpenBSD CVS Sync | 16 | - (djm) OpenBSD CVS Sync |
@@ -4474,4 +4479,4 @@ | |||
4474 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4479 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4475 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4480 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4476 | 4481 | ||
4477 | $Id: ChangeLog,v 1.5036 2008/06/29 22:06:51 djm Exp $ | 4482 | $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 @@ | |||
1 | # $OpenBSD: Makefile,v 1.47 2008/06/11 23:11:40 dtucker Exp $ | 1 | # $OpenBSD: Makefile,v 1.48 2008/06/28 13:57:25 djm Exp $ |
2 | 2 | ||
3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec | 3 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t-exec |
4 | tests: $(REGRESS_TARGETS) | 4 | tests: $(REGRESS_TARGETS) |
@@ -52,7 +52,7 @@ LTESTS= connect \ | |||
52 | localcommand \ | 52 | localcommand \ |
53 | forcecommand | 53 | forcecommand |
54 | 54 | ||
55 | INTEROP_TESTS= putty-transfer putty-ciphers putty-kex | 55 | INTEROP_TESTS= putty-transfer putty-ciphers putty-kex conch-ciphers |
56 | #INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp | 56 | #INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp |
57 | 57 | ||
58 | USER!= id -un | 58 | 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 @@ | |||
1 | # $OpenBSD: conch-ciphers.sh,v 1.1 2008/06/28 13:57:25 djm Exp $ | ||
2 | # Placed in the Public Domain. | ||
3 | |||
4 | tid="conch ciphers" | ||
5 | |||
6 | DATA=/bin/ls | ||
7 | COPY=${OBJ}/copy | ||
8 | |||
9 | set -e | ||
10 | |||
11 | if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then | ||
12 | fatal "conch interop tests not enabled" | ||
13 | fi | ||
14 | |||
15 | start_sshd | ||
16 | |||
17 | for c in aes256-ctr aes256-cbc aes192-ctr aes192-cbc aes128-ctr aes128-cbc \ | ||
18 | cast128-cbc blowfish 3des-cbc ; do | ||
19 | verbose "$tid: cipher $c" | ||
20 | rm -f ${COPY} | ||
21 | ${CONCH} --identity $OBJ/rsa --port $PORT --user $USER \ | ||
22 | --known-hosts $OBJ/known_hosts \ | ||
23 | 127.0.0.1 cat ${DATA} > ${COPY} 2>/dev/null | ||
24 | if [ $? -ne 0 ]; then | ||
25 | fail "ssh cat $DATA failed" | ||
26 | fi | ||
27 | cmp ${DATA} ${COPY} || fail "corrupted copy" | ||
28 | done | ||
29 | rm -f ${COPY} | ||
30 | |||
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 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.34 2008/06/10 15:28:49 dtucker Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.35 2008/06/28 13:57:25 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -72,6 +72,7 @@ SCP=scp | |||
72 | # Interop testing | 72 | # Interop testing |
73 | PLINK=/usr/local/bin/plink | 73 | PLINK=/usr/local/bin/plink |
74 | PUTTYGEN=/usr/local/bin/puttygen | 74 | PUTTYGEN=/usr/local/bin/puttygen |
75 | CONCH=/usr/local/bin/conch | ||
75 | 76 | ||
76 | if [ "x$TEST_SSH_SSH" != "x" ]; then | 77 | if [ "x$TEST_SSH_SSH" != "x" ]; then |
77 | SSH="${TEST_SSH_SSH}" | 78 | SSH="${TEST_SSH_SSH}" |
@@ -114,6 +115,9 @@ if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then | |||
114 | *) PUTTYGEN=`which ${TEST_SSH_PUTTYGEN} 2>/dev/null` ;; | 115 | *) PUTTYGEN=`which ${TEST_SSH_PUTTYGEN} 2>/dev/null` ;; |
115 | esac | 116 | esac |
116 | fi | 117 | fi |
118 | if [ "x$TEST_SSH_CONCH" != "x" ]; then | ||
119 | CONCH="${TEST_SSH_CONCH}" | ||
120 | fi | ||
117 | 121 | ||
118 | # Path to sshd must be absolute for rexec | 122 | # Path to sshd must be absolute for rexec |
119 | case "$SSHD" in | 123 | case "$SSHD" in |
@@ -287,6 +291,12 @@ for t in rsa rsa1; do | |||
287 | done | 291 | done |
288 | chmod 644 $OBJ/authorized_keys_$USER | 292 | chmod 644 $OBJ/authorized_keys_$USER |
289 | 293 | ||
294 | # Activate Twisted Conch tests if the binary is present | ||
295 | REGRESS_INTEROP_CONCH=no | ||
296 | if test -x "$CONCH" ; then | ||
297 | REGRESS_INTEROP_CONCH=yes | ||
298 | fi | ||
299 | |||
290 | # If PuTTY is present and we are running a PuTTY test, prepare keys and | 300 | # If PuTTY is present and we are running a PuTTY test, prepare keys and |
291 | # configuration | 301 | # configuration |
292 | REGRESS_INTEROP_PUTTY=no | 302 | REGRESS_INTEROP_PUTTY=no |