summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-02-14 10:32:33 +1100
committerDamien Miller <djm@mindrot.org>2013-02-14 10:32:33 +1100
commit57f92185288e0101fe9c3f3dfa29ea1619da8354 (patch)
tree9f74e5f034c759bfcb8fc356f90daf4a9e34ab22
parent6d77d6ea2b96c2e7df0ab036ab4116ac548deb1e (diff)
- (djm) [regress/integrity.sh] Start fuzzing from offset 2500 (instead
of 2300) to avoid clobbering the end of (non-MAC'd) KEX. Verified by Iain Morgan
-rw-r--r--ChangeLog3
-rw-r--r--regress/integrity.sh4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b77f88b02..c6162496e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
120130214 120130214
2 - (djm) [regress/krl.sh] Don't use ecdsa keys in environment that lack ECC. 2 - (djm) [regress/krl.sh] Don't use ecdsa keys in environment that lack ECC.
3 - (djm) [regress/krl.sh] typo; found by Iain Morgan 3 - (djm) [regress/krl.sh] typo; found by Iain Morgan
4 - (djm) [regress/integrity.sh] Start fuzzing from offset 2500 (instead
5 of 2300) to avoid clobbering the end of (non-MAC'd) KEX. Verified by
6 Iain Morgan
4 7
520130212 820130212
6 - (djm) OpenBSD CVS Sync 9 - (djm) OpenBSD CVS Sync
diff --git a/regress/integrity.sh b/regress/integrity.sh
index 91168fd2e..bcace97e6 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -3,11 +3,11 @@
3 3
4tid="integrity" 4tid="integrity"
5 5
6# start at byte 2300 (i.e. after kex) and corrupt at different offsets 6# start at byte 2500 (i.e. after kex) and corrupt at different offsets
7# XXX the test hangs if we modify the low bytes of the packet length 7# XXX the test hangs if we modify the low bytes of the packet length
8# XXX and ssh tries to read... 8# XXX and ssh tries to read...
9tries=10 9tries=10
10startoffset=2300 10startoffset=2500
11macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com 11macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com
12 hmac-sha1-96 hmac-md5-96 hmac-sha2-256 hmac-sha2-512 12 hmac-sha1-96 hmac-md5-96 hmac-sha2-256 hmac-sha2-512
13 hmac-sha1-etm@openssh.com hmac-md5-etm@openssh.com 13 hmac-sha1-etm@openssh.com hmac-md5-etm@openssh.com