Commit ee94aeee authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix tests for no-nextprotoneg 



Fix the 80-test_ssl_test_ctx and 80-test_ssl_new tests when used with the
no-nextprotoneg option

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 700b8145

test/recipes/80-test_ssl_new.t

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ my %conf_dependent_tests = ( 
my %skip = (

  "07-dtls-protocol-version.conf" => $no_dtls,

  "08-npn.conf" => $no_tls || $no_npn,

  "09-alpn.conf" => $no_tls || $no_npn,

  "10-resumption.conf" => disabled("tls1_1") || disabled("tls1_2"),

  "11-dtls_resumption.conf" => disabled("dtls1") || disabled("dtls1_2"),

);

test/ssl_test_ctx.c

+0 −4
Original line number Diff line number Diff line
@@ -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 },

};

test/ssl_test_ctx.h

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ typedef struct ssl_test_ctx { 
    ssl_session_ticket_t session_ticket_expected;

    /* Whether the server/client CTX should use DTLS or TLS. */

    ssl_test_method_t method;

#ifndef OPENSSL_NO_NEXTPROTONEG



    /*

     * NPN and ALPN protocols supported by the client, server, and second

     * (SNI) server. A comma-separated list.
@@ -105,7 +105,7 @@ typedef struct ssl_test_ctx { 
    char *server_alpn_protocols;

    char *server2_alpn_protocols;

    char *expected_alpn_protocol;

#endif



    /* Whether to test a resumed/renegotiated handshake. */

    ssl_handshake_mode_t handshake_mode;

    /* Whether the second handshake is resumed or a full handshake (boolean). */