Fix build with either NO_WOLFSSL_SERVER or NO_WOLFSSL_CLIENT defined.

This commit is contained in:
David Garske
2017-06-26 23:05:32 -07:00
parent 3bdf8b3cfd
commit 47cc3ffdbc
7 changed files with 148 additions and 122 deletions

View File

@@ -48,6 +48,8 @@
#include "examples/client/client.h" #include "examples/client/client.h"
#ifndef NO_WOLFSSL_CLIENT
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
static int devId = INVALID_DEVID; static int devId = INVALID_DEVID;
#endif #endif
@@ -59,17 +61,36 @@
* test mode and (2) the testsuite which uses this code and sets up the correct * test mode and (2) the testsuite which uses this code and sets up the correct
* port numbers when the internal thread using the server code using port 0. */ * port numbers when the internal thread using the server code using port 0. */
#ifdef WOLFSSL_CALLBACKS #ifdef WOLFSSL_CALLBACKS
int handShakeCB(HandShakeInfo*);
int timeoutCB(TimeoutInfo*);
Timeval timeout; Timeval timeout;
static int handShakeCB(HandShakeInfo* info)
{
(void)info;
return 0;
}
static int timeoutCB(TimeoutInfo* info)
{
(void)info;
return 0;
}
#endif #endif
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
int sessionTicketCB(WOLFSSL*, const unsigned char*, int, void*); static int sessionTicketCB(WOLFSSL* ssl,
const unsigned char* ticket, int ticketSz,
void* ctx)
{
(void)ssl;
(void)ticket;
printf("Session Ticket CB: ticketSz = %d, ctx = %s\n",
ticketSz, (char*)ctx);
return 0;
}
#endif #endif
static int NonBlockingSSL_Connect(WOLFSSL* ssl) static int NonBlockingSSL_Connect(WOLFSSL* ssl)
{ {
int ret; int ret;
@@ -2292,6 +2313,8 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
#endif #endif
} }
#endif /* !NO_WOLFSSL_CLIENT */
/* so overall tests can pull in test function */ /* so overall tests can pull in test function */
#ifndef NO_MAIN_DRIVER #ifndef NO_MAIN_DRIVER
@@ -2312,10 +2335,12 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
wolfSSL_Init(); wolfSSL_Init();
ChangeToWolfRoot(); ChangeToWolfRoot();
#ifndef NO_WOLFSSL_CLIENT
#ifdef HAVE_STACK_SIZE #ifdef HAVE_STACK_SIZE
StackSizeCheck(&args, client_test); StackSizeCheck(&args, client_test);
#else #else
client_test(&args); client_test(&args);
#endif
#endif #endif
wolfSSL_Cleanup(); wolfSSL_Cleanup();
@@ -2331,38 +2356,3 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
char* myoptarg = NULL; char* myoptarg = NULL;
#endif /* NO_MAIN_DRIVER */ #endif /* NO_MAIN_DRIVER */
#ifdef WOLFSSL_CALLBACKS
int handShakeCB(HandShakeInfo* info)
{
(void)info;
return 0;
}
int timeoutCB(TimeoutInfo* info)
{
(void)info;
return 0;
}
#endif
#ifdef HAVE_SESSION_TICKET
int sessionTicketCB(WOLFSSL* ssl,
const unsigned char* ticket, int ticketSz,
void* ctx)
{
(void)ssl;
(void)ticket;
printf("Session Ticket CB: ticketSz = %d, ctx = %s\n",
ticketSz, (char*)ctx);
return 0;
}
#endif

View File

