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

Improve the mutex_test test with pthreads. Fixes #3109

Browse Source
This commit is contained in:
David Garske
2020-07-28 08:19:32 -07:00
parent 8440973d99
commit 25fcd082d7
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/test/test.c
View File

@@ -28493,12 +28493,15 @@ int mutex_test(void)
XFREE(mm, NULL, DYNAMIC_TYPE_MUTEX); XFREE(mm, NULL, DYNAMIC_TYPE_MUTEX);
#endif #endif
/* Can optionally enable advanced pthread tests using "ENABLE_PTHREAD_LOCKFREE_TESTS" */
#ifdef WOLFSSL_PTHREADS #ifdef WOLFSSL_PTHREADS
if (wc_InitMutex(&m) != 0) if (wc_InitMutex(&m) != 0)
return -12701; return -12701;
if (wc_LockMutex(&m) != 0) if (wc_LockMutex(&m) != 0)
return -12702; return -12702;
#if !defined(WOLFSSL_SOLARIS) #if !defined(WOLFSSL_SOLARIS) && defined(ENABLE_PTHREAD_LOCKFREE_TESTS)
/* trying to free a locked mutex is not portable behavior with pthread */
/* Attempting to destroy a locked mutex results in undefined behavior */
if (wc_FreeMutex(&m) != BAD_MUTEX_E) if (wc_FreeMutex(&m) != BAD_MUTEX_E)
return -12703; return -12703;
#endif #endif
@@ -28506,7 +28509,8 @@ int mutex_test(void)
return -12704; return -12704;
if (wc_FreeMutex(&m) != 0) if (wc_FreeMutex(&m) != 0)
return -12705; return -12705;
#if !defined(WOLFSSL_NO_MUTEXLOCK_AFTER_FREE) #if !defined(WOLFSSL_SOLARIS) && defined(ENABLE_PTHREAD_LOCKFREE_TESTS)
/* Trying to use a pthread after free'ing is not portable behavior */
if (wc_LockMutex(&m) != BAD_MUTEX_E) if (wc_LockMutex(&m) != BAD_MUTEX_E)
return -12706; return -12706;
if (wc_UnLockMutex(&m) != BAD_MUTEX_E) if (wc_UnLockMutex(&m) != BAD_MUTEX_E)

1
wolfssl/wolfcrypt/settings.h
View File

@@ -1450,7 +1450,6 @@ extern void uITRON4_free(void *p) ;
#endif #endif
#ifdef WOLFSSL_SOLARIS #ifdef WOLFSSL_SOLARIS
#define WOLFSSL_NO_MUTEXLOCK_AFTER_FREE
/* Avoid naming clash with fp_zero from math.h > ieefp.h */ /* Avoid naming clash with fp_zero from math.h > ieefp.h */
#define WOLFSSL_DH_CONST #define WOLFSSL_DH_CONST
#endif #endif