From ac800d3820507c742560db851de6cfadeef527cd Mon Sep 17 00:00:00 2001 From: David Garske Date: Tue, 29 Apr 2025 22:10:00 -0700 Subject: [PATCH] Fix no `WOLFSSL_MUTEX_INITIALIZER` case. --- src/tpm2.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/tpm2.c b/src/tpm2.c index 9129632..407e2a7 100644 --- a/src/tpm2.c +++ b/src/tpm2.c @@ -493,8 +493,9 @@ static inline int TPM2_WolfCrypt_Init(void) if (rc == 0) rc = wc_SetSeed_Cb(wc_GenerateSeed); #endif - #ifndef WOLFSSL_MUTEX_INITIALIZER - wc_InitMutex(&gHwMutex); + #if !defined(WOLFTPM_NO_LOCK) && !defined(SINGLE_THREADED) && \ + !defined(WOLFSSL_MUTEX_INITIALIZER) + wc_InitMutex(&gHwLock); #endif } gWolfCryptRefCount++; @@ -693,8 +694,9 @@ TPM_RC TPM2_Cleanup(TPM2_CTX* ctx) if (gWolfCryptRefCount < 0) gWolfCryptRefCount = 0; if (gWolfCryptRefCount == 0) { - #ifndef WOLFSSL_MUTEX_INITIALIZER - wc_FreeMutex(&gHwMutex); + #if !defined(WOLFTPM_NO_LOCK) && !defined(SINGLE_THREADED) && \ + !defined(WOLFSSL_MUTEX_INITIALIZER) + wc_FreeMutex(&gHwLock); #endif wolfCrypt_Cleanup(); }