summaryrefslogtreecommitdiff
path: root/regress/conch-ciphers.sh
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-07-04 17:11:30 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-07-04 17:11:30 +1000
commitb01bac109bd2fc6b3093fe4aeb31a125be8f2a4e (patch)
tree09f610f6fd6897cd97c8187ab2e9134bb3b75f02 /regress/conch-ciphers.sh
parent5d6d70a8429824b3d0fb3a0faf70333c062c8925 (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
Diffstat (limited to 'regress/conch-ciphers.sh')
-rw-r--r--regress/conch-ciphers.sh12
1 files changed, 6 insertions, 6 deletions
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