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.c | |
parent | 087d3e89932e00eede95353fbd988e2752bc2468 (diff) |
Fix various no-*s.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/ssl_test.c')
-rw-r--r-- | test/ssl_test.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/ssl_test.c b/test/ssl_test.c index b28d308d08..48846ae32e 100644 --- a/test/ssl_test.c +++ b/test/ssl_test.c @@ -150,6 +150,7 @@ static int check_session_ticket(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx return 1; } +#ifndef OPENSSL_NO_NEXTPROTONEG static int check_npn(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) { int ret = 1; @@ -173,6 +174,7 @@ static int check_alpn(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) result->client_alpn_negotiated); return ret; } +#endif static int check_resumption(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) { @@ -204,8 +206,10 @@ static int check_test(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) ret &= check_servername(result, test_ctx); ret &= check_session_ticket(result, test_ctx); ret &= (result->session_ticket_do_not_call == 0); +#ifndef OPENSSL_NO_NEXTPROTONEG ret &= check_npn(result, test_ctx); ret &= check_alpn(result, test_ctx); +#endif ret &= check_resumption(result, test_ctx); } return ret; |