- (djm) [regress/integrity.sh] repair botched merge
diff --git a/ChangeLog b/ChangeLog
index dd84761..9283055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
    - djm@cvs.openbsd.org 2013/01/12 11:23:53
      [regress/cipher-speed.sh regress/integrity.sh regress/try-ciphers.sh]
      test AES-GCM modes; feedback markus@
+ - (djm) [regress/integrity.sh] repair botched merge
 
 20130109
  - (djm) OpenBSD CVS Sync
diff --git a/regress/integrity.sh b/regress/integrity.sh
index 608cde0..2b4bfea 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -56,6 +56,7 @@
 		case "$output" in
 		Bad?packet*)	elen=$((elen+1)); skip=3;;
 		Corrupted?MAC* | Decryption?integrity?check?failed*)
+				emac=$((emac+1)); skip=0;;
 		padding*)	epad=$((epad+1)); skip=0;;
 		*)		fail "unexpected error mac $m at $off";;
 		esac