fix build with no server and enable all

This commit is contained in:
Jacob Barthelmeh
2019-10-16 14:19:50 -06:00
parent b4a3ad6e2d
commit b7d4c9f839
4 changed files with 31 additions and 7 deletions

View File

@@ -1788,7 +1788,7 @@ int InitSSL_Ctx(WOLFSSL_CTX* ctx, WOLFSSL_METHOD* method, void* heap)
/* In case contexts are held in array and don't want to free actual ctx */ /* In case contexts are held in array and don't want to free actual ctx */
void SSL_CtxResourceFree(WOLFSSL_CTX* ctx) void SSL_CtxResourceFree(WOLFSSL_CTX* ctx)
{ {
#ifdef HAVE_CERTIFICATE_STATUS_REQUEST_V2 #if defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2) && !defined(NO_WOLFSSL_SERVER)
int i; int i;
#endif #endif
@@ -10315,7 +10315,7 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx,
args->fatal = TLSX_CSR_InitRequest(ssl->extensions, args->fatal = TLSX_CSR_InitRequest(ssl->extensions,
args->dCert, ssl->heap); args->dCert, ssl->heap);
doLookup = 0; doLookup = 0;
#ifdef WOLFSSL_TLS13 #if defined(WOLFSSL_TLS13) && !defined(NO_WOLFSSL_SERVER)
if (ssl->options.tls1_3) { if (ssl->options.tls1_3) {
TLSX* ext = TLSX_Find(ssl->extensions, TLSX* ext = TLSX_Find(ssl->extensions,
TLSX_STATUS_REQUEST); TLSX_STATUS_REQUEST);

View File

@@ -40062,8 +40062,8 @@ int wolfSSL_CTX_set_tlsext_status_cb(WOLFSSL_CTX* ctx,
if (ctx == NULL || ctx->cm == NULL) if (ctx == NULL || ctx->cm == NULL)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
#if defined(HAVE_CERTIFICATE_STATUS_REQUEST) \ #if !defined(NO_WOLFSSL_SERVER) && (defined(HAVE_CERTIFICATE_STATUS_REQUEST) \
|| defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2) || defined(HAVE_CERTIFICATE_STATUS_REQUEST_V2))
/* Ensure stapling is on for callback to be used. */ /* Ensure stapling is on for callback to be used. */
wolfSSL_CTX_EnableOCSPStapling(ctx); wolfSSL_CTX_EnableOCSPStapling(ctx);

View File

@@ -2526,6 +2526,7 @@ static word16 TLSX_TCA_Write(TCA* list, byte* output)
return offset; return offset;
} }
#ifndef NO_WOLFSSL_SERVER
static TCA* TLSX_TCA_Find(TCA *list, byte type, const byte* id, word16 idSz) static TCA* TLSX_TCA_Find(TCA *list, byte type, const byte* id, word16 idSz)
{ {
TCA* tca = list; TCA* tca = list;
@@ -2536,6 +2537,7 @@ static TCA* TLSX_TCA_Find(TCA *list, byte type, const byte* id, word16 idSz)
return tca; return tca;
} }
#endif /* NO_WOLFSSL_SERVER */
/** Parses a buffer of TCA extensions. */ /** Parses a buffer of TCA extensions. */
static int TLSX_TCA_Parse(WOLFSSL* ssl, const byte* input, word16 length, static int TLSX_TCA_Parse(WOLFSSL* ssl, const byte* input, word16 length,
@@ -3015,10 +3017,12 @@ static int TLSX_CSR_Parse(WOLFSSL* ssl, byte* input, word16 length,
if (offset + resp_length != length) if (offset + resp_length != length)
ret = BUFFER_ERROR; ret = BUFFER_ERROR;
} }
#if !defined(NO_WOLFSSL_SERVER)
if (ret == 0) { if (ret == 0) {
csr->response.buffer = input + offset; csr->response.buffer = input + offset;
csr->response.length = resp_length; csr->response.length = resp_length;
} }
#endif
return ret; return ret;
} }

View File

