From 7262a3007471314dd18013860e34d78da228828c Mon Sep 17 00:00:00 2001 From: Eric Blankenhorn Date: Wed, 30 Aug 2023 13:54:49 -0500 Subject: [PATCH] Fixes for NO_FILESYSTEM config --- examples/server/server.c | 8 ++++---- tests/api.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/server/server.c b/examples/server/server.c index e01cf3151..504aafde6 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -1433,7 +1433,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args) #else int doCliCertCheck = 0; #endif -#ifdef HAVE_CRL +#if defined(HAVE_CRL) && !defined(NO_FILESYSTEM) int disableCRL = 0; #endif int useAnyAddr = 0; @@ -1545,7 +1545,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args) int useDtlsCID = 0; char dtlsCID[DTLS_CID_BUFFER_SIZE] = { 0 }; #endif /* WOLFSSL_DTLS_CID */ -#ifdef HAVE_CRL +#if defined(HAVE_CRL) && !defined(NO_FILESYSTEM) char* crlDir = NULL; #endif @@ -1710,7 +1710,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args) break; case 'V' : - #ifdef HAVE_CRL + #if defined(HAVE_CRL) && !defined(NO_FILESYSTEM) disableCRL = 1; #endif break; @@ -2299,7 +2299,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args) #endif break; case 265: -#ifdef HAVE_CRL +#if defined(HAVE_CRL) && !defined(NO_FILESYSTEM) crlDir = myoptarg; #endif break; diff --git a/tests/api.c b/tests/api.c index 8adfc9bb2..00c7b0414 100644 --- a/tests/api.c +++ b/tests/api.c @@ -1010,7 +1010,7 @@ static int test_wolfSSL_CTX_set_cipher_list_bytes(void) EXPECT_DECLS; #if (defined(OPENSSL_EXTRA) || defined(WOLFSSL_SET_CIPHER_BYTES)) && \ (!defined(NO_WOLFSSL_CLIENT) || !defined(NO_WOLFSSL_SERVER)) && \ - (!defined(NO_RSA) || defined(HAVE_ECC)) + (!defined(NO_RSA) || defined(HAVE_ECC)) && !defined(NO_FILESYSTEM) const char* testCertFile; const char* testKeyFile; WOLFSSL_CTX* ctx = NULL; @@ -23866,7 +23866,7 @@ static int test_ToTraditional(void) EXPECT_DECLS; #if !defined(NO_ASN) && (defined(HAVE_PKCS8) || defined(HAVE_PKCS12)) && \ (defined(WOLFSSL_TEST_CERT) || defined(OPENSSL_EXTRA) || \ - defined(OPENSSL_EXTRA_X509_SMALL)) + defined(OPENSSL_EXTRA_X509_SMALL)) && !defined(NO_FILESYSTEM) XFILE f = XBADFILE; byte input[TWOK_BUF]; word32 sz;