diff options
author | Emilia Kasper <emilia@openssl.org> | 2016-06-10 00:39:22 +0200 |
---|---|---|
committer | Emilia Kasper <emilia@openssl.org> | 2016-06-13 16:03:06 +0200 |
commit | 81fc33c951b645f31727dc811e02200bde4a0982 (patch) | |
tree | 7b14f860635eb488254815300aecdf1792f46584 /test/ssl_test_ctx.c | |
parent | a7be5759cf9d8e2bf7c1ecd0efa2d53aae9ab706 (diff) |
Clean up following new SNI tests
- Only send SNI in SNI tests. This allows us to test handshakes without
the SNI extension as well.
- Move all handshake-specific machinery to handshake_helper.c
- Use enum types to represent the enum everywhere
(Resorting to plain ints can end in sign mismatch when the enum is
represented by an unsigned type.)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/ssl_test_ctx.c')
-rw-r--r-- | test/ssl_test_ctx.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/ssl_test_ctx.c b/test/ssl_test_ctx.c index 598c89996c..87060f3799 100644 --- a/test/ssl_test_ctx.c +++ b/test/ssl_test_ctx.c @@ -159,6 +159,7 @@ const char *ssl_verify_callback_name(ssl_verify_callback_t callback) /**************/ static const test_enum ssl_servername[] = { + {"None", SSL_TEST_SERVERNAME_NONE}, {"server1", SSL_TEST_SERVERNAME_SERVER1}, {"server2", SSL_TEST_SERVERNAME_SERVER2}, }; @@ -185,18 +186,17 @@ const char *ssl_servername_name(ssl_servername_t server) /* SessionTicketExpected */ /*************************/ -static const test_enum ssl_session_ticket_expected[] = { +static const test_enum ssl_session_ticket[] = { {"Ignore", SSL_TEST_SESSION_TICKET_IGNORE}, {"Yes", SSL_TEST_SESSION_TICKET_YES}, {"No", SSL_TEST_SESSION_TICKET_NO}, {"Broken", SSL_TEST_SESSION_TICKET_BROKEN}, }; -__owur static int parse_session_ticket_expected(SSL_TEST_CTX *test_ctx, - const char *value) +__owur static int parse_session_ticket(SSL_TEST_CTX *test_ctx, const char *value) { int ret_value; - if (!parse_enum(ssl_session_ticket_expected, OSSL_NELEM(ssl_session_ticket_expected), + if (!parse_enum(ssl_session_ticket, OSSL_NELEM(ssl_session_ticket), &ret_value, value)) { return 0; } @@ -204,10 +204,10 @@ __owur static int parse_session_ticket_expected(SSL_TEST_CTX *test_ctx, return 1; } -const char *ssl_session_ticket_expected_name(ssl_session_ticket_expected_t server) +const char *ssl_session_ticket_name(ssl_session_ticket_t server) { - return enum_name(ssl_session_ticket_expected, - OSSL_NELEM(ssl_session_ticket_expected), + return enum_name(ssl_session_ticket, + OSSL_NELEM(ssl_session_ticket), server); } @@ -227,7 +227,7 @@ static const ssl_test_ctx_option ssl_test_ctx_options[] = { { "Protocol", &parse_protocol }, { "ClientVerifyCallback", &parse_client_verify_callback }, { "ServerName", &parse_servername }, - { "SessionTicketExpected", &parse_session_ticket_expected }, + { "SessionTicketExpected", &parse_session_ticket }, }; |