From ab7b5d87a0340b5d5f383a43e2760afcd6c10ab6 Mon Sep 17 00:00:00 2001
From: liamcottle <liam@liamcottle.com>
Date: Sun, 15 Nov 2026 18:22:21 +1300
Subject: [PATCH] workaround for CC310 where mutex can still be locked after a
 failed verification

---
 src/Identity.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Identity.cpp b/src/Identity.cpp
index 51a01ae71d8..045fe097b83 100644
--- a/src/Identity.cpp
+++ b/src/Identity.cpp
@@ -7,6 +7,10 @@
 #ifdef USE_CC310_HW_CRYPTO
 #include <Adafruit_nRFCrypto.h>
 #include "nrf_cc310/include/crys_ec_edw_api.h"
+#include "nrf_cc310/include/ssi_pal_mutex.h"
+extern "C" {
+  extern SaSi_PalMutex sasiAsymCryptoMutex;
+}
 #endif
 
 namespace mesh {
@@ -30,6 +34,13 @@ bool Identity::verify(const uint8_t* sig, const uint8_t* message, int msg_len) c
   CRYSError_t rc = CRYS_ECEDW_Verify((uint8_t*)sig, CRYS_ECEDW_SIGNATURE_BYTES,
                                      (uint8_t*)pub_key, CRYS_ECEDW_MOD_SIZE_IN_BYTES,
                                      (uint8_t*)message, (size_t)msg_len, &cc310_tmp);
+
+  // workaround for CC310 v0.9.13 where mutex can still be locked after a failed verification
+  if (rc != CRYS_OK && sasiAsymCryptoMutex != 0) {
+    MESH_DEBUG_PRINTLN("CRYS_ECEDW_Verify mutex still locked after error result, unlocking");
+    SaSi_PalMutexUnlock(&sasiAsymCryptoMutex);
+  }
+
   return rc == CRYS_OK;
 #elif 0
   // NOTE:  memory corruption bug was found in this function!!