@@ -52,6 +52,8 @@
#include "examples/echoclient/echoclient.h" #include "examples/echoclient/echoclient.h"
#ifndef NO_WOLFSSL_CLIENT
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
static int devId = INVALID_DEVID; static int devId = INVALID_DEVID;
#endif #endif
@@ -313,6 +315,7 @@ void echoclient_test(void* args)
((func_args*)args)->return_code = 0; ((func_args*)args)->return_code = 0;
} }
#endif /* !NO_WOLFSSL_CLIENT */
/* so overall tests can pull in test function */ /* so overall tests can pull in test function */
#ifndef NO_MAIN_DRIVER #ifndef NO_MAIN_DRIVER
@@ -338,7 +341,9 @@ void echoclient_test(void* args)
#ifndef CYASSL_TIRTOS #ifndef CYASSL_TIRTOS
ChangeToWolfRoot(); ChangeToWolfRoot();
#endif #endif
#ifndef NO_WOLFSSL_CLIENT
echoclient_test(&args); echoclient_test(&args);
#endif
CyaSSL_Cleanup(); CyaSSL_Cleanup();
@@ -351,5 +356,3 @@ void echoclient_test(void* args)
} }
#endif /* NO_MAIN_DRIVER */ #endif /* NO_MAIN_DRIVER */

View File

@@ -53,6 +53,8 @@
#include "examples/echoserver/echoserver.h" #include "examples/echoserver/echoserver.h"
#ifndef NO_WOLFSSL_SERVER
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
static int devId = INVALID_DEVID; static int devId = INVALID_DEVID;
#endif #endif
@@ -481,6 +483,8 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
#endif #endif
} }
#endif /* !NO_WOLFSSL_SERVER */
/* so overall tests can pull in test function */ /* so overall tests can pull in test function */
#ifndef NO_MAIN_DRIVER #ifndef NO_MAIN_DRIVER
@@ -504,7 +508,9 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
CyaSSL_Debugging_ON(); CyaSSL_Debugging_ON();
#endif #endif
ChangeToWolfRoot(); ChangeToWolfRoot();
#ifndef NO_WOLFSSL_SERVER
echoserver_test(&args); echoserver_test(&args);
#endif
CyaSSL_Cleanup(); CyaSSL_Cleanup();
#ifdef HAVE_WNR #ifdef HAVE_WNR
@@ -515,7 +521,4 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
return args.return_code; return args.return_code;
} }
#endif /* NO_MAIN_DRIVER */ #endif /* NO_MAIN_DRIVER */

View File

