Skip to content

fix for test case macro guards #11525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philljj merged 1 commit into from
Sep 23, 2026
+18 −6
Merged

fix for test case macro guards #11525

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions tests/api/test_tls_parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ int test_TLSX_SupportedVersions_parse(void)
* WOLFSSL_LOCAL: called directly (guarded). */
#if defined(WOLFSSL_TLS13) && !defined(NO_TLS) && !defined(NO_WOLFSSL_SERVER) && !defined(NO_WOLFSSL_CLIENT) && defined(WOLFSSL_TEST_STATIC_BUILD) && \
defined(HAVE_TLS_EXTENSIONS) && \
!defined(WOLFSSL_NO_TLS12)
!defined(WOLFSSL_NO_TLS12) && (!defined(NO_RSA) || defined(HAVE_ECC))
Comment thread
JacobBarthelmeh marked this conversation as resolved.
WOLFSSL_CTX* ctx = NULL;
WOLFSSL* ssl = NULL;
byte ext[8 + MAX_SV_EXT_LEN];
Expand Down Expand Up @@ -1449,13 +1449,23 @@ int test_TLSX_CSR_parse(void)
int test_TLSX_PointFormat_parse(void)
{
EXPECT_DECLS;
#if (defined(HAVE_SUPPORTED_CURVES) && !defined(NO_TLS) && \
!defined(NO_WOLFSSL_SERVER) && (!defined(NO_RSA) || defined(HAVE_ECC)) && \
defined(HAVE_TLS_EXTENSIONS) && !defined(WOLFSSL_NO_TLS12)) || \
(defined(WOLFSSL_TLS13) && defined(HAVE_SUPPORTED_CURVES) && \
!defined(WOLFSSL_NO_SERVER_GROUPS_EXT) && !defined(NO_TLS) && \
!defined(NO_WOLFSSL_SERVER) && defined(WOLFSSL_TEST_STATIC_BUILD) && \
(!defined(NO_RSA) || defined(HAVE_ECC)) && \
((!defined(NO_DH) && !defined(WOLFSSL_NO_TLS12)) || \
defined(HAVE_CURVE25519)))
Comment thread
JacobBarthelmeh marked this conversation as resolved.
byte ext[16];
word16 extLen;
#endif
#if defined(HAVE_SUPPORTED_CURVES) && !defined(NO_TLS) && !defined(NO_WOLFSSL_SERVER) && (!defined(NO_RSA) || defined(HAVE_ECC)) && \
defined(HAVE_TLS_EXTENSIONS) && \
!defined(WOLFSSL_NO_TLS12)
WOLFSSL_CTX* ctx = NULL;
WOLFSSL* ssl = NULL;
byte ext[16];
word16 extLen;

ctx = test_tls_parse_server_ctx(wolfTLSv1_2_server_method());
ExpectNotNull(ctx);
Expand Down Expand Up @@ -1490,7 +1500,8 @@ int test_TLSX_PointFormat_parse(void)

#if defined(WOLFSSL_TLS13) && defined(HAVE_SUPPORTED_CURVES) && \
!defined(WOLFSSL_NO_SERVER_GROUPS_EXT) && !defined(NO_TLS) && \
!defined(NO_WOLFSSL_SERVER) && defined(WOLFSSL_TEST_STATIC_BUILD)
!defined(NO_WOLFSSL_SERVER) && defined(WOLFSSL_TEST_STATIC_BUILD) && \
(!defined(NO_RSA) || defined(HAVE_ECC))
/* TLSX_SupportedCurve_Preferred(): checkSupported gating and the
* TLSX_IsGroupSupported() result, driven by a raw (unfiltered) offered
* groups list -- TLSX_SupportedCurve_Parse() records whatever the peer
Expand Down Expand Up @@ -1557,7 +1568,8 @@ int test_TLSX_PointFormat_parse(void)
#endif

#if defined(HAVE_SUPPORTED_CURVES) && !defined(NO_TLS) && \
!defined(NO_WOLFSSL_SERVER) && defined(WOLFSSL_TEST_STATIC_BUILD)
!defined(NO_WOLFSSL_SERVER) && defined(WOLFSSL_TEST_STATIC_BUILD) && \
(!defined(NO_RSA) || defined(HAVE_ECC))
/* TLSX_PointFormat_ValidateResponse(): reached while sizing/writing a
* ServerHello, through the WOLFSSL_LOCAL TLSX_GetResponseSize() rather
* than TLSX_Parse() (there is no wire input on this side). A cipher
Expand Down Expand Up @@ -2204,7 +2216,7 @@ int test_TLSX_KeyShare_negotiate(void)
{
EXPECT_DECLS;
#if defined(WOLFSSL_TLS13) && defined(HAVE_SUPPORTED_CURVES) && !defined(NO_WOLFSSL_SERVER) && !defined(NO_WOLFSSL_CLIENT) && defined(WOLFSSL_TEST_STATIC_BUILD) && \
defined(HAVE_TLS_EXTENSIONS)
defined(HAVE_TLS_EXTENSIONS) && (!defined(NO_RSA) || defined(HAVE_ECC))
WOLFSSL_CTX* ctx = NULL;
WOLFSSL* ssl = NULL;

Expand Down
Loading