summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorEmilia Kasper <emilia@openssl.org>2016-08-09 14:55:33 +0200
committerEmilia Kasper <emilia@openssl.org>2016-08-10 14:41:21 +0200
commit6bd3379a5831530d41fb2eebe8ec020bb917a621 (patch)
treec23b35ce168c4f601e1b5f3596d8fd856dac7312 /test
parenteb633d03fe2db3666840dee8d0a2dbe491672dfc (diff)
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>
Diffstat (limited to 'test')
-rw-r--r--test/ssl_test_ctx_test.c1
-rw-r--r--test/ssl_test_ctx_test.conf19
2 files changed, 18 insertions, 2 deletions
diff --git a/test/ssl_test_ctx_test.c b/test/ssl_test_ctx_test.c
index a779ed16d4..b7f888a418 100644
--- 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",
+ "ssltest_wrong_section",
"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 73878a17ff..20ae5d3068 100644
--- 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_wrong_section]
+server = ssltest_wrong_section_server
+
+[ssltest_wrong_section_server]
+VerifyCallback = RejectAll
+
[ssltest_unknown_expected_result]
ExpectedResult = Foo
[ssltest_unknown_alert]
-ServerAlert = Foo
+ExpectedServerAlert = Foo
[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]
+client = ssltest_unknown_servername_client
+
+[ssltest_unknown_servername_client]
ServerName = Foo
[ssltest_unknown_servername_callback]
+server = ssltest_unknown_servername_server
+
+[ssltest_unknown_servername_server]
ServerNameCallback = Foo
[ssltest_unknown_session_ticket_expected]