From 61bab6f68ba5dc23fbfb91f165bc5cd5efe48dfd Mon Sep 17 00:00:00 2001 From: Eric Blankenhorn Date: Thu, 14 Oct 2021 09:37:01 -0500 Subject: [PATCH] Fix test build errors with NO_BIO --- tests/api.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/api.c b/tests/api.c index 15c3ec4c3..21bb0dc55 100644 --- a/tests/api.c +++ b/tests/api.c @@ -2729,7 +2729,7 @@ static void test_ED448(void) static void test_wolfSSL_EVP_PKEY_print_public(void) { -#if defined(OPENSSL_EXTRA) +#if defined(OPENSSL_EXTRA) && !defined(NO_BIO) WOLFSSL_BIO* rbio = NULL; WOLFSSL_BIO* wbio = NULL; @@ -8073,7 +8073,7 @@ static void test_wolfSSL_X509_verify(void) #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_RSA) && \ !defined(NO_WOLFSSL_CLIENT) && !defined(NO_DH) && !defined(NO_AES) && \ defined(HAVE_IO_TESTS_DEPENDENCIES) && !defined(SINGLE_THREADED) && \ - defined(OPENSSL_EXTRA) && defined(WOLFSSL_CERT_GEN) + defined(OPENSSL_EXTRA) && defined(WOLFSSL_CERT_GEN) && !defined(NO_BIO) /* create certificate with version 2 */ static void test_set_x509_badversion(WOLFSSL_CTX* ctx) { @@ -8157,7 +8157,7 @@ static void test_wolfSSL_X509_TLS_version(void) #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_RSA) && \ !defined(NO_WOLFSSL_CLIENT) && !defined(NO_DH) && !defined(NO_AES) && \ defined(HAVE_IO_TESTS_DEPENDENCIES) && !defined(SINGLE_THREADED) && \ - defined(OPENSSL_EXTRA) && defined(WOLFSSL_CERT_GEN) + defined(OPENSSL_EXTRA) && defined(WOLFSSL_CERT_GEN) && !defined(NO_BIO) tcp_ready ready; func_args server_args; func_args client_args; @@ -29002,7 +29002,8 @@ static void test_wolfSSL_X509_NAME(void) static void test_wolfSSL_X509_NAME_hash(void) { -#if defined(OPENSSL_EXTRA) && !defined(NO_FILESYSTEM) && !defined(NO_RSA) && !defined(NO_SHA) +#if defined(OPENSSL_EXTRA) && !defined(NO_FILESYSTEM) \ + && !defined(NO_RSA) && !defined(NO_SHA) && !defined(NO_BIO) BIO* bio; X509* x509 = NULL; @@ -29985,7 +29986,8 @@ static void test_wolfSSL_private_keys(void) static void test_wolfSSL_PEM_read_PrivateKey(void) { -#if defined(OPENSSL_EXTRA) && !defined(NO_RSA) && !defined(NO_FILESYSTEM) +#if defined(OPENSSL_EXTRA) && !defined(NO_RSA) \ + && !defined(NO_FILESYSTEM) && !defined(NO_BIO) XFILE file; const char* fname = "./certs/server-key.pem"; EVP_PKEY* pkey; @@ -31460,7 +31462,7 @@ static void test_wolfSSL_EVP_MD_ecc_signing(void) static void test_wolfSSL_CTX_add_extra_chain_cert(void) { #if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \ - !defined(NO_FILESYSTEM) && !defined(NO_RSA) + !defined(NO_FILESYSTEM) && !defined(NO_RSA) && !defined(NO_BIO) char caFile[] = "./certs/client-ca.pem"; char clientFile[] = "./certs/client-cert.pem"; SSL_CTX* ctx; @@ -31554,7 +31556,7 @@ static void test_wolfSSL_CTX_add_extra_chain_cert(void) SSL_CTX_free(ctx); printf(resultFmt, passed); #endif /* defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \ - !defined(NO_FILESYSTEM) && !defined(NO_RSA) */ + !defined(NO_FILESYSTEM) && !defined(NO_RSA) && !defined (NO_BIO) */ } @@ -34588,7 +34590,7 @@ static void test_wolfSSL_ASN1_BIT_STRING(void) static void test_wolfSSL_a2i_ASN1_INTEGER(void) { -#ifdef OPENSSL_EXTRA +#if defined(OPENSSL_EXTRA) && !defined(NO_BIO) BIO *bio, *out; ASN1_INTEGER* ai; char buf[] = "123456\n12345\n112345678912345678901234567890\n"; @@ -46669,7 +46671,7 @@ static void test_wolfSSL_X509_CRL(void) static void test_wolfSSL_X509_load_crl_file(void) { #if defined(OPENSSL_EXTRA) && defined(HAVE_CRL) && !defined(NO_FILESYSTEM) && \ - !defined(NO_RSA) + !defined(NO_RSA) && !defined(NO_BIO) int i; char pem[][100] = { "./certs/crl/crl.pem",