From 4eb0587c0f3f34a3817f7af0bd7b3d6c4b731a83 Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Fri, 26 Apr 2019 16:00:29 +0100 Subject: [PATCH] Grep for dbg msg witnessing writing of CID extension in ServerHello --- tests/ssl-opt.sh | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh index e3db07f36..af085491e 100755 --- a/tests/ssl-opt.sh +++ b/tests/ssl-opt.sh @@ -1127,7 +1127,8 @@ run_test "(STUB) Connection ID: Client enabled, server disabled" \ -s "found CID extension" \ -s "Client sent CID extension, but CID disabled" \ -c "Enable use of CID extension." \ - -c "client hello, adding CID extension" + -c "client hello, adding CID extension" \ + -S "server hello, adding CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client disabled, server enabled" \ @@ -1137,7 +1138,8 @@ run_test "(STUB) Connection ID: Client disabled, server enabled" \ -c "Disable use of CID extension." \ -C "client hello, adding CID extension" \ -S "found CID extension" \ - -s "Enable use of CID extension." + -s "Enable use of CID extension." \ + -S "server hello, adding CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID nonempty" \ @@ -1148,7 +1150,8 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID none -s "Enable use of CID extension." \ -c "client hello, adding CID extension" \ -s "found CID extension" \ - -s "Use of CID extension negotiated" + -s "Use of CID extension negotiated" \ + -s "server hello, adding CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty" \ @@ -1159,7 +1162,8 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty" \ -s "Enable use of CID extension." \ -c "client hello, adding CID extension" \ -s "found CID extension" \ - -s "Use of CID extension negotiated" + -s "Use of CID extension negotiated" \ + -s "server hello, adding CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty" \ @@ -1170,7 +1174,8 @@ run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty" \ -s "Enable use of CID extension." \ -c "client hello, adding CID extension" \ -s "found CID extension" \ - -s "Use of CID extension negotiated" + -s "Use of CID extension negotiated" \ + -s "server hello, adding CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty" \ @@ -1181,7 +1186,8 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empt -s "Enable use of CID extension." \ -c "client hello, adding CID extension" \ -s "found CID extension" \ - -s "Use of CID extension negotiated" + -s "Use of CID extension negotiated" \ + -s "server hello, adding CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID nonempty, AES-128-CCM-8" \ @@ -1192,7 +1198,8 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID none -s "Enable use of CID extension." \ -c "client hello, adding CID extension" \ -s "found CID extension" \ - -s "Use of CID extension negotiated" + -s "Use of CID extension negotiated" \ + -s "server hello, adding CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CCM-8" \ @@ -1203,7 +1210,8 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES- -s "Enable use of CID extension." \ -c "client hello, adding CID extension" \ -s "found CID extension" \ - -s "Use of CID extension negotiated" + -s "Use of CID extension negotiated" \ + -s "server hello, adding CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CCM-8" \ @@ -1214,7 +1222,8 @@ run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES- -s "Enable use of CID extension." \ -c "client hello, adding CID extension" \ -s "found CID extension" \ - -s "Use of CID extension negotiated" + -s "Use of CID extension negotiated" \ + -s "server hello, adding CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CCM-8" \ @@ -1225,7 +1234,8 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empt -s "Enable use of CID extension." \ -c "client hello, adding CID extension" \ -s "found CID extension" \ - -s "Use of CID extension negotiated" + -s "Use of CID extension negotiated" \ + -s "server hello, adding CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID nonempty, AES-128-CBC" \ @@ -1236,7 +1246,8 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID none -s "Enable use of CID extension." \ -c "client hello, adding CID extension" \ -s "found CID extension" \ - -s "Use of CID extension negotiated" + -s "Use of CID extension negotiated" \ + -s "server hello, adding CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CBC" \ @@ -1247,7 +1258,8 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES- -s "Enable use of CID extension." \ -c "client hello, adding CID extension" \ -s "found CID extension" \ - -s "Use of CID extension negotiated" + -s "Use of CID extension negotiated" \ + -s "server hello, adding CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CBC" \ @@ -1258,7 +1270,8 @@ run_test "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES- -s "Enable use of CID extension." \ -c "client hello, adding CID extension" \ -s "found CID extension" \ - -s "Use of CID extension negotiated" + -s "Use of CID extension negotiated" \ + -s "server hello, adding CID extension" requires_config_enabled MBEDTLS_SSL_CID run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CBC" \ @@ -1269,7 +1282,8 @@ run_test "(STUB) Connection ID: Client+Server enabled, Client+Server CID empt -s "Enable use of CID extension." \ -c "client hello, adding CID extension" \ -s "found CID extension" \ - -s "Use of CID extension negotiated" + -s "Use of CID extension negotiated" \ + -s "server hello, adding CID extension" requires_config_enabled MBEDTLS_SSL_CID requires_config_enabled MBEDTLS_SSL_RENEGOTIATION @@ -1281,7 +1295,8 @@ run_test "(STUB) Connection ID: Client+Server enabled, renegotiate" \ -s "Enable use of CID extension." \ -c "client hello, adding CID extension" \ -s "found CID extension" \ - -s "Use of CID extension negotiated" + -s "Use of CID extension negotiated" \ + -s "server hello, adding CID extension" # Tests for Encrypt-then-MAC extension