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

- (djm) [regress/integrity.sh] Fix awk quoting, packet length skip

This commit is contained in:
Damien Miller 2012-12-12 12:37:32 +11:00
parent 9fec296b0a
commit 37461d7391
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -25,6 +25,9 @@
[try-ciphers.sh]
add hmac-ripemd160-etm@openssh.com
- (djm) [mac.c] fix merge botch
- (djm) [regress/Makefile regress/integrity.sh] Make the integrity.sh test
work on platforms without 'jot'
- (djm) [regress/integrity.sh] Fix awk quoting, packet length skip
20121207
- (dtucker) OpenBSD CVS Sync

6
regress/integrity.sh
View File

@ -19,9 +19,9 @@ macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com
cmd="sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSH_LOGFILE} -i -f $OBJ/sshd_proxy"
jot() {
awk 'BEGIN { for (i = $2; i < $2 + $1; i++) { printf "%d\n", i } }'
awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } }"
}
set -x
for m in $macs; do
trace "test $tid: mac $m"
elen=0
@ -46,7 +46,7 @@ for m in $macs; do
output=$(echo $output | tr -s '\r\n' '.')
verbose "test $tid: $m @$off $output"
case "$output" in
Bad?packet*) elen=$((elen+1)); skip=2;;
Bad?packet*) elen=$((elen+1)); skip=3;;
Corrupted?MAC*) emac=$((emac+1)); skip=0;;
padding*) epad=$((epad+1)); skip=0;;
*) fail "unexpected error mac $m at $off";;