wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7473 from douzzer/20240425-fixes

Browse Source 
20240425-fixes
This commit is contained in:
Sean Parkinson
2024-04-26 15:52:05 +10:00
committed by GitHub
parent e41454004e 442d3f30cc
commit e1bd4dd1ec
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/quic.c
View File

@@ -1013,7 +1013,8 @@ const WOLFSSL_EVP_CIPHER* wolfSSL_quic_get_aead(WOLFSSL* ssl)
return evp_cipher; return evp_cipher;
} }
static int evp_cipher_eq(const WOLFSSL_EVP_CIPHER* c1, /* currently only used if HAVE_CHACHA && HAVE_POLY1305. */
WC_MAYBE_UNUSED static int evp_cipher_eq(const WOLFSSL_EVP_CIPHER* c1,
const WOLFSSL_EVP_CIPHER* c2) const WOLFSSL_EVP_CIPHER* c2)
{ {
/* We could check on nid equality, but we seem to have singulars */ /* We could check on nid equality, but we seem to have singulars */

18
src/ssl.c
View File

@@ -289,7 +289,7 @@ int wc_OBJ_sn2nid(const char *sn)
#define HAVE_GLOBAL_RNG /* consolidate flags for using globalRNG */ #define HAVE_GLOBAL_RNG /* consolidate flags for using globalRNG */
static WC_RNG globalRNG; static WC_RNG globalRNG;
static int initGlobalRNG = 0; static volatile int initGlobalRNG = 0;
static WC_MAYBE_UNUSED wolfSSL_Mutex globalRNGMutex static WC_MAYBE_UNUSED wolfSSL_Mutex globalRNGMutex
WOLFSSL_MUTEX_INITIALIZER_CLAUSE(globalRNGMutex); WOLFSSL_MUTEX_INITIALIZER_CLAUSE(globalRNGMutex);
@@ -5758,11 +5758,13 @@ int wolfSSL_Init(void)
if (ret == WOLFSSL_SUCCESS) { if (ret == WOLFSSL_SUCCESS) {
initRefCount++; initRefCount++;
} }
else {
initRefCount = 1; /* Force cleanup */
}
wc_UnLockMutex(&inits_count_mutex); wc_UnLockMutex(&inits_count_mutex);
if (ret != WOLFSSL_SUCCESS) { if (ret != WOLFSSL_SUCCESS) {
initRefCount = 1; /* Force cleanup */
(void)wolfSSL_Cleanup(); /* Ignore any error from cleanup */ (void)wolfSSL_Cleanup(); /* Ignore any error from cleanup */
} }
@@ -23928,11 +23930,19 @@ int wolfSSL_RAND_bytes(unsigned char* buf, int num)
WOLFSSL_MSG("Bad Lock Mutex rng"); WOLFSSL_MSG("Bad Lock Mutex rng");
return ret; return ret;
} }
/* the above access to initGlobalRNG is racey -- recheck it now that we
* have the lock.
*/
if (initGlobalRNG) {
rng = &globalRNG; rng = &globalRNG;
used_global = 1; used_global = 1;
} }
else else {
wc_UnLockMutex(&globalRNGMutex);
}
}
if (used_global == 0)
#endif #endif
{ {
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK

2
wolfcrypt/test/test.c
View File

@@ -38878,7 +38878,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t lms_test_verify_only(void)
} }
if (pub_len != HSS_MAX_PUBLIC_KEY_LEN) { if (pub_len != HSS_MAX_PUBLIC_KEY_LEN) {
printf("error: LMS pub len %d, expected %d\n", pub_len, printf("error: LMS pub len %u, expected %d\n", pub_len,
HSS_MAX_PUBLIC_KEY_LEN); HSS_MAX_PUBLIC_KEY_LEN);
return WC_TEST_RET_ENC_EC(pub_len); return WC_TEST_RET_ENC_EC(pub_len);
} }