diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2008-07-04 17:11:30 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2008-07-04 17:11:30 +1000 |
| commit | b01bac109bd2fc6b3093fe4aeb31a125be8f2a4e (patch) | |
| tree | 09f610f6fd6897cd97c8187ab2e9134bb3b75f02 | |
| parent | 5d6d70a8429824b3d0fb3a0faf70333c062c8925 (diff) | |
- djm@cvs.openbsd.org 2008/06/30 10:43:03
[regress/conch-ciphers.sh]
explicitly disable conch options that could interfere with the test
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | regress/conch-ciphers.sh | 12 |
2 files changed, 10 insertions, 7 deletions
@@ -25,6 +25,9 @@ - djm@cvs.openbsd.org 2008/06/30 10:31:11 [regress/{putty-transfer,putty-kex,putty-ciphers}.sh] remove "set -e" left over from debugging + - djm@cvs.openbsd.org 2008/06/30 10:43:03 + [regress/conch-ciphers.sh] + explicitly disable conch options that could interfere with the test - (dtucker) [sftp-server.c] Bug #1447: fall back to racy rename if link returns EXDEV. Patch from Mike Garrison, ok djm@ h @@ -4562,4 +4565,4 @@ h 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.5056 2008/07/04 07:10:30 dtucker Exp $ +$Id: ChangeLog,v 1.5057 2008/07/04 07:11:30 dtucker Exp $ diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh index c371d303..84b19061 100644 --- a/regress/conch-ciphers.sh +++ b/regress/conch-ciphers.sh @@ -1,4 +1,4 @@ -# $OpenBSD: conch-ciphers.sh,v 1.1 2008/06/28 13:57:25 djm Exp $ +# $OpenBSD: conch-ciphers.sh,v 1.2 2008/06/30 10:43:03 djm Exp $ # Placed in the Public Domain. tid="conch ciphers" @@ -6,8 +6,6 @@ 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 @@ -18,9 +16,11 @@ 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 + # XXX the 2nd "cat" seems to be needed because of buggy FD handling + # in conch + ${CONCH} --identity $OBJ/rsa --port $PORT --user $USER -e none \ + --known-hosts $OBJ/known_hosts --notty --noagent --nox11 -n \ + 127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY} if [ $? -ne 0 ]; then fail "ssh cat $DATA failed" fi |