Merge branch 'master' into update-availability

Author: andy31415

.github/actions/bootstrap/action.yaml

@@ -26,8 +26,11 @@ runs:
         # because the bootstrapped Pigweed environment contains absolute paths.
         echo "Calculating bootstrap cache key for '$PWD'"
         FILES_HASH="${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}"
-        OS_HASH="$(md5sum /etc/lsb-release | cut -d' ' -f1)"
-        PYTHON_HASH="$(python --version | md5sum | cut -d' ' -f1)"
+        case "$RUNNER_OS" in
+          macOS) OS_HASH="$(sw_vers | shasum -a 256 | cut -d' ' -f1)";;
+          *)     OS_HASH="$(shasum -a 256 /etc/lsb-release | cut -d' ' -f1)";;
+        esac
+        PYTHON_HASH="$(python --version | shasum -a 256 | cut -d' ' -f1)"
         FINAL_HASH="$(echo "$PWD:$FILES_HASH:$OS_HASH:$PYTHON_HASH" | shasum -a 256 | cut -d' ' -f1)"
         echo key="${RUNNER_OS}-${RUNNER_ARCH}-${{ inputs.platform }}-${FINAL_HASH}" | tee -a "$GITHUB_OUTPUT"
 

src/platform/silabs/PlatformManagerImpl.cpp

@@ -47,13 +47,13 @@ namespace DeviceLayer {
 PlatformManagerImpl PlatformManagerImpl::sInstance;
 
 #if defined(SL_MBEDTLS_USE_TINYCRYPT)
-sys_mutex_t PlatformManagerImpl::rngMutexHandle = NULL;
+osMutexId_t PlatformManagerImpl::rngMutexHandle = nullptr;
 
 int PlatformManagerImpl::uECC_RNG_Function(uint8_t * dest, unsigned int size)
 {
-    sys_mutex_lock(&rngMutexHandle);
+    osMutexAcquire(rngMutexHandle, osWaitForever);
     int res = (chip::Crypto::DRBG_get_bytes(dest, size) == CHIP_NO_ERROR) ? size : 0;
-    sys_mutex_unlock(&rngMutexHandle);
+    osMutexRelease(rngMutexHandle);
 
     return res;
 }
@@ -97,7 +97,8 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
     ReturnErrorOnFailure(chip::Crypto::add_entropy_source(app_entropy_source, NULL, 16));
 #endif // !SLI_SI91X_MCU_INTERFACE
     /* Set RNG function for tinycrypt operations. */
-    VerifyOrExit(sys_mutex_new(&rngMutexHandle) == ERR_OK, err = CHIP_ERROR_NO_MEMORY);
+    rngMutexHandle = osMutexNew(nullptr);
+    VerifyOrExit((&rngMutexHandle != nullptr), err = CHIP_ERROR_NO_MEMORY);
     uECC_set_rng(PlatformManagerImpl::uECC_RNG_Function);
 #endif // SL_MBEDTLS_USE_TINYCRYPT
 

src/platform/silabs/PlatformManagerImpl.h

@@ -28,6 +28,7 @@
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
 #include "wfx_host_events.h"
 #endif
+#include <cmsis_os2.h>
 
 namespace chip {
 namespace DeviceLayer {
@@ -45,7 +46,7 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
     // Since the RNG callback will be called from multiple threads,
     // use this mutex to lock/unlock the call to Matter RNG API, which
     // uses some global variables.
-    static sys_mutex_t rngMutexHandle;
+    static osMutexId_t rngMutexHandle;
 
     // Callback used by tinycrypt to generate random numbers.
     // It must be set before calling any sign operations,

src/platform/silabs/SiWx917/wifi/wfx_host_events.h

@@ -23,7 +23,6 @@
 #include "wfx_msgs.h"
 
 /* LwIP includes. */
-#include "lwip/apps/httpd.h"
 #include "lwip/ip_addr.h"
 #include "lwip/netif.h"
 #include "lwip/netifapi.h"

src/platform/silabs/efr32/wifi/wfx_host_events.h

@@ -117,7 +117,6 @@ typedef struct __attribute__((__packed__)) sl_wfx_mib_req_s
 #endif /* WF200 */
 
 /* LwIP includes. */
-#include "lwip/apps/httpd.h"
 #include "lwip/ip_addr.h"
 #include "lwip/netif.h"
 #include "lwip/netifapi.h"