diff options
| author | Ben Laurie <ben@links.org> | 2016-07-31 11:42:04 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2016-08-01 11:30:33 +0100 |
| commit | 620c6ad3125d7631f08c37033d1cb4302aef819a (patch) | |
| tree | 27e39f0292c5566f0d2887e38fe8126bce5b66b6 /test/ssl_test_ctx.c | |
| parent | 087d3e89932e00eede95353fbd988e2752bc2468 (diff) | |
Fix various no-*s.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/ssl_test_ctx.c')
| -rw-r--r-- | test/ssl_test_ctx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test/ssl_test_ctx.c b/test/ssl_test_ctx.c index 084cf15a85..24b11e5003 100644 --- a/test/ssl_test_ctx.c +++ b/test/ssl_test_ctx.c @@ -295,6 +295,7 @@ const char *ssl_test_method_name(ssl_test_method_t method) /* NPN and ALPN options */ /************************************/ +#ifndef OPENSSL_NO_NEXTPROTONEG IMPLEMENT_SSL_TEST_CTX_STRING_OPTION(client_npn_protocols) IMPLEMENT_SSL_TEST_CTX_STRING_OPTION(server_npn_protocols) IMPLEMENT_SSL_TEST_CTX_STRING_OPTION(server2_npn_protocols) @@ -303,6 +304,7 @@ IMPLEMENT_SSL_TEST_CTX_STRING_OPTION(client_alpn_protocols) IMPLEMENT_SSL_TEST_CTX_STRING_OPTION(server_alpn_protocols) IMPLEMENT_SSL_TEST_CTX_STRING_OPTION(server2_alpn_protocols) IMPLEMENT_SSL_TEST_CTX_STRING_OPTION(expected_alpn_protocol) +#endif /***********************/ /* Handshake mode */ @@ -372,6 +374,7 @@ static const ssl_test_ctx_option ssl_test_ctx_options[] = { { "ServerNameCallback", &parse_servername_callback }, { "SessionTicketExpected", &parse_session_ticket }, { "Method", &parse_test_method }, +#ifndef OPENSSL_NO_NEXTPROTONEG { "ClientNPNProtocols", &parse_client_npn_protocols }, { "ServerNPNProtocols", &parse_server_npn_protocols }, { "Server2NPNProtocols", &parse_server2_npn_protocols }, @@ -380,6 +383,7 @@ static const ssl_test_ctx_option ssl_test_ctx_options[] = { { "ServerALPNProtocols", &parse_server_alpn_protocols }, { "Server2ALPNProtocols", &parse_server2_alpn_protocols }, { "ExpectedALPNProtocol", &parse_expected_alpn_protocol }, +#endif { "HandshakeMode", &parse_handshake_mode }, { "ResumptionExpected", &parse_resumption_expected }, }; @@ -399,6 +403,7 @@ SSL_TEST_CTX *SSL_TEST_CTX_new() void SSL_TEST_CTX_free(SSL_TEST_CTX *ctx) { +#ifndef OPENSSL_NO_NEXTPROTONEG OPENSSL_free(ctx->client_npn_protocols); OPENSSL_free(ctx->server_npn_protocols); OPENSSL_free(ctx->server2_npn_protocols); @@ -407,6 +412,7 @@ void SSL_TEST_CTX_free(SSL_TEST_CTX *ctx) OPENSSL_free(ctx->server2_alpn_protocols); OPENSSL_free(ctx->expected_npn_protocol); OPENSSL_free(ctx->expected_alpn_protocol); +#endif OPENSSL_free(ctx); } |