Reintroduce grepping for debug messages in CID tests in ssl-opt.sh

This commit is contained in:
Hanno Becker 2019-05-03 17:04:23 +01:00
parent 4932f9f229
commit b7f9e9c9a5

View file

@ -1163,12 +1163,11 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID none
-c "found CID extension" \ -c "found CID extension" \
-c "Use of CID extension negotiated" \ -c "Use of CID extension negotiated" \
-s "Copy CIDs into SSL transform" \ -s "Copy CIDs into SSL transform" \
-c "Copy CIDs into SSL transform" -c "Copy CIDs into SSL transform" \
# Uncomment once CID is fully implemented -c "Peer CID (length 2 Bytes): de ad" \
# -c "Peer CID (length 2 Bytes): de ad" \ -s "Peer CID (length 2 Bytes): be ef" \
# -s "Peer CID (length 2 Bytes): be ef" -s "Use of Connection ID has been negotiated" \
# -s "Use of Connection ID has been negotiated" \ -c "Use of Connection ID has been negotiated"
# -c "Use of Connection ID has been negotiated" \
requires_config_enabled MBEDTLS_SSL_CID requires_config_enabled MBEDTLS_SSL_CID
run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty" \ run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty" \
@ -1184,12 +1183,11 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty" \
-c "found CID extension" \ -c "found CID extension" \
-c "Use of CID extension negotiated" \ -c "Use of CID extension negotiated" \
-s "Copy CIDs into SSL transform" \ -s "Copy CIDs into SSL transform" \
-c "Copy CIDs into SSL transform" -c "Copy CIDs into SSL transform" \
# Uncomment once CID is fully implemented -c "Peer CID (length 4 Bytes): de ad be ef" \
# -c "Peer CID (length 4 Bytes): de ad be ef" \ -s "Peer CID (length 0 Bytes):" \
# -s "Peer CID (length 0 Bytes):" \ -s "Use of Connection ID has been negotiated" \
# -s "Use of Connection ID has been negotiated" \ -c "Use of Connection ID has been negotiated"
# -c "Use of Connection ID has been negotiated" \
requires_config_enabled MBEDTLS_SSL_CID requires_config_enabled MBEDTLS_SSL_CID
run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty" \ run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty" \
@ -1205,12 +1203,11 @@ run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty" \
-c "found CID extension" \ -c "found CID extension" \
-c "Use of CID extension negotiated" \ -c "Use of CID extension negotiated" \
-s "Copy CIDs into SSL transform" \ -s "Copy CIDs into SSL transform" \
-c "Copy CIDs into SSL transform" -c "Copy CIDs into SSL transform" \
# Uncomment once CID is fully implemented -s "Peer CID (length 4 Bytes): de ad be ef" \
# -s "Peer CID (length 4 Bytes): de ad be ef" \ -c "Peer CID (length 0 Bytes):" \
# -c "Peer CID (length 0 Bytes):" -s "Use of Connection ID has been negotiated" \
# -s "Use of Connection ID has been negotiated" \ -c "Use of Connection ID has been negotiated"
# -c "Use of Connection ID has been negotiated" \
requires_config_enabled MBEDTLS_SSL_CID requires_config_enabled MBEDTLS_SSL_CID
run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty" \ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty" \
@ -1244,12 +1241,11 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID none
-c "found CID extension" \ -c "found CID extension" \
-c "Use of CID extension negotiated" \ -c "Use of CID extension negotiated" \
-s "Copy CIDs into SSL transform" \ -s "Copy CIDs into SSL transform" \
-c "Copy CIDs into SSL transform" -c "Copy CIDs into SSL transform" \
# Uncomment once CID is fully implemented -c "Peer CID (length 2 Bytes): de ad" \
# -c "Peer CID (length 2 Bytes): de ad" \ -s "Peer CID (length 2 Bytes): be ef" \
# -s "Peer CID (length 2 Bytes): be ef" \ -s "Use of Connection ID has been negotiated" \
# -s "Use of Connection ID has been negotiated" \ -c "Use of Connection ID has been negotiated"
# -c "Use of Connection ID has been negotiated" \
requires_config_enabled MBEDTLS_SSL_CID requires_config_enabled MBEDTLS_SSL_CID
run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CCM-8" \ run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CCM-8" \
@ -1265,12 +1261,11 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-
-c "found CID extension" \ -c "found CID extension" \
-c "Use of CID extension negotiated" \ -c "Use of CID extension negotiated" \
-s "Copy CIDs into SSL transform" \ -s "Copy CIDs into SSL transform" \
-c "Copy CIDs into SSL transform" -c "Copy CIDs into SSL transform" \
# Uncomment once CID is fully implemented -c "Peer CID (length 4 Bytes): de ad be ef" \
# -c "Peer CID (length 4 Bytes): de ad be ef" \ -s "Peer CID (length 0 Bytes):" \
# -s "Peer CID (length 0 Bytes):" \ -s "Use of Connection ID has been negotiated" \
# -s "Use of Connection ID has been negotiated" \ -c "Use of Connection ID has been negotiated"
# -c "Use of Connection ID has been negotiated" \
requires_config_enabled MBEDTLS_SSL_CID requires_config_enabled MBEDTLS_SSL_CID
run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CCM-8" \ run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CCM-8" \
@ -1286,12 +1281,11 @@ run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-
-c "found CID extension" \ -c "found CID extension" \
-c "Use of CID extension negotiated" \ -c "Use of CID extension negotiated" \
-s "Copy CIDs into SSL transform" \ -s "Copy CIDs into SSL transform" \
-c "Copy CIDs into SSL transform" -c "Copy CIDs into SSL transform" \
# Uncomment once CID is fully implemented -s "Peer CID (length 4 Bytes): de ad be ef" \
# -s "Peer CID (length 4 Bytes): de ad be ef" \ -c "Peer CID (length 0 Bytes):" \
# -c "Peer CID (length 0 Bytes):" \ -s "Use of Connection ID has been negotiated" \
# -s "Use of Connection ID has been negotiated" \ -c "Use of Connection ID has been negotiated"
# -c "Use of Connection ID has been negotiated" \
requires_config_enabled MBEDTLS_SSL_CID requires_config_enabled MBEDTLS_SSL_CID
run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CCM-8" \ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CCM-8" \
@ -1325,12 +1319,11 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID none
-c "found CID extension" \ -c "found CID extension" \
-c "Use of CID extension negotiated" \ -c "Use of CID extension negotiated" \
-s "Copy CIDs into SSL transform" \ -s "Copy CIDs into SSL transform" \
-c "Copy CIDs into SSL transform" -c "Copy CIDs into SSL transform" \
# Uncomment once CID is fully implemented -c "Peer CID (length 2 Bytes): de ad" \
# -c "Peer CID (length 2 Bytes): de ad" \ -s "Peer CID (length 2 Bytes): be ef" \
# -s "Peer CID (length 2 Bytes): be ef" \ -s "Use of Connection ID has been negotiated" \
# -s "Use of Connection ID has been negotiated" \ -c "Use of Connection ID has been negotiated"
# -c "Use of Connection ID has been negotiated" \
requires_config_enabled MBEDTLS_SSL_CID requires_config_enabled MBEDTLS_SSL_CID
run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CBC" \ run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CBC" \
@ -1346,12 +1339,11 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-
-c "found CID extension" \ -c "found CID extension" \
-c "Use of CID extension negotiated" \ -c "Use of CID extension negotiated" \
-s "Copy CIDs into SSL transform" \ -s "Copy CIDs into SSL transform" \
-c "Copy CIDs into SSL transform" -c "Copy CIDs into SSL transform" \
# Uncomment once CID is fully implemented -c "Peer CID (length 4 Bytes): de ad be ef" \
# -c "Peer CID (length 4 Bytes): de ad be ef" \ -s "Peer CID (length 0 Bytes):" \
# -s "Peer CID (length 0 Bytes):" \ -s "Use of Connection ID has been negotiated" \
# -s "Use of Connection ID has been negotiated" \ -c "Use of Connection ID has been negotiated"
# -c "Use of Connection ID has been negotiated" \
requires_config_enabled MBEDTLS_SSL_CID requires_config_enabled MBEDTLS_SSL_CID
run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CBC" \ run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CBC" \
@ -1367,12 +1359,11 @@ run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-
-c "found CID extension" \ -c "found CID extension" \
-c "Use of CID extension negotiated" \ -c "Use of CID extension negotiated" \
-s "Copy CIDs into SSL transform" \ -s "Copy CIDs into SSL transform" \
-c "Copy CIDs into SSL transform" -c "Copy CIDs into SSL transform" \
# Uncomment once CID is fully implemented -s "Peer CID (length 4 Bytes): de ad be ef" \
# -s "Peer CID (length 4 Bytes): de ad be ef" \ -c "Peer CID (length 0 Bytes):" \
# -c "Peer CID (length 0 Bytes):" \ -s "Use of Connection ID has been negotiated" \
# -s "Use of Connection ID has been negotiated" \ -c "Use of Connection ID has been negotiated"
# -c "Use of Connection ID has been negotiated" \
requires_config_enabled MBEDTLS_SSL_CID requires_config_enabled MBEDTLS_SSL_CID
run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CBC" \ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CBC" \
@ -1407,12 +1398,11 @@ run_test "(STUB) Connection ID: Client+Server enabled, renegotiate" \
-c "found CID extension" \ -c "found CID extension" \
-c "Use of CID extension negotiated" \ -c "Use of CID extension negotiated" \
-s "Copy CIDs into SSL transform" \ -s "Copy CIDs into SSL transform" \
-c "Copy CIDs into SSL transform" -c "Copy CIDs into SSL transform" \
# Uncomment once CID is fully implemented -c "Peer CID (length 2 Bytes): de ad" \
# -c "Peer CID (length 2 Bytes): de ad" \ -s "Peer CID (length 2 Bytes): be ef" \
# -s "Peer CID (length 2 Bytes): be ef" -s "Use of Connection ID has been negotiated" \
# -s "Use of Connection ID has been negotiated" \ -c "Use of Connection ID has been negotiated"
# -c "Use of Connection ID has been negotiated" \
# Tests for Encrypt-then-MAC extension # Tests for Encrypt-then-MAC extension