wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 20:54:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7230 from anhu/tests_gating

Browse Source 
Fixup some gating in the tests.
This commit is contained in:
JacobBarthelmeh
2024-02-22 01:24:55 +07:00
committed by GitHub
parent fd2b80ec22 00c3f5be2e
commit 88e7d47930
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/test/test.c
View File

@@ -15755,7 +15755,8 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t memory_test(void)
#ifdef WOLFSSL_CERT_GEN #ifdef WOLFSSL_CERT_GEN
static const char* rsaCaCertFile = CERT_ROOT "ca-cert.pem"; static const char* rsaCaCertFile = CERT_ROOT "ca-cert.pem";
#endif #endif
#if defined(WOLFSSL_ALT_NAMES) || defined(HAVE_PKCS7) #if (defined(WOLFSSL_ALT_NAMES) || defined(HAVE_PKCS7)) \
&& !defined(NO_ASN_TIME)
static const char* rsaCaCertDerFile = CERT_ROOT "ca-cert.der"; static const char* rsaCaCertDerFile = CERT_ROOT "ca-cert.der";
#endif #endif
#ifdef HAVE_PKCS7 #ifdef HAVE_PKCS7
@@ -18109,8 +18110,7 @@ static wc_test_ret_t rsa_certgen_test(RsaKey* key, RsaKey* keypub, WC_RNG* rng,
if (ret < 0) { if (ret < 0) {
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit_rsa); ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit_rsa);
} }
#if defined(WOLFSSL_ALT_NAMES) || defined(HAVE_PKCS7)
#ifdef WOLFSSL_ALT_NAMES
/* Get CA Cert for testing */ /* Get CA Cert for testing */
#ifdef USE_CERT_BUFFERS_1024 #ifdef USE_CERT_BUFFERS_1024
XMEMCPY(tmp, ca_cert_der_1024, sizeof_ca_cert_der_1024); XMEMCPY(tmp, ca_cert_der_1024, sizeof_ca_cert_der_1024);
@@ -18129,6 +18129,7 @@ static wc_test_ret_t rsa_certgen_test(RsaKey* key, RsaKey* keypub, WC_RNG* rng,
ERROR_OUT(WC_TEST_RET_ENC_ERRNO, exit_rsa); ERROR_OUT(WC_TEST_RET_ENC_ERRNO, exit_rsa);
#endif /* USE_CERT_BUFFERS */ #endif /* USE_CERT_BUFFERS */
#if defined(WOLFSSL_ALT_NAMES)
#if !defined(NO_FILESYSTEM) && !defined(USE_CERT_BUFFERS_1024) && \ #if !defined(NO_FILESYSTEM) && !defined(USE_CERT_BUFFERS_1024) && \
!defined(USE_CERT_BUFFERS_2048) && !defined(NO_ASN) !defined(USE_CERT_BUFFERS_2048) && !defined(NO_ASN)
ret = wc_SetAltNames(myCert, rsaCaCertFile); ret = wc_SetAltNames(myCert, rsaCaCertFile);
@@ -18150,7 +18151,8 @@ static wc_test_ret_t rsa_certgen_test(RsaKey* key, RsaKey* keypub, WC_RNG* rng,
if (ret < 0) if (ret < 0)
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit_rsa); ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit_rsa);
#endif #endif
#endif /* WOLFSSL_ALT_NAMES */ #endif /* WOLFSSL_ALT_NAMES */
#endif /* WOLFSSL_ALT_NAMES || HAVE_PKCS7 */
/* Get CA Key */ /* Get CA Key */
#ifdef USE_CERT_BUFFERS_1024 #ifdef USE_CERT_BUFFERS_1024