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

add macro guards to account for alternate builds

Browse Source
This commit is contained in:
JacobBarthelmeh
2025-01-09 02:14:04 -07:00
parent 28bed8d634
commit 363ecd3756
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/internal.c
View File

@ -8369,6 +8369,8 @@ void FreeSuites(WOLFSSL* ssl)
wolfSSL_sk_SSL_CIPHER_free(ssl->suitesStack); wolfSSL_sk_SSL_CIPHER_free(ssl->suitesStack);
ssl->suitesStack = NULL; ssl->suitesStack = NULL;
} }
#endif
#ifdef OPENSSL_EXTRA
XFREE(ssl->clSuites, ssl->heap, DYNAMIC_TYPE_SUITES); XFREE(ssl->clSuites, ssl->heap, DYNAMIC_TYPE_SUITES);
ssl->clSuites = NULL; ssl->clSuites = NULL;
#endif #endif
@ -37585,7 +37587,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
{ {
byte b; byte b;
ProtocolVersion pv; ProtocolVersion pv;
#if defined(WOLFSSL_SMALL_STACK) || defined(OPENSSL_ALL) #if defined(WOLFSSL_SMALL_STACK) || defined(OPENSSL_EXTRA)
Suites* clSuites = NULL; Suites* clSuites = NULL;
#else #else
Suites clSuites[1]; Suites clSuites[1];
@ -37887,7 +37889,7 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
goto out; goto out;
} }
#if defined(WOLFSSL_SMALL_STACK) || defined(OPENSSL_ALL) #if defined(WOLFSSL_SMALL_STACK) || defined(OPENSSL_EXTRA)
clSuites = (Suites*)XMALLOC(sizeof(Suites), ssl->heap, clSuites = (Suites*)XMALLOC(sizeof(Suites), ssl->heap,
DYNAMIC_TYPE_SUITES); DYNAMIC_TYPE_SUITES);
if (clSuites == NULL) { if (clSuites == NULL) {

4
src/ssl.c
View File

@ -17632,6 +17632,7 @@ static void wolfSSL_CIPHER_copy(WOLFSSL_CIPHER* in, WOLFSSL_CIPHER* out)
} }
#if defined(OPENSSL_ALL)
static WOLFSSL_X509_OBJECT* wolfSSL_X509_OBJECT_dup(WOLFSSL_X509_OBJECT* obj) static WOLFSSL_X509_OBJECT* wolfSSL_X509_OBJECT_dup(WOLFSSL_X509_OBJECT* obj)
{ {
WOLFSSL_X509_OBJECT* ret = NULL; WOLFSSL_X509_OBJECT* ret = NULL;
@ -17655,6 +17656,7 @@ static WOLFSSL_X509_OBJECT* wolfSSL_X509_OBJECT_dup(WOLFSSL_X509_OBJECT* obj)
} }
return ret; return ret;
} }
#endif /* OPENSSL_ALL */
WOLFSSL_STACK* wolfSSL_sk_dup(WOLFSSL_STACK* sk) WOLFSSL_STACK* wolfSSL_sk_dup(WOLFSSL_STACK* sk)
{ {
@ -17719,6 +17721,7 @@ WOLFSSL_STACK* wolfSSL_sk_dup(WOLFSSL_STACK* sk)
} }
break; break;
case STACK_TYPE_X509_OBJ: case STACK_TYPE_X509_OBJ:
#if defined(OPENSSL_ALL)
if (!sk->data.x509_obj) if (!sk->data.x509_obj)
break; break;
cur->data.x509_obj = wolfSSL_X509_OBJECT_dup(sk->data.x509_obj); cur->data.x509_obj = wolfSSL_X509_OBJECT_dup(sk->data.x509_obj);
@ -17727,6 +17730,7 @@ WOLFSSL_STACK* wolfSSL_sk_dup(WOLFSSL_STACK* sk)
goto error; goto error;
} }
break; break;
#endif
case STACK_TYPE_BIO: case STACK_TYPE_BIO:
case STACK_TYPE_STRING: case STACK_TYPE_STRING:
case STACK_TYPE_ACCESS_DESCRIPTION: case STACK_TYPE_ACCESS_DESCRIPTION:

2
src/ssl_load.c
View File

@ -2803,7 +2803,7 @@ int wolfSSL_CTX_load_verify_locations_ex(WOLFSSL_CTX* ctx, const char* file,
} }
if (file != NULL) { if (file != NULL) {
#ifdef HAVE_CRL #if defined(OPENSSL_EXTRA) && defined(HAVE_CRL)
/* handle CRL type being passed in */ /* handle CRL type being passed in */
WOLFSSL_CRL crl; WOLFSSL_CRL crl;