diff --git a/ChangeLog b/ChangeLog index 64f55c335..19632cb2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ - [regress/rekey.sh] Remove dependence on /dev/zero (not all platforms have it). The sparse file will take less disk space too. - [regress/sftp-cmds.sh] Ensure file used for test are readable. + - [regress/stderr-after-eof.sh] Search for a usable checksum program. 20030903 - (djm) OpenBSD CVS Sync @@ -1000,4 +1001,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2947 2003/09/04 04:26:31 dtucker Exp $ +$Id: ChangeLog,v 1.2948 2003/09/04 04:32:02 dtucker Exp $ diff --git a/regress/stderr-after-eof.sh b/regress/stderr-after-eof.sh index bebd700bf..ae9cf8d98 100644 --- a/regress/stderr-after-eof.sh +++ b/regress/stderr-after-eof.sh @@ -7,13 +7,23 @@ DATA=/etc/motd DATA=${OBJ}/data COPY=${OBJ}/copy -MD5=md5sum +if [ -x "`which md5sum 2>&1`" ]; then + CHECKSUM=md5sum +elif [ -x "`which openssl 2>&1`" ]; then + CHECKSUM="openssl md5" +elif [ -x "`which cksum 2>&1`" ]; then + CHECKSUM=cksum +elif [ -x "`which sum 2>&1`" ]; then + CHECKSUM=sum +else + fatal "No checksum program available, aborting $tid test" +fi # setup data rm -f ${DATA} ${COPY} cp /dev/null ${DATA} for i in 1 2 3 4 5 6; do - (date;echo $i) | $MD5 >> ${DATA} + (date;echo $i) | $CHECKSUM >> ${DATA} done ${SSH} -2 -F $OBJ/ssh_proxy otherhost \