diff options
-rw-r--r-- | regress/Makefile | 8 | ||||
-rw-r--r-- | regress/integrity.sh | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/regress/Makefile b/regress/Makefile index 2eb2e3181..636858662 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -81,7 +81,7 @@ CLEANFILES= t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ | |||
81 | putty.rsa2 sshd_proxy_orig ssh_proxy_bak \ | 81 | putty.rsa2 sshd_proxy_orig ssh_proxy_bak \ |
82 | key.rsa-* key.dsa-* key.ecdsa-* \ | 82 | key.rsa-* key.dsa-* key.ecdsa-* \ |
83 | authorized_principals_${USER} expect actual ready \ | 83 | authorized_principals_${USER} expect actual ready \ |
84 | sshd_proxy.* authorized_keys_${USER}.* | 84 | sshd_proxy.* authorized_keys_${USER}.* modpipe |
85 | 85 | ||
86 | 86 | ||
87 | # Enable all malloc(3) randomisations and checks | 87 | # Enable all malloc(3) randomisations and checks |
@@ -143,15 +143,15 @@ t9: $(OBJ)/t9.out | |||
143 | test "${TEST_SSH_ECC}" != yes || \ | 143 | test "${TEST_SSH_ECC}" != yes || \ |
144 | ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null | 144 | ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null |
145 | 145 | ||
146 | modpipe: modpipe.c | 146 | t-exec: ${LTESTS:=.sh} modpipe |
147 | |||
148 | t-exec: modpipe ${LTESTS:=.sh} | ||
149 | @if [ "x$?" = "x" ]; then exit 0; fi; \ | 147 | @if [ "x$?" = "x" ]; then exit 0; fi; \ |
150 | for TEST in ""$?; do \ | 148 | for TEST in ""$?; do \ |
151 | echo "run test $${TEST}" ... 1>&2; \ | 149 | echo "run test $${TEST}" ... 1>&2; \ |
152 | (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ | 150 | (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ |
153 | done | 151 | done |
154 | 152 | ||
153 | modpipe: modpipe.c | ||
154 | |||
155 | t-exec-interop: ${INTEROP_TESTS:=.sh} | 155 | t-exec-interop: ${INTEROP_TESTS:=.sh} |
156 | @if [ "x$?" = "x" ]; then exit 0; fi; \ | 156 | @if [ "x$?" = "x" ]; then exit 0; fi; \ |
157 | for TEST in ""$?; do \ | 157 | for TEST in ""$?; do \ |
diff --git a/regress/integrity.sh b/regress/integrity.sh index 23135685c..f6e5c1963 100644 --- a/regress/integrity.sh +++ b/regress/integrity.sh | |||
@@ -18,6 +18,10 @@ macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com | |||
18 | # sshd-command for proxy (see test-exec.sh) | 18 | # sshd-command for proxy (see test-exec.sh) |
19 | cmd="sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSH_LOGFILE} -i -f $OBJ/sshd_proxy" | 19 | cmd="sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSH_LOGFILE} -i -f $OBJ/sshd_proxy" |
20 | 20 | ||
21 | jot() { | ||
22 | awk 'BEGIN { for (i = $2; i < $2 + $1; i++) { printf "%d\n", i } }' | ||
23 | } | ||
24 | set -x | ||
21 | for m in $macs; do | 25 | for m in $macs; do |
22 | trace "test $tid: mac $m" | 26 | trace "test $tid: mac $m" |
23 | elen=0 | 27 | elen=0 |
@@ -26,7 +30,8 @@ for m in $macs; do | |||
26 | ecnt=0 | 30 | ecnt=0 |
27 | skip=0 | 31 | skip=0 |
28 | for off in $(jot $tries $startoffset); do | 32 | for off in $(jot $tries $startoffset); do |
29 | if [ $((skip--)) -gt 0 ]; then | 33 | skip=$((skip - 1)) |
34 | if [ $skip -gt 0 ]; then | ||
30 | # avoid modifying the high bytes of the length | 35 | # avoid modifying the high bytes of the length |
31 | continue | 36 | continue |
32 | fi | 37 | fi |