Fix tests for no-nextprotoneg

[openssl.git] / test / ssl_test_ctx.c

diff --git a/test/ssl_test_ctx.c b/test/ssl_test_ctx.c
index 24b11e5..4d2bdba 100644 (file)
--- a/test/ssl_test_ctx.c
+++ b/test/ssl_test_ctx.c
@@ -295,7 +295,6 @@ 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)
@@ -304,7 +303,6 @@ 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      */
@@ -374,7 +372,6 @@ 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 },
@@ -383,7 +380,6 @@ 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 },
 };