RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

[regress/conch-ciphers.sh]
     explicitly disable conch options that could interfere with the test
This commit is contained in:
Darren Tucker 2008-07-04 17:11:30 +10:00
parent 5d6d70a842
commit b01bac109b
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -25,6 +25,9 @@
- djm@cvs.openbsd.org 2008/06/30 10:31:11 - djm@cvs.openbsd.org 2008/06/30 10:31:11
[regress/{putty-transfer,putty-kex,putty-ciphers}.sh] [regress/{putty-transfer,putty-kex,putty-ciphers}.sh]
remove "set -e" left over from debugging 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 - (dtucker) [sftp-server.c] Bug #1447: fall back to racy rename if link
returns EXDEV. Patch from Mike Garrison, ok djm@ returns EXDEV. Patch from Mike Garrison, ok djm@
h h
@ -4562,4 +4565,4 @@ h
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ 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 $

12
regress/conch-ciphers.sh
View File

@ -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. # Placed in the Public Domain.
tid="conch ciphers" tid="conch ciphers"
@ -6,8 +6,6 @@ tid="conch ciphers"
DATA=/bin/ls DATA=/bin/ls
COPY=${OBJ}/copy COPY=${OBJ}/copy
set -e
if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then
fatal "conch interop tests not enabled" fatal "conch interop tests not enabled"
fi 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 cast128-cbc blowfish 3des-cbc ; do
verbose "$tid: cipher $c" verbose "$tid: cipher $c"
rm -f ${COPY} rm -f ${COPY}
${CONCH} --identity $OBJ/rsa --port $PORT --user $USER \ # XXX the 2nd "cat" seems to be needed because of buggy FD handling
--known-hosts $OBJ/known_hosts \ # in conch
127.0.0.1 cat ${DATA} > ${COPY} 2>/dev/null ${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 if [ $? -ne 0 ]; then
fail "ssh cat $DATA failed" fail "ssh cat $DATA failed"
fi fi