diff options
| author | Matt Caswell <matt@openssl.org> | 2016-08-02 10:19:56 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-08-02 10:19:56 +0100 |
| commit | ee94aeee7d3e246adae59e1d0b2a59acc44ae9b5 (patch) | |
| tree | 524c309dee16c0d6475abad9aa2811bc500b1e3e /test/ssl_test_ctx.h | |
| parent | 700b814549c8c158c82466116cfc545b00f647c3 (diff) | |
| download | openssl-new-ee94aeee7d3e246adae59e1d0b2a59acc44ae9b5.tar.gz | |
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: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'test/ssl_test_ctx.h')
| -rw-r--r-- | test/ssl_test_ctx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/ssl_test_ctx.h b/test/ssl_test_ctx.h index 83850e4dd8..047ea8b9cd 100644 --- a/test/ssl_test_ctx.h +++ b/test/ssl_test_ctx.h @@ -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). */ |