From 57f92185288e0101fe9c3f3dfa29ea1619da8354 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 14 Feb 2013 10:32:33 +1100 Subject: [PATCH] - (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 --- ChangeLog | 3 +++ regress/integrity.sh | 4 ++-- 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 @@ 20130214 - (djm) [regress/krl.sh] Don't use ecdsa keys in environment that lack ECC. - (djm) [regress/krl.sh] typo; found by Iain Morgan + - (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 20130212 - (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 @@ tid="integrity" -# start at byte 2300 (i.e. after kex) and corrupt at different offsets +# start at byte 2500 (i.e. after kex) and corrupt at different offsets # XXX the test hangs if we modify the low bytes of the packet length # XXX and ssh tries to read... tries=10 -startoffset=2300 +startoffset=2500 macs="hmac-sha1 hmac-md5 umac-64@openssh.com umac-128@openssh.com hmac-sha1-96 hmac-md5-96 hmac-sha2-256 hmac-sha2-512 hmac-sha1-etm@openssh.com hmac-md5-etm@openssh.com