wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6742 from embhorn/zd16187_2

Browse Source 
Fixes for NO_FILESYSTEM and NO_BIO config
This commit is contained in:
David Garske
2023-09-19 11:19:07 -07:00
committed by GitHub
parent 5830f921fa 7262a30074
commit b72d02dd88
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/server/server.c
View File

@ -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;

6
tests/api.c
View File

@ -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;
@ -23888,7 +23888,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;
@ -66300,11 +66300,13 @@ TEST_CASE testCases[] = {
TEST_DECL(test_wolfSSL_dtls_stateless),
TEST_DECL(test_generate_cookie),
#ifndef NO_BIO
/* Can't memory test as server hangs. */
TEST_DECL(test_wolfSSL_BIO_connect),
/* Can't memory test as server Asserts in thread. */
TEST_DECL(test_wolfSSL_BIO_accept),
TEST_DECL(test_wolfSSL_BIO_tls),
#endif
#if defined(HAVE_PK_CALLBACKS) && !defined(WOLFSSL_NO_TLS12)
TEST_DECL(test_DhCallbacks),