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

Fixes for build issues without OPENSSL_EXTRA defined.

Browse Source
This commit is contained in:
David Garske
2020-07-31 15:25:58 -07:00
parent 776b1a2d17
commit 4f91d60d22
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/configs/user_settings_all.h
View File

@ -159,6 +159,7 @@ extern "C" {
#define HAVE_HASHDRBG #define HAVE_HASHDRBG
#define HAVE_CURVE25519 #define HAVE_CURVE25519
#define HAVE_ED25519 #define HAVE_ED25519
#define CURVED25519_SMALL
#define HAVE_CURVE448 #define HAVE_CURVE448
#define HAVE_POLY1305 #define HAVE_POLY1305
#define HAVE_CHACHA #define HAVE_CHACHA

3
src/internal.c
View File

@ -10077,7 +10077,8 @@ int DoVerifyCallback(WOLFSSL_CERT_MANAGER* cm, WOLFSSL* ssl, int ret,
store->userCtx = (ssl != NULL) ? ssl->verifyCbCtx : cm; store->userCtx = (ssl != NULL) ? ssl->verifyCbCtx : cm;
store->certs = args->certs; store->certs = args->certs;
store->totalCerts = args->totalCerts; store->totalCerts = args->totalCerts;
#if defined(HAVE_EX_DATA) || defined(FORTRESS) #if (defined(HAVE_EX_DATA) || defined(FORTRESS)) && \
(defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL))
if (wolfSSL_CRYPTO_set_ex_data(&store->ex_data, 0, ssl) if (wolfSSL_CRYPTO_set_ex_data(&store->ex_data, 0, ssl)
!= WOLFSSL_SUCCESS) { != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("Failed to store ssl context in WOLFSSL_X509_STORE_CTX"); WOLFSSL_MSG("Failed to store ssl context in WOLFSSL_X509_STORE_CTX");

2
src/ssl.c
View File

@ -19331,11 +19331,13 @@ int wolfSSL_SESSION_up_ref(WOLFSSL_SESSION* session)
if (session == NULL) if (session == NULL)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
#ifdef OPENSSL_EXTRA
if (wc_LockMutex(&session->refMutex) != 0) { if (wc_LockMutex(&session->refMutex) != 0) {
WOLFSSL_MSG("Failed to lock session mutex"); WOLFSSL_MSG("Failed to lock session mutex");
} }
session->refCount++; session->refCount++;
wc_UnLockMutex(&session->refMutex); wc_UnLockMutex(&session->refMutex);
#endif
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }