From a6a4c7623cd5e3b049297ebd1095019f5fe7acfe Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Fri, 26 Apr 2019 16:13:31 +0100 Subject: [PATCH] Grep for dbg msg witnessing parsing of CID extension in ServerHello --- tests/ssl-opt.sh | 58 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 15 deletions(-) diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh index 7797b824b..1fbc8ad1e 100755 --- a/tests/ssl-opt.sh +++ b/tests/ssl-opt.sh @@ -1286,7 +1286,8 @@ run_test "(STUB) Connection ID: Client enabled, server disabled" \ -s "Client sent CID extension, but CID disabled" \ -c "Enable use of CID extension." \ -c "client hello, adding CID extension" \ - -S "server hello, adding CID extension" + -S "server hello, adding CID extension" \ + -C "found CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client disabled, server enabled" \ @@ -1297,7 +1298,8 @@ run_test "(STUB) Connection ID: Client disabled, server enabled" \ -C "client hello, adding CID extension" \ -S "found CID extension" \ -s "Enable use of CID extension." \ - -S "server hello, adding CID extension" + -S "server hello, adding CID extension" \ + -C "found CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID nonempty" \ @@ -1309,7 +1311,9 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID none -c "client hello, adding CID extension" \ -s "found CID extension" \ -s "Use of CID extension negotiated" \ - -s "server hello, adding CID extension" + -s "server hello, adding CID extension" \ + -c "found CID extension" \ + -c "Use of CID extension negotiated" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty" \ @@ -1321,7 +1325,9 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty" \ -c "client hello, adding CID extension" \ -s "found CID extension" \ -s "Use of CID extension negotiated" \ - -s "server hello, adding CID extension" + -s "server hello, adding CID extension" \ + -c "found CID extension" \ + -c "Use of CID extension negotiated" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty" \ @@ -1333,7 +1339,9 @@ run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty" \ -c "client hello, adding CID extension" \ -s "found CID extension" \ -s "Use of CID extension negotiated" \ - -s "server hello, adding CID extension" + -s "server hello, adding CID extension" \ + -c "found CID extension" \ + -c "Use of CID extension negotiated" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty" \ @@ -1345,7 +1353,9 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empt -c "client hello, adding CID extension" \ -s "found CID extension" \ -s "Use of CID extension negotiated" \ - -s "server hello, adding CID extension" + -s "server hello, adding CID extension" \ + -c "found CID extension" \ + -c "Use of CID extension negotiated" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID nonempty, AES-128-CCM-8" \ @@ -1357,7 +1367,9 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID none -c "client hello, adding CID extension" \ -s "found CID extension" \ -s "Use of CID extension negotiated" \ - -s "server hello, adding CID extension" + -s "server hello, adding CID extension" \ + -c "found CID extension" \ + -c "Use of CID extension negotiated" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CCM-8" \ @@ -1369,7 +1381,9 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES- -c "client hello, adding CID extension" \ -s "found CID extension" \ -s "Use of CID extension negotiated" \ - -s "server hello, adding CID extension" + -s "server hello, adding CID extension" \ + -c "found CID extension" \ + -c "Use of CID extension negotiated" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CCM-8" \ @@ -1381,7 +1395,9 @@ run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES- -c "client hello, adding CID extension" \ -s "found CID extension" \ -s "Use of CID extension negotiated" \ - -s "server hello, adding CID extension" + -s "server hello, adding CID extension" \ + -c "found CID extension" \ + -c "Use of CID extension negotiated" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CCM-8" \ @@ -1393,7 +1409,9 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empt -c "client hello, adding CID extension" \ -s "found CID extension" \ -s "Use of CID extension negotiated" \ - -s "server hello, adding CID extension" + -s "server hello, adding CID extension" \ + -c "found CID extension" \ + -c "Use of CID extension negotiated" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID nonempty, AES-128-CBC" \ @@ -1405,7 +1423,9 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID none -c "client hello, adding CID extension" \ -s "found CID extension" \ -s "Use of CID extension negotiated" \ - -s "server hello, adding CID extension" + -s "server hello, adding CID extension" \ + -c "found CID extension" \ + -c "Use of CID extension negotiated" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CBC" \ @@ -1417,7 +1437,9 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES- -c "client hello, adding CID extension" \ -s "found CID extension" \ -s "Use of CID extension negotiated" \ - -s "server hello, adding CID extension" + -s "server hello, adding CID extension" \ + -c "found CID extension" \ + -c "Use of CID extension negotiated" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CBC" \ @@ -1429,7 +1451,9 @@ run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES- -c "client hello, adding CID extension" \ -s "found CID extension" \ -s "Use of CID extension negotiated" \ - -s "server hello, adding CID extension" + -s "server hello, adding CID extension" \ + -c "found CID extension" \ + -c "Use of CID extension negotiated" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CBC" \ @@ -1441,7 +1465,9 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empt -c "client hello, adding CID extension" \ -s "found CID extension" \ -s "Use of CID extension negotiated" \ - -s "server hello, adding CID extension" + -s "server hello, adding CID extension" \ + -c "found CID extension" \ + -c "Use of CID extension negotiated" requires_config_enabled MBEDTLS_SSL_CID requires_config_enabled MBEDTLS_SSL_RENEGOTIATION @@ -1454,7 +1480,9 @@ run_test "(STUB) Connection ID: Client+Server enabled, renegotiate" \ -c "client hello, adding CID extension" \ -s "found CID extension" \ -s "Use of CID extension negotiated" \ - -s "server hello, adding CID extension" + -s "server hello, adding CID extension" \ + -c "found CID extension" \ + -c "Use of CID extension negotiated" # Tests for Encrypt-then-MAC extension