feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix test build errors with NO_BIO

Browse Source
This commit is contained in:
Eric Blankenhorn
2021-10-14 09:37:01 -05:00
parent 1396c46281
commit 61bab6f68b
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/api.c
View File

@ -2729,7 +2729,7 @@ static void test_ED448(void)
static void test_wolfSSL_EVP_PKEY_print_public(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* rbio = NULL;
WOLFSSL_BIO* wbio = 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) && \ #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_RSA) && \
!defined(NO_WOLFSSL_CLIENT) && !defined(NO_DH) && !defined(NO_AES) && \ !defined(NO_WOLFSSL_CLIENT) && !defined(NO_DH) && !defined(NO_AES) && \
defined(HAVE_IO_TESTS_DEPENDENCIES) && !defined(SINGLE_THREADED) && \ 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 */ /* create certificate with version 2 */
static void test_set_x509_badversion(WOLFSSL_CTX* ctx) 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) && \ #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_RSA) && \
!defined(NO_WOLFSSL_CLIENT) && !defined(NO_DH) && !defined(NO_AES) && \ !defined(NO_WOLFSSL_CLIENT) && !defined(NO_DH) && !defined(NO_AES) && \
defined(HAVE_IO_TESTS_DEPENDENCIES) && !defined(SINGLE_THREADED) && \ 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; tcp_ready ready;
func_args server_args; func_args server_args;
func_args client_args; func_args client_args;
@ -29002,7 +29002,8 @@ static void test_wolfSSL_X509_NAME(void)
static void test_wolfSSL_X509_NAME_hash(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; BIO* bio;
X509* x509 = NULL; X509* x509 = NULL;
@ -29985,7 +29986,8 @@ static void test_wolfSSL_private_keys(void)
static void test_wolfSSL_PEM_read_PrivateKey(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; XFILE file;
const char* fname = "./certs/server-key.pem"; const char* fname = "./certs/server-key.pem";
EVP_PKEY* pkey; 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) static void test_wolfSSL_CTX_add_extra_chain_cert(void)
{ {
#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \ #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 caFile[] = "./certs/client-ca.pem";
char clientFile[] = "./certs/client-cert.pem"; char clientFile[] = "./certs/client-cert.pem";
SSL_CTX* ctx; SSL_CTX* ctx;
@ -31554,7 +31556,7 @@ static void test_wolfSSL_CTX_add_extra_chain_cert(void)
SSL_CTX_free(ctx); SSL_CTX_free(ctx);
printf(resultFmt, passed); printf(resultFmt, passed);
#endif /* defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \ #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) static void test_wolfSSL_a2i_ASN1_INTEGER(void)
{ {
#ifdef OPENSSL_EXTRA #if defined(OPENSSL_EXTRA) && !defined(NO_BIO)
BIO *bio, *out; BIO *bio, *out;
ASN1_INTEGER* ai; ASN1_INTEGER* ai;
char buf[] = "123456\n12345\n112345678912345678901234567890\n"; 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) static void test_wolfSSL_X509_load_crl_file(void)
{ {
#if defined(OPENSSL_EXTRA) && defined(HAVE_CRL) && !defined(NO_FILESYSTEM) && \ #if defined(OPENSSL_EXTRA) && defined(HAVE_CRL) && !defined(NO_FILESYSTEM) && \
!defined(NO_RSA) !defined(NO_RSA) && !defined(NO_BIO)
int i; int i;
char pem[][100] = { char pem[][100] = {
"./certs/crl/crl.pem", "./certs/crl/crl.pem",