@@ -516,12 +516,20 @@ static void test_wolfSSL_Method_Allocators(void)
#ifndef NO_OLD_TLS #ifndef NO_OLD_TLS
#ifdef WOLFSSL_ALLOW_SSLV3 #ifdef WOLFSSL_ALLOW_SSLV3
#ifndef NO_WOLFSSL_SERVER
TEST_VALID_METHOD_ALLOCATOR(wolfSSLv3_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfSSLv3_server_method);
#endif
#ifndef NO_WOLFSSL_CLIENT
TEST_VALID_METHOD_ALLOCATOR(wolfSSLv3_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfSSLv3_client_method);
#endif
#endif #endif
#ifdef WOLFSL_ALLOW_TLSV10 #ifdef WOLFSL_ALLOW_TLSV10
#ifndef NO_WOLFSSL_SERVER
TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_server_method);
#endif
#ifndef NO_WOLFSSL_CLIENT
TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_client_method);
#endif
#endif #endif
#ifndef NO_WOLFSSL_SERVER #ifndef NO_WOLFSSL_SERVER
TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_1_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_1_server_method);
@@ -558,12 +566,20 @@ static void test_wolfSSL_Method_Allocators(void)
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
#ifndef NO_OLD_TLS #ifndef NO_OLD_TLS
#ifndef NO_WOLFSSL_SERVER
TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_server_method);
#endif
#ifndef NO_WOLFSSL_CLIENT
TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_client_method);
#endif
#endif #endif
#ifndef WOLFSSL_NO_TLS12 #ifndef WOLFSSL_NO_TLS12
#ifndef NO_WOLFSSL_SERVER
TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_2_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_2_server_method);
#endif
#ifndef NO_WOLFSSL_CLIENT
TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_2_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_2_client_method);
#endif
#endif #endif
#endif /* WOLFSSL_DTLS */ #endif /* WOLFSSL_DTLS */
@@ -3931,7 +3947,7 @@ static void test_wolfSSL_UseSupportedCurve(void)
#endif #endif
} }
#ifdef HAVE_ALPN #if defined(HAVE_ALPN) && !defined(NO_WOLFSSL_SERVER)
static void verify_ALPN_FATAL_ERROR_on_client(WOLFSSL* ssl) static void verify_ALPN_FATAL_ERROR_on_client(WOLFSSL* ssl)
{ {
@@ -4187,7 +4203,7 @@ static void test_wolfSSL_UseALPN_params(void)
static void test_wolfSSL_UseALPN(void) static void test_wolfSSL_UseALPN(void)
{ {
#ifdef HAVE_ALPN #if defined(HAVE_ALPN) && !defined(NO_WOLFSSL_SERVER)
test_wolfSSL_UseALPN_connection(); test_wolfSSL_UseALPN_connection();
test_wolfSSL_UseALPN_params(); test_wolfSSL_UseALPN_params();
#endif #endif
@@ -19440,7 +19456,11 @@ static void test_wolfSSL_tmp_dh(void)
AssertNotNull(dh); AssertNotNull(dh);
AssertIntEQ((int)SSL_CTX_set_tmp_dh(ctx, dh), WOLFSSL_SUCCESS); AssertIntEQ((int)SSL_CTX_set_tmp_dh(ctx, dh), WOLFSSL_SUCCESS);
#ifndef NO_WOLFSSL_SERVER
AssertIntEQ((int)SSL_set_tmp_dh(ssl, dh), WOLFSSL_SUCCESS); AssertIntEQ((int)SSL_set_tmp_dh(ssl, dh), WOLFSSL_SUCCESS);
#else
AssertIntEQ((int)SSL_set_tmp_dh(ssl, dh), SIDE_ERROR);
#endif
BIO_free(bio); BIO_free(bio);
DSA_free(dsa); DSA_free(dsa);
@@ -21160,7 +21180,7 @@ static void test_wolfSSL_sk_SSL_CIPHER(void)
*/ */
static void test_wolfSSL_set_tlsext_status_type(void){ static void test_wolfSSL_set_tlsext_status_type(void){
#if defined(OPENSSL_EXTRA) && defined(HAVE_CERTIFICATE_STATUS_REQUEST) && \ #if defined(OPENSSL_EXTRA) && defined(HAVE_CERTIFICATE_STATUS_REQUEST) && \
!defined(NO_RSA) !defined(NO_RSA) && !defined(NO_WOLFSSL_SERVER)
SSL* ssl; SSL* ssl;
SSL_CTX* ctx; SSL_CTX* ctx;