summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-12-12 12:37:32 +1100
committerDamien Miller <djm@mindrot.org>2012-12-12 12:37:32 +1100
commit37461d7391e0944d880757b9ac8c98d1feb15a40 (patch)
tree93e216b78e6d237039f475a6216eb6c517f35681
parent9fec296b0ac3e17ea1dcdf01761870297f7fd50a (diff)
- (djm) [regress/integrity.sh] Fix awk quoting, packet length skip
-rw-r--r--ChangeLog3
-rw-r--r--regress/integrity.sh6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ed58d1ced..9473d60ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
25 [try-ciphers.sh] 25 [try-ciphers.sh]
26 add hmac-ripemd160-etm@openssh.com 26 add hmac-ripemd160-etm@openssh.com
27 - (djm) [mac.c] fix merge botch 27 - (djm) [mac.c] fix merge botch
28 - (djm) [regress/Makefile regress/integrity.sh] Make the integrity.sh test
29 work on platforms without 'jot'
30 - (djm) [regress/integrity.sh] Fix awk quoting, packet length skip
28 31
2920121207 3220121207
30 - (dtucker) OpenBSD CVS Sync 33 - (dtucker) OpenBSD CVS Sync
diff --git a/regress/integrity.sh b/regress/integrity.sh
index f6e5c1963..0185490c1 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -19,9 +19,9 @@ macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com
19cmd="sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSH_LOGFILE} -i -f $OBJ/sshd_proxy" 19cmd="sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSH_LOGFILE} -i -f $OBJ/sshd_proxy"
20 20
21jot() { 21jot() {
22 awk 'BEGIN { for (i = $2; i < $2 + $1; i++) { printf "%d\n", i } }' 22 awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } }"
23} 23}
24set -x 24
25for m in $macs; do 25for m in $macs; do
26 trace "test $tid: mac $m" 26 trace "test $tid: mac $m"
27 elen=0 27 elen=0
@@ -46,7 +46,7 @@ for m in $macs; do
46 output=$(echo $output | tr -s '\r\n' '.') 46 output=$(echo $output | tr -s '\r\n' '.')
47 verbose "test $tid: $m @$off $output" 47 verbose "test $tid: $m @$off $output"
48 case "$output" in 48 case "$output" in
49 Bad?packet*) elen=$((elen+1)); skip=2;; 49 Bad?packet*) elen=$((elen+1)); skip=3;;
50 Corrupted?MAC*) emac=$((emac+1)); skip=0;; 50 Corrupted?MAC*) emac=$((emac+1)); skip=0;;
51 padding*) epad=$((epad+1)); skip=0;; 51 padding*) epad=$((epad+1)); skip=0;;
52 *) fail "unexpected error mac $m at $off";; 52 *) fail "unexpected error mac $m at $off";;