- djm@cvs.openbsd.org 2008/06/30 10:43:03

     [regress/conch-ciphers.sh]
     explicitly disable conch options that could interfere with the test

diff --git a/ChangeLog b/ChangeLog
index eda16a0e68548671f5d89d25969dafae986c2f92..7c2333c68a309e8c2e90e4277d1fd2440436f93c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh
index c371d30304a34034c5250e8aac1bf6021b92df60..84b19061892cb19f291af4f97ff8af3e7ffb81a6 100644 (file)
--- 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