wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Properly check the defined() combinations that make ALPN and SNI available for testing.

Browse Source
This commit is contained in:
Stefan Eissing
2022-10-20 09:21:36 +02:00
parent f1cf96846a
commit 057fdd30d3
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/quic.c
View File

@@ -1174,8 +1174,18 @@ static int test_quic_server_hello(int verbose) {
return ret; return ret;
} }
#if defined(HAVE_ALPN) && defined(HAVE_SNI) /* This has gotten a bit out of hand. */
#if (defined(OPENSSL_ALL) || (defined(OPENSSL_EXTRA) && \
(defined(HAVE_STUNNEL) || defined(WOLFSSL_NGINX) || \
defined(HAVE_LIGHTY) || defined(WOLFSSL_HAPROXY) || \
defined(WOLFSSL_OPENSSH) || defined(HAVE_SBLIM_SFCB)))) \
&& defined(HAVE_ALPN) && defined(HAVE_SNI)
#define REALLY_HAVE_ALPN_AND_SNI
#else
#undef REALLY_HAVE_ALPN_AND_SNI
#endif
#ifdef REALLY_HAVE_ALPN_AND_SNI
static int inspect_SNI(WOLFSSL *ssl, int *ad, void *baton) static int inspect_SNI(WOLFSSL *ssl, int *ad, void *baton)
{ {
char *stripe = baton; char *stripe = baton;
@@ -1253,7 +1263,7 @@ static int test_quic_alpn(int verbose) {
return ret; return ret;
} }
#endif /* defined(HAVE_ALPN) && defined(HAVE_SNI) */ #endif /* REALLY_HAVE_ALPN_AND_SNI */
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
@@ -1618,9 +1628,9 @@ int QuicTest(void)
if ((ret = test_quic_crypt()) != 0) goto leave; if ((ret = test_quic_crypt()) != 0) goto leave;
if ((ret = test_quic_client_hello(verbose)) != 0) goto leave; if ((ret = test_quic_client_hello(verbose)) != 0) goto leave;
if ((ret = test_quic_server_hello(verbose)) != 0) goto leave; if ((ret = test_quic_server_hello(verbose)) != 0) goto leave;
#if defined(HAVE_ALPN) && defined(HAVE_SNI) #ifdef REALLY_HAVE_ALPN_AND_SNI
if ((ret = test_quic_alpn(verbose)) != 0) goto leave; if ((ret = test_quic_alpn(verbose)) != 0) goto leave;
#endif /* defined(HAVE_ALPN) && defined(HAVE_SNI) */ #endif /* REALLY_HAVE_ALPN_AND_SNI */
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
if ((ret = test_quic_key_share(verbose)) != 0) goto leave; if ((ret = test_quic_key_share(verbose)) != 0) goto leave;
if ((ret = test_quic_resumption(verbose)) != 0) goto leave; if ((ret = test_quic_resumption(verbose)) != 0) goto leave;