From 74a137817573c1a358a28a3dcc0ee04361e77142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Tue, 14 Oct 2014 22:34:08 +0200
Subject: [PATCH] Avoid false positive in ssl-opt.sh with memcheck

---
 library/ssl_tls.c |  4 ++--
 tests/ssl-opt.sh  | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index bfaefd46d..67aaa98c1 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3199,7 +3199,7 @@ read_record_header:
             ssl->next_record_offset = 0;
             ssl->in_left = 0;
 
-            SSL_DEBUG_MSG( 1, ( "discarding invalid record" ) );
+            SSL_DEBUG_MSG( 1, ( "discarding invalid record (header)" ) );
             goto read_record_header;
         }
 #endif
@@ -3242,7 +3242,7 @@ read_record_header:
                 }
 #endif
 
-                SSL_DEBUG_MSG( 1, ( "discarding invalid record" ) );
+                SSL_DEBUG_MSG( 1, ( "discarding invalid record (mac)" ) );
                 goto read_record_header;
             }
 
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index f0560ef34..ac78b1fbf 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -266,6 +266,7 @@ run_test() {
 
     if echo "$NAME" | grep "$FILTER" | grep -v "$EXCLUDE" >/dev/null; then :
     else
+        SKIP_NEXT="NO"
         return
     fi
 
@@ -2255,8 +2256,8 @@ run_test    "DTLS proxy: inject invalid AD record, default badmac_limit" \
             "$P_SRV dtls=1 debug_level=1" \
             "$P_CLI dtls=1 debug_level=1 read_timeout=100" \
             0 \
-            -c "discarding invalid record" \
-            -s "discarding invalid record" \
+            -c "discarding invalid record (mac)" \
+            -s "discarding invalid record (mac)" \
             -s "Extra-header:" \
             -c "HTTP/1.0 200 OK" \
             -S "too many records with bad MAC" \
@@ -2267,8 +2268,8 @@ run_test    "DTLS proxy: inject invalid AD record, badmac_limit 1" \
             "$P_SRV dtls=1 debug_level=1 badmac_limit=1" \
             "$P_CLI dtls=1 debug_level=1 read_timeout=100" \
             1 \
-            -C "discarding invalid record" \
-            -S "discarding invalid record" \
+            -C "discarding invalid record (mac)" \
+            -S "discarding invalid record (mac)" \
             -S "Extra-header:" \
             -C "HTTP/1.0 200 OK" \
             -s "too many records with bad MAC" \
@@ -2279,8 +2280,8 @@ run_test    "DTLS proxy: inject invalid AD record, badmac_limit 2" \
             "$P_SRV dtls=1 debug_level=1 badmac_limit=2" \
             "$P_CLI dtls=1 debug_level=1 read_timeout=100" \
             0 \
-            -c "discarding invalid record" \
-            -s "discarding invalid record" \
+            -c "discarding invalid record (mac)" \
+            -s "discarding invalid record (mac)" \
             -s "Extra-header:" \
             -c "HTTP/1.0 200 OK" \
             -S "too many records with bad MAC" \
@@ -2291,8 +2292,8 @@ run_test    "DTLS proxy: inject invalid AD record, badmac_limit 2, exchanges 2"\
             "$P_SRV dtls=1 debug_level=1 badmac_limit=2 exchanges=2" \
             "$P_CLI dtls=1 debug_level=1 read_timeout=100 exchanges=2" \
             1 \
-            -c "discarding invalid record" \
-            -s "discarding invalid record" \
+            -c "discarding invalid record (mac)" \
+            -s "discarding invalid record (mac)" \
             -s "Extra-header:" \
             -c "HTTP/1.0 200 OK" \
             -s "too many records with bad MAC" \