SSL test ctx: fix tests

Some failure tests were failing for the wrong reason after the CTX
refactoring. Update those tests.

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/test/ssl_test_ctx_test.c b/test/ssl_test_ctx_test.c
index a779ed16d44c6cd02979ea4f2be95d6dfc36c4d5..b7f888a4186ce4eaf8addc73010d5682002a275e 100644 (file)
--- a/test/ssl_test_ctx_test.c
+++ b/test/ssl_test_ctx_test.c
@@ -264,6 +264,7 @@ static int test_good_configuration()
 
 static const char *bad_configurations[] = {
     "ssltest_unknown_option",
 
 static const char *bad_configurations[] = {
     "ssltest_unknown_option",

+    "ssltest_wrong_section",

     "ssltest_unknown_expected_result",
     "ssltest_unknown_alert",
     "ssltest_unknown_protocol",
     "ssltest_unknown_expected_result",
     "ssltest_unknown_alert",
     "ssltest_unknown_protocol",

diff --git a/test/ssl_test_ctx_test.conf b/test/ssl_test_ctx_test.conf
index 73878a17ff74c5d92b08e332f4c404de1749240b..20ae5d3068243305b228a539be2589159f756317 100644 (file)
--- a/test/ssl_test_ctx_test.conf
+++ b/test/ssl_test_ctx_test.conf
@@ -30,22 +30,37 @@ ALPNProtocols = baz
 [ssltest_unknown_option]
 UnknownOption = Foo
 
 [ssltest_unknown_option]
 UnknownOption = Foo
 

+[ssltest_wrong_section]
+server = ssltest_wrong_section_server
+
+[ssltest_wrong_section_server]
+VerifyCallback = RejectAll
+

 [ssltest_unknown_expected_result]
 ExpectedResult = Foo
 
 [ssltest_unknown_alert]
 [ssltest_unknown_expected_result]
 ExpectedResult = Foo
 
 [ssltest_unknown_alert]

-ServerAlert = Foo
+ExpectedServerAlert = Foo

 
 [ssltest_unknown_protocol]
 Protocol = Foo
 
 [ssltest_unknown_verify_callback]
 
 [ssltest_unknown_protocol]
 Protocol = Foo
 
 [ssltest_unknown_verify_callback]

-ClientVerifyCallback = Foo
+client = ssltest_unknown_verify_callback_client
+
+[ssltest_unknown_verify_callback_client]
+VerifyCallback = Foo

 
 [ssltest_unknown_servername]
 
 [ssltest_unknown_servername]

+client = ssltest_unknown_servername_client
+
+[ssltest_unknown_servername_client]

 ServerName = Foo
 
 [ssltest_unknown_servername_callback]
 ServerName = Foo
 
 [ssltest_unknown_servername_callback]

+server = ssltest_unknown_servername_server
+
+[ssltest_unknown_servername_server]

 ServerNameCallback = Foo
 
 [ssltest_unknown_session_ticket_expected]
 ServerNameCallback = Foo
 
 [ssltest_unknown_session_ticket_expected]