@@ -50,6 +50,8 @@
#include "examples/server/server.h" #include "examples/server/server.h"
#ifndef NO_WOLFSSL_SERVER
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
static int devId = INVALID_DEVID; static int devId = INVALID_DEVID;
#endif #endif
@@ -59,16 +61,6 @@
* test.h will write the actual port number into the ready file for use * test.h will write the actual port number into the ready file for use
* by the client. */ * by the client. */
#ifdef CYASSL_CALLBACKS
int srvHandShakeCB(HandShakeInfo*);
int srvTimeoutCB(TimeoutInfo*);
Timeval srvTo;
#endif
#ifndef NO_HANDSHAKE_DONE_CB
int myHsDoneCb(WOLFSSL* ssl, void* user_ctx);
#endif
static const char webServerMsg[] = static const char webServerMsg[] =
"HTTP/1.1 200 OK\n" "HTTP/1.1 200 OK\n"
"Content-Type: text/html\n" "Content-Type: text/html\n"
@@ -84,6 +76,38 @@ static const char webServerMsg[] =
"</html>\n"; "</html>\n";
int runWithErrors = 0; /* Used with -x flag to run err_sys vs. print errors */ int runWithErrors = 0; /* Used with -x flag to run err_sys vs. print errors */
#ifdef CYASSL_CALLBACKS
Timeval srvTo;
static int srvHandShakeCB(HandShakeInfo* info)
{
(void)info;
return 0;
}
static int srvTimeoutCB(TimeoutInfo* info)
{
(void)info;
return 0;
}
#endif
#ifndef NO_HANDSHAKE_DONE_CB
static int myHsDoneCb(WOLFSSL* ssl, void* user_ctx)
{
(void)user_ctx;
(void)ssl;
/* printf("Notified HandShake done\n"); */
/* return negative number to end TLS connection now */
return 0;
}
#endif
static void err_sys_ex(int out, const char* msg) static void err_sys_ex(int out, const char* msg)
{ {
if (out == 1) { /* if server is running w/ -x flag, print error w/o exit */ if (out == 1) { /* if server is running w/ -x flag, print error w/o exit */
@@ -1447,6 +1471,8 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
#endif #endif
} }
#endif /* !NO_WOLFSSL_SERVER */
/* so overall tests can pull in test function */ /* so overall tests can pull in test function */
#ifndef NO_MAIN_DRIVER #ifndef NO_MAIN_DRIVER
@@ -1470,11 +1496,16 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
CyaSSL_Init(); CyaSSL_Init();
ChangeToWolfRoot(); ChangeToWolfRoot();
#ifndef NO_WOLFSSL_SERVER
#ifdef HAVE_STACK_SIZE #ifdef HAVE_STACK_SIZE
StackSizeCheck(&args, server_test); StackSizeCheck(&args, server_test);
#else #else
server_test(&args); server_test(&args);
#endif #endif
#else
printf("Server not compiled in!\n");
#endif
CyaSSL_Cleanup(); CyaSSL_Cleanup();
FreeTcpReady(&ready); FreeTcpReady(&ready);
@@ -1490,35 +1521,3 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
char* myoptarg = NULL; char* myoptarg = NULL;
#endif /* NO_MAIN_DRIVER */ #endif /* NO_MAIN_DRIVER */
#ifdef CYASSL_CALLBACKS
int srvHandShakeCB(HandShakeInfo* info)
{
(void)info;
return 0;
}
int srvTimeoutCB(TimeoutInfo* info)
{
(void)info;
return 0;
}
#endif
#ifndef NO_HANDSHAKE_DONE_CB
int myHsDoneCb(WOLFSSL* ssl, void* user_ctx)
{
(void)user_ctx;
(void)ssl;
/* printf("Notified HandShake done\n"); */
/* return negative number to end TLS connection now */
return 0;
}
#endif

View File

@@ -224,10 +224,13 @@ static void test_wolfSSL_Method_Allocators(void)
TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_1_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_1_server_method);
TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_1_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_1_client_method);
#endif #endif
#ifndef NO_WOLFSSL_SERVER
TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_2_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_2_server_method);
#endif
#ifndef NO_WOLFSSL_CLIENT
TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_2_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_2_client_method);
TEST_VALID_METHOD_ALLOCATOR(wolfSSLv23_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfSSLv23_client_method);
#endif
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
#ifndef NO_OLD_TLS #ifndef NO_OLD_TLS
TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_server_method);
@@ -246,7 +249,7 @@ static void test_wolfSSL_Method_Allocators(void)
/*----------------------------------------------------------------------------* /*----------------------------------------------------------------------------*
| Context | Context
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#ifndef NO_WOLFSSL_SERVER
static void test_wolfSSL_CTX_new(WOLFSSL_METHOD *method) static void test_wolfSSL_CTX_new(WOLFSSL_METHOD *method)
{ {
WOLFSSL_CTX *ctx; WOLFSSL_CTX *ctx;
@@ -258,11 +261,12 @@ static void test_wolfSSL_CTX_new(WOLFSSL_METHOD *method)
wolfSSL_CTX_free(ctx); wolfSSL_CTX_free(ctx);
} }
#endif
static void test_wolfSSL_CTX_use_certificate_file(void) static void test_wolfSSL_CTX_use_certificate_file(void)
{ {
#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_WOLFSSL_SERVER)
WOLFSSL_CTX *ctx; WOLFSSL_CTX *ctx;
AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method())); AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method()));
@@ -295,7 +299,8 @@ static void test_wolfSSL_CTX_use_certificate_file(void)
*/ */
static int test_wolfSSL_CTX_use_certificate_buffer(void) static int test_wolfSSL_CTX_use_certificate_buffer(void)
{ {
#if !defined(NO_CERTS) && defined(USE_CERT_BUFFERS_2048) && !defined(NO_RSA) #if !defined(NO_CERTS) && defined(USE_CERT_BUFFERS_2048) && \
!defined(NO_RSA) && !defined(NO_WOLFSSL_SERVER)
WOLFSSL_CTX* ctx; WOLFSSL_CTX* ctx;
int ret; int ret;
@@ -317,7 +322,7 @@ static int test_wolfSSL_CTX_use_certificate_buffer(void)
static void test_wolfSSL_CTX_use_PrivateKey_file(void) static void test_wolfSSL_CTX_use_PrivateKey_file(void)
{ {
#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_WOLFSSL_SERVER)
WOLFSSL_CTX *ctx; WOLFSSL_CTX *ctx;
AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method())); AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method()));
@@ -348,7 +353,7 @@ static void test_wolfSSL_CTX_use_PrivateKey_file(void)
/* test both file and buffer versions along with unloading trusted peer certs */ /* test both file and buffer versions along with unloading trusted peer certs */
static void test_wolfSSL_CTX_trust_peer_cert(void) static void test_wolfSSL_CTX_trust_peer_cert(void)
{ {
#if !defined(NO_CERTS) && defined(WOLFSSL_TRUST_PEER_CERT) #if !defined(NO_CERTS) && defined(WOLFSSL_TRUST_PEER_CERT) && !defined(NO_WOLFSSL_CLIENT)
WOLFSSL_CTX *ctx; WOLFSSL_CTX *ctx;
AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method())); AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));
@@ -398,7 +403,7 @@ static void test_wolfSSL_CTX_trust_peer_cert(void)
static void test_wolfSSL_CTX_load_verify_locations(void) static void test_wolfSSL_CTX_load_verify_locations(void)
{ {
#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_WOLFSSL_CLIENT)
WOLFSSL_CTX *ctx; WOLFSSL_CTX *ctx;
AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method())); AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));
@@ -426,7 +431,8 @@ static void test_wolfSSL_CTX_load_verify_locations(void)
static void test_wolfSSL_CTX_SetTmpDH_file(void) static void test_wolfSSL_CTX_SetTmpDH_file(void)
{ {
#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_DH) #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_DH) && \
!defined(NO_WOLFSSL_CLIENT)
WOLFSSL_CTX *ctx; WOLFSSL_CTX *ctx;
AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method())); AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));
@@ -451,7 +457,7 @@ static void test_wolfSSL_CTX_SetTmpDH_file(void)
static void test_wolfSSL_CTX_SetTmpDH_buffer(void) static void test_wolfSSL_CTX_SetTmpDH_buffer(void)
{ {
#if !defined(NO_CERTS) && !defined(NO_DH) #if !defined(NO_CERTS) && !defined(NO_DH) && !defined(NO_WOLFSSL_CLIENT)
WOLFSSL_CTX *ctx; WOLFSSL_CTX *ctx;
AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method())); AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));
@@ -480,7 +486,8 @@ static void test_wolfSSL_CTX_SetTmpDH_buffer(void)
static void test_server_wolfSSL_new(void) static void test_server_wolfSSL_new(void)
{ {
#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_RSA) #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_RSA) && \
!defined(NO_WOLFSSL_SERVER)
WOLFSSL_CTX *ctx; WOLFSSL_CTX *ctx;
WOLFSSL_CTX *ctx_nocert; WOLFSSL_CTX *ctx_nocert;
WOLFSSL *ssl; WOLFSSL *ssl;
@@ -509,7 +516,8 @@ static void test_server_wolfSSL_new(void)
static void test_client_wolfSSL_new(void) static void test_client_wolfSSL_new(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)
WOLFSSL_CTX *ctx; WOLFSSL_CTX *ctx;
WOLFSSL_CTX *ctx_nocert; WOLFSSL_CTX *ctx_nocert;
WOLFSSL *ssl; WOLFSSL *ssl;
@@ -537,7 +545,8 @@ static void test_client_wolfSSL_new(void)
static void test_wolfSSL_SetTmpDH_file(void) static void test_wolfSSL_SetTmpDH_file(void)
{ {
#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_DH) #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_DH) && \
!defined(NO_WOLFSSL_SERVER)
WOLFSSL_CTX *ctx; WOLFSSL_CTX *ctx;
WOLFSSL *ssl; WOLFSSL *ssl;
@@ -576,7 +585,7 @@ static void test_wolfSSL_SetTmpDH_file(void)
static void test_wolfSSL_SetTmpDH_buffer(void) static void test_wolfSSL_SetTmpDH_buffer(void)
{ {
#if !defined(NO_CERTS) && !defined(NO_DH) #if !defined(NO_CERTS) && !defined(NO_DH) && !defined(NO_WOLFSSL_SERVER)
WOLFSSL_CTX *ctx; WOLFSSL_CTX *ctx;
WOLFSSL *ssl; WOLFSSL *ssl;
@@ -613,9 +622,11 @@ static void test_wolfSSL_SetTmpDH_buffer(void)
*/ */
static int test_wolfSSL_SetMinVersion(void) static int test_wolfSSL_SetMinVersion(void)
{ {
int failFlag = SSL_SUCCESS;
#ifndef NO_WOLFSSL_CLIENT
WOLFSSL_CTX* ctx; WOLFSSL_CTX* ctx;
WOLFSSL* ssl; WOLFSSL* ssl;
int failFlag, itr; int itr;
#ifndef NO_OLD_TLS #ifndef NO_OLD_TLS
const int versions[] = { WOLFSSL_TLSV1, WOLFSSL_TLSV1_1, const int versions[] = { WOLFSSL_TLSV1, WOLFSSL_TLSV1_1,
@@ -623,7 +634,6 @@ static int test_wolfSSL_SetMinVersion(void)
#else #else
const int versions[] = { WOLFSSL_TLSV1_2 }; const int versions[] = { WOLFSSL_TLSV1_2 };
#endif #endif
failFlag = SSL_SUCCESS;
AssertTrue(wolfSSL_Init()); AssertTrue(wolfSSL_Init());
ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method()); ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method());
@@ -642,7 +652,7 @@ static int test_wolfSSL_SetMinVersion(void)
wolfSSL_free(ssl); wolfSSL_free(ssl);
wolfSSL_CTX_free(ctx); wolfSSL_CTX_free(ctx);
AssertTrue(wolfSSL_Cleanup()); AssertTrue(wolfSSL_Cleanup());
#endif
return failFlag; return failFlag;
} /* END test_wolfSSL_SetMinVersion */ } /* END test_wolfSSL_SetMinVersion */
@@ -652,7 +662,8 @@ static int test_wolfSSL_SetMinVersion(void)
| IO | IO
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && \ #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && \
!defined(NO_RSA) && !defined(SINGLE_THREADED) !defined(NO_RSA) && !defined(SINGLE_THREADED) && \
!defined(NO_WOLFSSL_SERVER) && !defined(NO_WOLFSSL_CLIENT)
#define HAVE_IO_TESTS_DEPENDENCIES #define HAVE_IO_TESTS_DEPENDENCIES
#endif #endif
@@ -685,7 +696,7 @@ static int test_export(WOLFSSL* inSsl, byte* buf, word32 sz, void* userCtx)
} }
#endif #endif
#ifndef NO_WOLFSSL_SERVER
static THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args) static THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args)
{ {
SOCKET_T sockfd = 0; SOCKET_T sockfd = 0;
@@ -833,7 +844,7 @@ done:
return 0; return 0;
#endif #endif
} }
#endif /* !NO_WOLFSSL_SERVER */
static void test_client_nofail(void* args) static void test_client_nofail(void* args)
{ {
@@ -1694,7 +1705,7 @@ static void test_wolfSSL_UseSNI(void)
static void test_wolfSSL_UseMaxFragment(void) static void test_wolfSSL_UseMaxFragment(void)
{ {
#ifdef HAVE_MAX_FRAGMENT #if defined(HAVE_MAX_FRAGMENT) && !defined(NO_WOLFSSL_CLIENT)
WOLFSSL_CTX *ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()); WOLFSSL_CTX *ctx = wolfSSL_CTX_new(wolfSSLv23_client_method());
WOLFSSL *ssl = wolfSSL_new(ctx); WOLFSSL *ssl = wolfSSL_new(ctx);
@@ -1728,7 +1739,7 @@ static void test_wolfSSL_UseMaxFragment(void)
static void test_wolfSSL_UseTruncatedHMAC(void) static void test_wolfSSL_UseTruncatedHMAC(void)
{ {
#ifdef HAVE_TRUNCATED_HMAC #if defined(HAVE_TRUNCATED_HMAC) && !defined(NO_WOLFSSL_CLIENT)
WOLFSSL_CTX *ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()); WOLFSSL_CTX *ctx = wolfSSL_CTX_new(wolfSSLv23_client_method());
WOLFSSL *ssl = wolfSSL_new(ctx); WOLFSSL *ssl = wolfSSL_new(ctx);
@@ -1750,14 +1761,13 @@ static void test_wolfSSL_UseTruncatedHMAC(void)
static void test_wolfSSL_UseSupportedCurve(void) static void test_wolfSSL_UseSupportedCurve(void)
{ {
#ifdef HAVE_SUPPORTED_CURVES #if defined(HAVE_SUPPORTED_CURVES) && !defined(NO_WOLFSSL_CLIENT)
WOLFSSL_CTX *ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()); WOLFSSL_CTX *ctx = wolfSSL_CTX_new(wolfSSLv23_client_method());
WOLFSSL *ssl = wolfSSL_new(ctx); WOLFSSL *ssl = wolfSSL_new(ctx);
AssertNotNull(ctx); AssertNotNull(ctx);
AssertNotNull(ssl); AssertNotNull(ssl);
#ifndef NO_WOLFSSL_CLIENT
/* error cases */ /* error cases */
AssertIntNE(SSL_SUCCESS, AssertIntNE(SSL_SUCCESS,
wolfSSL_CTX_UseSupportedCurve(NULL, WOLFSSL_ECC_SECP256R1)); wolfSSL_CTX_UseSupportedCurve(NULL, WOLFSSL_ECC_SECP256R1));
@@ -1772,7 +1782,6 @@ static void test_wolfSSL_UseSupportedCurve(void)
wolfSSL_CTX_UseSupportedCurve(ctx, WOLFSSL_ECC_SECP256R1)); wolfSSL_CTX_UseSupportedCurve(ctx, WOLFSSL_ECC_SECP256R1));
AssertIntEQ(SSL_SUCCESS, AssertIntEQ(SSL_SUCCESS,
wolfSSL_UseSupportedCurve(ssl, WOLFSSL_ECC_SECP256R1)); wolfSSL_UseSupportedCurve(ssl, WOLFSSL_ECC_SECP256R1));
#endif
wolfSSL_free(ssl); wolfSSL_free(ssl);
wolfSSL_CTX_free(ctx); wolfSSL_CTX_free(ctx);
@@ -1958,6 +1967,7 @@ static void test_wolfSSL_UseALPN_connection(void)
static void test_wolfSSL_UseALPN_params(void) static void test_wolfSSL_UseALPN_params(void)
{ {
#ifndef NO_WOLFSSL_CLIENT
/* "http/1.1" */ /* "http/1.1" */
char http1[] = {0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31}; char http1[] = {0x68, 0x74, 0x74, 0x70, 0x2f, 0x31, 0x2e, 0x31};
/* "spdy/1" */ /* "spdy/1" */
@@ -2026,6 +2036,7 @@ static void test_wolfSSL_UseALPN_params(void)
wolfSSL_free(ssl); wolfSSL_free(ssl);
wolfSSL_CTX_free(ctx); wolfSSL_CTX_free(ctx);
#endif
} }
#endif /* HAVE_ALPN */ #endif /* HAVE_ALPN */
@@ -2039,7 +2050,7 @@ static void test_wolfSSL_UseALPN(void)
static void test_wolfSSL_DisableExtendedMasterSecret(void) static void test_wolfSSL_DisableExtendedMasterSecret(void)
{ {
#ifdef HAVE_EXTENDED_MASTER #if defined(HAVE_EXTENDED_MASTER) && !defined(NO_WOLFSSL_CLIENT)
WOLFSSL_CTX *ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()); WOLFSSL_CTX *ctx = wolfSSL_CTX_new(wolfSSLv23_client_method());
WOLFSSL *ssl = wolfSSL_new(ctx); WOLFSSL *ssl = wolfSSL_new(ctx);
@@ -2189,8 +2200,10 @@ static void test_wolfSSL_PKCS12(void)
*/ */
static int test_wolfSSL_CTX_SetMinVersion(void) static int test_wolfSSL_CTX_SetMinVersion(void)
{ {
int failFlag = SSL_SUCCESS;
#ifndef NO_WOLFSSL_CLIENT
WOLFSSL_CTX* ctx; WOLFSSL_CTX* ctx;
int failFlag, itr; int itr;
#ifndef NO_OLD_TLS #ifndef NO_OLD_TLS
const int versions[] = { WOLFSSL_TLSV1, WOLFSSL_TLSV1_1, const int versions[] = { WOLFSSL_TLSV1, WOLFSSL_TLSV1_1,
@@ -2216,7 +2229,7 @@ static int test_wolfSSL_CTX_SetMinVersion(void)
wolfSSL_CTX_free(ctx); wolfSSL_CTX_free(ctx);
AssertTrue(wolfSSL_Cleanup()); AssertTrue(wolfSSL_Cleanup());
#endif
return failFlag; return failFlag;
} /* END test_wolfSSL_CTX_SetMinVersion */ } /* END test_wolfSSL_CTX_SetMinVersion */
@@ -2234,7 +2247,8 @@ static int test_wolfSSL_CTX_SetMinVersion(void)
*/ */
static int test_wolfSSL_UseOCSPStapling(void) static int test_wolfSSL_UseOCSPStapling(void)
{ {
#if defined(HAVE_CERTIFICATE_STATUS_REQUEST) && defined(HAVE_OCSP) #if defined(HAVE_CERTIFICATE_STATUS_REQUEST) && defined(HAVE_OCSP) && \
!defined(NO_WOLFSSL_CLIENT)
int ret; int ret;
WOLFSSL_CTX* ctx; WOLFSSL_CTX* ctx;
WOLFSSL* ssl; WOLFSSL* ssl;
@@ -2273,7 +2287,8 @@ static int test_wolfSSL_UseOCSPStapling(void)
*/ */
static int test_wolfSSL_UseOCSPStaplingV2 (void) static int test_wolfSSL_UseOCSPStaplingV2 (void)
{ {
#if defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2) && defined(HAVE_OCSP) #if defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2) && defined(HAVE_OCSP) && \
!defined(NO_WOLFSSL_CLIENT)
int ret; int ret;
WOLFSSL_CTX* ctx; WOLFSSL_CTX* ctx;
WOLFSSL* ssl; WOLFSSL* ssl;
@@ -7252,7 +7267,9 @@ void ApiTest(void)
AssertIntEQ(test_wolfSSL_Init(), SSL_SUCCESS); AssertIntEQ(test_wolfSSL_Init(), SSL_SUCCESS);
/* wolfcrypt initialization tests */ /* wolfcrypt initialization tests */
test_wolfSSL_Method_Allocators(); test_wolfSSL_Method_Allocators();
#ifndef NO_WOLFSSL_SERVER
test_wolfSSL_CTX_new(wolfSSLv23_server_method()); test_wolfSSL_CTX_new(wolfSSLv23_server_method());
#endif
test_wolfSSL_CTX_use_certificate_file(); test_wolfSSL_CTX_use_certificate_file();
AssertIntEQ(test_wolfSSL_CTX_use_certificate_buffer(), SSL_SUCCESS); AssertIntEQ(test_wolfSSL_CTX_use_certificate_buffer(), SSL_SUCCESS);
test_wolfSSL_CTX_use_PrivateKey_file(); test_wolfSSL_CTX_use_PrivateKey_file();

View File

@@ -44,7 +44,7 @@
#include "examples/client/client.h" #include "examples/client/client.h"
#include "examples/server/server.h" #include "examples/server/server.h"
#if !defined(NO_WOLFSSL_SERVER) && !defined(NO_WOLFSSL_CLIENT)
static WOLFSSL_CTX* cipherSuiteCtx = NULL; static WOLFSSL_CTX* cipherSuiteCtx = NULL;
static char nonblockFlag[] = "-N"; static char nonblockFlag[] = "-N";
static char noVerifyFlag[] = "-d"; static char noVerifyFlag[] = "-d";
@@ -503,10 +503,12 @@ static void test_harness(void* vargs)
free(script); free(script);
args->return_code = 0; args->return_code = 0;
} }
#endif /* !NO_WOLFSSL_SERVER && !NO_WOLFSSL_CLIENT */
int SuiteTest(void) int SuiteTest(void)
{ {
#if !defined(NO_WOLFSSL_SERVER) && !defined(NO_WOLFSSL_CLIENT)
func_args args; func_args args;
char argv0[2][80]; char argv0[2][80];
char* myArgv[2]; char* myArgv[2];
@@ -654,6 +656,7 @@ exit:
#endif #endif
return args.return_code; return args.return_code;
#else
return NOT_COMPILED_IN;
#endif /* !NO_WOLFSSL_SERVER && !NO_WOLFSSL_CLIENT */
} }

View File

@@ -46,6 +46,7 @@
void file_test(const char* file, byte* hash); void file_test(const char* file, byte* hash);
#endif #endif
#if !defined(NO_WOLFSSL_SERVER) && !defined(NO_WOLFSSL_CLIENT)
void simple_test(func_args*); void simple_test(func_args*);
enum { enum {
@@ -53,6 +54,7 @@ enum {
}; };
static const char *outputName; static const char *outputName;
#endif
int myoptind = 0; int myoptind = 0;
char* myoptarg = NULL; char* myoptarg = NULL;
@@ -71,6 +73,7 @@ char* myoptarg = NULL;
int testsuite_test(int argc, char** argv) int testsuite_test(int argc, char** argv)
{ {
#if !defined(NO_WOLFSSL_SERVER) && !defined(NO_WOLFSSL_CLIENT)
func_args server_args; func_args server_args;
tcp_ready ready; tcp_ready ready;
@@ -87,10 +90,10 @@ int testsuite_test(int argc, char** argv)
#endif #endif
#ifdef HAVE_WNR #ifdef HAVE_WNR
if (wc_InitNetRandom(wnrConfig, NULL, 5000) != 0) { if (wc_InitNetRandom(wnrConfig, NULL, 5000) != 0) {
err_sys("Whitewood netRandom global config failed"); err_sys("Whitewood netRandom global config failed");
return -1237; return -1237;
} }
#endif /* HAVE_WNR */ #endif /* HAVE_WNR */
StartTCP(); StartTCP();
@@ -210,9 +213,16 @@ int testsuite_test(int argc, char** argv)
#endif /* HAVE_WNR */ #endif /* HAVE_WNR */
printf("\nAll tests passed!\n"); printf("\nAll tests passed!\n");
#else
(void)argc;
(void)argv;
#endif /* !NO_WOLFSSL_SERVER && !NO_WOLFSSL_CLIENT */
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
#if !defined(NO_WOLFSSL_SERVER) && !defined(NO_WOLFSSL_CLIENT)
void simple_test(func_args* args) void simple_test(func_args* args)
{ {
THREAD_TYPE serverThread; THREAD_TYPE serverThread;
@@ -284,6 +294,7 @@ void simple_test(func_args* args)
join_thread(serverThread); join_thread(serverThread);
if (svrArgs.return_code != 0) args->return_code = svrArgs.return_code; if (svrArgs.return_code != 0) args->return_code = svrArgs.return_code;
} }
#endif /* !NO_WOLFSSL_SERVER && !NO_WOLFSSL_CLIENT */
void wait_tcp_ready(func_args* args) void wait_tcp_ready(func_args* args)