WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

tests/api.c: fixes for compilability re NO_BIO

pull/3474/head
Daniel Pouzzner 2020-11-05 22:19:16 -06:00
parent 4030523eb5
commit dcff103c84
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/api.c
View File

@ -26183,16 +26183,14 @@ static void test_DSA_do_sign_verify(void)
static void test_wolfSSL_tmp_dh(void) static void test_wolfSSL_tmp_dh(void)
{ {
#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && !defined(NO_FILESYSTEM) && \ #if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && !defined(NO_FILESYSTEM) && \
!defined(NO_DSA) && !defined(NO_RSA) && !defined(NO_DH) !defined(NO_DSA) && !defined(NO_RSA) && !defined(NO_DH) && !defined(NO_BIO)
byte buffer[6000]; byte buffer[6000];
char file[] = "./certs/dsaparams.pem"; char file[] = "./certs/dsaparams.pem";
XFILE f; XFILE f;
int bytes; int bytes;
#ifndef NO_BIO
DSA* dsa; DSA* dsa;
DH* dh; DH* dh;
BIO* bio; BIO* bio;
#endif
SSL* ssl; SSL* ssl;
SSL_CTX* ctx; SSL_CTX* ctx;
@ -26212,7 +26210,6 @@ static void test_wolfSSL_tmp_dh(void)
bytes = (int)XFREAD(buffer, 1, sizeof(buffer), f); bytes = (int)XFREAD(buffer, 1, sizeof(buffer), f);
XFCLOSE(f); XFCLOSE(f);
#ifndef NO_BIO
bio = BIO_new_mem_buf((void*)buffer, bytes); bio = BIO_new_mem_buf((void*)buffer, bytes);
AssertNotNull(bio); AssertNotNull(bio);
@ -26232,7 +26229,6 @@ static void test_wolfSSL_tmp_dh(void)
BIO_free(bio); BIO_free(bio);
DSA_free(dsa); DSA_free(dsa);
DH_free(dh); DH_free(dh);
#endif /* !NO_BIO */
SSL_free(ssl); SSL_free(ssl);
SSL_CTX_free(ctx); SSL_CTX_free(ctx);
@ -29999,7 +29995,9 @@ static void test_wolfSSL_X509_NAME_ENTRY(void)
#ifdef WOLFSSL_CERT_REQ #ifdef WOLFSSL_CERT_REQ
{ {
X509_REQ* req; X509_REQ* req;
#ifndef NO_BIO
BIO* bReq; BIO* bReq;
#endif
AssertNotNull(req = AssertNotNull(req =
wolfSSL_X509_load_certificate_file(cliCertFile, SSL_FILETYPE_PEM)); wolfSSL_X509_load_certificate_file(cliCertFile, SSL_FILETYPE_PEM));
@ -33075,17 +33073,15 @@ static void test_wolfSSL_CTX_ctrl(void)
char clientFile[] = "./certs/client-cert.pem"; char clientFile[] = "./certs/client-cert.pem";
SSL_CTX* ctx; SSL_CTX* ctx;
X509* x509 = NULL; X509* x509 = NULL;
#if !defined(NO_DH) && !defined(NO_DSA) #if !defined(NO_DH) && !defined(NO_DSA) && !defined(NO_BIO)
byte buf[6000]; byte buf[6000];
char file[] = "./certs/dsaparams.pem"; char file[] = "./certs/dsaparams.pem";
XFILE f; XFILE f;
int bytes; int bytes;
#ifndef NO_BIO
BIO* bio; BIO* bio;
DSA* dsa; DSA* dsa;
DH* dh; DH* dh;
#endif #endif
#endif
#ifdef HAVE_ECC #ifdef HAVE_ECC
WOLFSSL_EC_KEY* ecKey; WOLFSSL_EC_KEY* ecKey;
#endif #endif
@ -33100,14 +33096,13 @@ static void test_wolfSSL_CTX_ctrl(void)
x509 = wolfSSL_X509_load_certificate_file(clientFile, WOLFSSL_FILETYPE_PEM); x509 = wolfSSL_X509_load_certificate_file(clientFile, WOLFSSL_FILETYPE_PEM);
AssertNotNull(x509); AssertNotNull(x509);
#if !defined(NO_DH) && !defined(NO_DSA) #if !defined(NO_DH) && !defined(NO_DSA) && !defined(NO_BIO)
/* Initialize DH */ /* Initialize DH */
f = XFOPEN(file, "rb"); f = XFOPEN(file, "rb");
AssertTrue((f != XBADFILE)); AssertTrue((f != XBADFILE));
bytes = (int)XFREAD(buf, 1, sizeof(buf), f); bytes = (int)XFREAD(buf, 1, sizeof(buf), f);
XFCLOSE(f); XFCLOSE(f);
#ifndef NO_BIO
bio = BIO_new_mem_buf((void*)buf, bytes); bio = BIO_new_mem_buf((void*)buf, bytes);
AssertNotNull(bio); AssertNotNull(bio);
@ -33117,7 +33112,6 @@ static void test_wolfSSL_CTX_ctrl(void)
dh = wolfSSL_DSA_dup_DH(dsa); dh = wolfSSL_DSA_dup_DH(dsa);
AssertNotNull(dh); AssertNotNull(dh);
#endif #endif
#endif
#ifdef HAVE_ECC #ifdef HAVE_ECC
/* Initialize WOLFSSL_EC_KEY */ /* Initialize WOLFSSL_EC_KEY */
AssertNotNull(ecKey = wolfSSL_EC_KEY_new()); AssertNotNull(ecKey = wolfSSL_EC_KEY_new());
@ -33187,7 +33181,7 @@ static void test_wolfSSL_CTX_ctrl(void)
/* Test with SSL_CTRL_SET_TMP_DH /* Test with SSL_CTRL_SET_TMP_DH
* wolfSSL_CTX_ctrl should succesffuly call wolfSSL_SSL_CTX_set_tmp_dh * wolfSSL_CTX_ctrl should succesffuly call wolfSSL_SSL_CTX_set_tmp_dh
*/ */
#if !defined(NO_DH) && !defined(NO_DSA) #if !defined(NO_DH) && !defined(NO_DSA) && !defined(NO_BIO)
AssertIntEQ((int)wolfSSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH,0,dh), AssertIntEQ((int)wolfSSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH,0,dh),
SSL_SUCCESS); SSL_SUCCESS);
#endif #endif