mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-24 15:40:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid false positive in ssl-opt.sh with memcheck

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-10-14 22:34:08 +02:00 committed by Paul Bakker
parent 8e704f0f74
commit 74a1378175
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/ssl_tls.c
View File

@ -3199,7 +3199,7 @@ read_record_header:
ssl->next_record_offset = 0; ssl->next_record_offset = 0;
ssl->in_left = 0; ssl->in_left = 0;
SSL_DEBUG_MSG( 1, ( "discarding invalid record" ) ); SSL_DEBUG_MSG( 1, ( "discarding invalid record (header)" ) );
goto read_record_header; goto read_record_header;
} }
#endif #endif
@ -3242,7 +3242,7 @@ read_record_header:
} }
#endif #endif
SSL_DEBUG_MSG( 1, ( "discarding invalid record" ) ); SSL_DEBUG_MSG( 1, ( "discarding invalid record (mac)" ) );
goto read_record_header; goto read_record_header;
} }

17
tests/ssl-opt.sh
View File

@ -266,6 +266,7 @@ run_test() {
if echo "$NAME" | grep "$FILTER" | grep -v "$EXCLUDE" >/dev/null; then : if echo "$NAME" | grep "$FILTER" | grep -v "$EXCLUDE" >/dev/null; then :
else else
SKIP_NEXT="NO"
return return
fi fi
@ -2255,8 +2256,8 @@ run_test "DTLS proxy: inject invalid AD record, default badmac_limit" \
"$P_SRV dtls=1 debug_level=1" \ "$P_SRV dtls=1 debug_level=1" \
"$P_CLI dtls=1 debug_level=1 read_timeout=100" \ "$P_CLI dtls=1 debug_level=1 read_timeout=100" \
0 \ 0 \
-c "discarding invalid record" \ -c "discarding invalid record (mac)" \
-s "discarding invalid record" \ -s "discarding invalid record (mac)" \
-s "Extra-header:" \ -s "Extra-header:" \
-c "HTTP/1.0 200 OK" \ -c "HTTP/1.0 200 OK" \
-S "too many records with bad MAC" \ -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_SRV dtls=1 debug_level=1 badmac_limit=1" \
"$P_CLI dtls=1 debug_level=1 read_timeout=100" \ "$P_CLI dtls=1 debug_level=1 read_timeout=100" \
1 \ 1 \
-C "discarding invalid record" \ -C "discarding invalid record (mac)" \
-S "discarding invalid record" \ -S "discarding invalid record (mac)" \
-S "Extra-header:" \ -S "Extra-header:" \
-C "HTTP/1.0 200 OK" \ -C "HTTP/1.0 200 OK" \
-s "too many records with bad MAC" \ -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_SRV dtls=1 debug_level=1 badmac_limit=2" \
"$P_CLI dtls=1 debug_level=1 read_timeout=100" \ "$P_CLI dtls=1 debug_level=1 read_timeout=100" \
0 \ 0 \
-c "discarding invalid record" \ -c "discarding invalid record (mac)" \
-s "discarding invalid record" \ -s "discarding invalid record (mac)" \
-s "Extra-header:" \ -s "Extra-header:" \
-c "HTTP/1.0 200 OK" \ -c "HTTP/1.0 200 OK" \
-S "too many records with bad MAC" \ -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_SRV dtls=1 debug_level=1 badmac_limit=2 exchanges=2" \
"$P_CLI dtls=1 debug_level=1 read_timeout=100 exchanges=2" \ "$P_CLI dtls=1 debug_level=1 read_timeout=100 exchanges=2" \
1 \ 1 \
-c "discarding invalid record" \ -c "discarding invalid record (mac)" \
-s "discarding invalid record" \ -s "discarding invalid record (mac)" \
-s "Extra-header:" \ -s "Extra-header:" \
-c "HTTP/1.0 200 OK" \ -c "HTTP/1.0 200 OK" \
-s "too many records with bad MAC" \ -s "too many records with bad MAC" \