From efa1c950921659a0f10b9adf30625fba21b3815c Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sat, 12 Jan 2013 23:10:47 +1100
Subject: [PATCH]  - (djm) [regress/integrity.sh] repair botched merge

---
 ChangeLog            | 1 +
 regress/integrity.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index dd847610f..92830553e 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 608cde0fe..2b4bfeacc 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -56,6 +56,7 @@ for m in $macs; do
 		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