diff options
| author | Emilia Kasper <emilia@openssl.org> | 2016-08-05 17:17:00 +0200 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2016-08-08 12:19:31 +0200 |
| commit | 7b7cea6d712c35d52b4e2031c8a9410866e2aab6 (patch) | |
| tree | ae64e02af858e36d5b6ad998f8a8652b92db712a /test/ssl_test.c | |
| parent | 9f48bbacd8cac8d08dff146db438ab3e19908a7a (diff) | |
Fix ALPN tests when NPN is off
OPENSSL_NO_NEXTPROTONEG only disables NPN, not ALPN
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'test/ssl_test.c')
| -rw-r--r-- | test/ssl_test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/ssl_test.c b/test/ssl_test.c index e4951f4fec..fcf48bc370 100644 --- a/test/ssl_test.c +++ b/test/ssl_test.c @@ -159,6 +159,7 @@ static int check_npn(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) result->client_npn_negotiated); return ret; } +#endif static int check_alpn(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) { @@ -171,7 +172,6 @@ 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) { @@ -205,8 +205,8 @@ static int check_test(HANDSHAKE_RESULT *result, SSL_TEST_CTX *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_alpn(result, test_ctx); ret &= check_resumption(result, test_ctx); } return ret; |