wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-05 15:30:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10640 from douzzer/20260608-atomic-fixes

Browse Source 
20260608-atomic-fixes
This commit is contained in:
David Garske
2026-06-09 10:41:01 -07:00
committed by GitHub
parent 850cc84ee8 68144a81da
commit 52681591fe
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/wc_port.c
+16 -10
View File
@@ -795,7 +795,7 @@ int wolfCrypt_Cleanup(void)
ret = wc_local_InitDown(&wolfcrypt_init_state);
if (ret < 0) {
if (ret == WC_NO_ERR_TRACE(ALREADY_E))
WOLFSSL_MSG("wolfCrypt_Cleanup() called with initRefCount <= 0.");
WOLFSSL_MSG("wolfCrypt_Cleanup() called during or after prior final cleanup.");
else if (ret == WC_NO_ERR_TRACE(BAD_STATE_E))
WOLFSSL_MSG("wolfCrypt_Cleanup() failed: bad internal state.");
#ifdef WC_INIT_ERROR_WHEN_CONTENDED
@@ -1766,14 +1766,16 @@ WC_ATOMIC_INT_ARG wolfSSL_Atomic_Int_FetchSub(wolfSSL_Atomic_Int* c,
WC_ATOMIC_INT_ARG wolfSSL_Atomic_Int_AddFetch(wolfSSL_Atomic_Int* c,
WC_ATOMIC_INT_ARG i)
{
int ret = atomic_fetch_add_explicit(c, i, memory_order_relaxed);
WC_ATOMIC_INT_ARG ret =
atomic_fetch_add_explicit(c, i, memory_order_relaxed);
return ret + i;
}
WC_ATOMIC_INT_ARG wolfSSL_Atomic_Int_SubFetch(wolfSSL_Atomic_Int* c,
WC_ATOMIC_INT_ARG i)
{
int ret = atomic_fetch_sub_explicit(c, i, memory_order_relaxed);
WC_ATOMIC_INT_ARG ret =
atomic_fetch_sub_explicit(c, i, memory_order_relaxed);
return ret - i;
}
@@ -1812,14 +1814,16 @@ WC_ATOMIC_UINT_ARG wolfSSL_Atomic_Uint_FetchSub(wolfSSL_Atomic_Uint* c,
WC_ATOMIC_UINT_ARG wolfSSL_Atomic_Uint_AddFetch(wolfSSL_Atomic_Uint* c,
WC_ATOMIC_UINT_ARG i)
{
unsigned int ret = atomic_fetch_add_explicit(c, i, memory_order_relaxed);
WC_ATOMIC_UINT_ARG ret =
atomic_fetch_add_explicit(c, i, memory_order_relaxed);
return ret + i;
}
WC_ATOMIC_UINT_ARG wolfSSL_Atomic_Uint_SubFetch(wolfSSL_Atomic_Uint* c,
WC_ATOMIC_UINT_ARG i)
{
unsigned int ret = atomic_fetch_sub_explicit(c, i, memory_order_relaxed);
WC_ATOMIC_UINT_ARG ret =
atomic_fetch_sub_explicit(c, i, memory_order_relaxed);
return ret - i;
}
@@ -1987,14 +1991,16 @@ WC_ATOMIC_INT_ARG wolfSSL_Atomic_Int_FetchSub(wolfSSL_Atomic_Int* c,
WC_ATOMIC_INT_ARG wolfSSL_Atomic_Int_AddFetch(wolfSSL_Atomic_Int* c,
WC_ATOMIC_INT_ARG i)
{
int ret = (int)_InterlockedExchangeAdd(c, (long)i);
WC_ATOMIC_INT_ARG ret =
(WC_ATOMIC_INT_ARG)_InterlockedExchangeAdd(c, (long)i);
return ret + i;
}
WC_ATOMIC_INT_ARG wolfSSL_Atomic_Int_SubFetch(wolfSSL_Atomic_Int* c,
WC_ATOMIC_INT_ARG i)
{
int ret = (int)_InterlockedExchangeAdd(c, (long)-i);
WC_ATOMIC_INT_ARG ret =
(WC_ATOMIC_INT_ARG)_InterlockedExchangeAdd(c, (long)-i);
return ret - i;
}
@@ -2002,7 +2008,7 @@ WC_ATOMIC_INT_ARG wolfSSL_Atomic_Int_Exchange(wolfSSL_Atomic_Int* c,
WC_ATOMIC_INT_ARG new_i)
{
long actual_i = InterlockedExchange(c, (long)new_i);
return (int)actual_i;
return (WC_ATOMIC_INT_ARG)actual_i;
}
int wolfSSL_Atomic_Int_CompareExchange(wolfSSL_Atomic_Int* c,
@@ -2015,7 +2021,7 @@ int wolfSSL_Atomic_Int_CompareExchange(wolfSSL_Atomic_Int* c,
return 1;
}
else {
*expected_i = (int)actual_i;
*expected_i = (WC_ATOMIC_INT_ARG)actual_i;
return 0;
}
}
@@ -2060,7 +2066,7 @@ int wolfSSL_Atomic_Uint_CompareExchange(
return 1;
}
else {
*expected_i = (unsigned int)actual_i;
*expected_i = (WC_ATOMIC_UINT_ARG)actual_i;
return 0;
}
}
wolfssl/wolfcrypt/wc_port.h
+12 -4
View File
@@ -539,7 +539,7 @@
typedef WC_ATOMIC_UINT_ARG wolfSSL_Atomic_Uint;
#define WOLFSSL_ATOMIC_INITIALIZER(x) (x)
#define WOLFSSL_ATOMIC_LOAD(x) (x)
#define WOLFSSL_ATOMIC_STORE(x, val) (x) = (val)
#define WOLFSSL_ATOMIC_STORE(x, val) (void)((x) = (val))
#define WOLFSSL_ATOMIC_OPS
#elif defined(WOLFSSL_BSDKM)
/* Note: <stdatomic.h> can be safely included in both linux kernel and
@@ -567,7 +567,8 @@
#define WOLFSSL_ATOMIC_STORE(x, val) __atomic_store_n(&(x), \
val, __ATOMIC_RELEASE)
#define WOLFSSL_ATOMIC_OPS
#elif defined(_MSC_VER) && !defined(WOLFSSL_NOT_WINDOWS_API)
#elif defined(_MSC_VER) && defined(USE_WINDOWS_API) && \
!defined(WOLFSSL_NOT_WINDOWS_API)
/* Use MSVC compiler intrinsics for atomic ops */
#ifdef _WIN32_WCE
#include <armintr.h>
@@ -577,8 +578,15 @@
typedef volatile long wolfSSL_Atomic_Int;
typedef volatile unsigned long wolfSSL_Atomic_Uint;
#define WOLFSSL_ATOMIC_INITIALIZER(x) (x)
#define WOLFSSL_ATOMIC_LOAD(x) (x)
#define WOLFSSL_ATOMIC_STORE(x, val) (x) = (val)
/* Acquire-ordered load via idempotent RMW: OR-with-0 leaves the value
* unchanged but provides atomicity + acquire ordering. On cl.exe this
* is a locked RMW; LLVM (clang-cl) may lower it to a plain acquire
* load.
*/
#define WOLFSSL_ATOMIC_LOAD(x) \
InterlockedOrAcquire((volatile long *)&(x), 0)
#define WOLFSSL_ATOMIC_STORE(x, val) \
(void)InterlockedExchange((volatile long *)&(x), (long)(val))
#define WOLFSSL_ATOMIC_OPS
#endif