Merge branch 'feat/update_openthread_submodule_and_br_lib_20260624_v6.0' into 'release/v6.0'

feat(openthread): update openthread submodule (v6.0)

See merge request espressif/esp-idf!50519

components/openthread/private_include/openthread-core-esp32x-radio-config.h

@@ -280,5 +280,34 @@
 #define OPENTHREAD_CONFIG_MAC_SOFTWARE_TX_TIMING_ENABLE 1
 #endif
 
+/**
+ * @def OPENTHREAD_CONFIG_PLATFORM_MAC_KEYS_EXPORTABLE_ENABLE
+ *
+ * Define to 1 if you want to make MAC keys exportable.
+ */
+#ifndef OPENTHREAD_CONFIG_PLATFORM_MAC_KEYS_EXPORTABLE_ENABLE
+#define OPENTHREAD_CONFIG_PLATFORM_MAC_KEYS_EXPORTABLE_ENABLE 1
+#endif
+
+/**
+ * @def OPENTHREAD_CONFIG_CRYPTO_LIB
+ *
+ * Selects the crypto backend library for OpenThread.
+ *
+ * There are several options available
+ * - @sa OPENTHREAD_CONFIG_CRYPTO_LIB_MBEDTLS
+ * - @sa OPENTHREAD_CONFIG_CRYPTO_LIB_PSA
+ * - @sa OPENTHREAD_CONFIG_CRYPTO_LIB_PLATFORM
+ */
+#ifndef OPENTHREAD_CONFIG_CRYPTO_LIB
 #define OPENTHREAD_CONFIG_CRYPTO_LIB OPENTHREAD_CONFIG_CRYPTO_LIB_PSA
-#define OPENTHREAD_CONFIG_PLATFORM_KEY_REFERENCES_ENABLE 0
+#endif
+
+/**
+ * @def OPENTHREAD_CONFIG_PLATFORM_KEY_REFERENCES_ENABLE
+ *
+ * Define to 1 if you want to enable key ref usage support as defined by platform.
+ */
+#ifndef OPENTHREAD_CONFIG_PLATFORM_KEY_REFERENCES_ENABLE
+#define OPENTHREAD_CONFIG_PLATFORM_KEY_REFERENCES_ENABLE 1
+#endif

components/openthread/private_include/openthread-core-esp32x-spinel-config.h

@@ -88,3 +88,13 @@
 #ifndef OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
 #define OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE 1
 #endif
+
+/**
+ * @def OPENTHREAD_CONFIG_MAC_SOFTWARE_RETX_SECURITY_ENABLE
+ *
+ * Workaround for SPINEL_ONLY build configuration.
+ * See esp-idf MR !50530 for details.
+ */
+#ifndef OPENTHREAD_CONFIG_MAC_SOFTWARE_RETX_SECURITY_ENABLE
+#define OPENTHREAD_CONFIG_MAC_SOFTWARE_RETX_SECURITY_ENABLE 0
+#endif

components/openthread/sbom_openthread.yml

@@ -5,7 +5,7 @@ supplier: 'Organization: Espressif Systems (Shanghai) CO LTD'
 originator: 'Organization: Google LLC'
 description: OpenThread released by Google is an open-source implementation of the Thread networking
 url: https://github.com/espressif/openthread
-hash: a98813b30ae58f9a95ece680b9cc46c3874de6ea
+hash: b678a4f63b6f9397d1a0fa8f31e5b8e0271a4d00
 cve-exclude-list:
   - cve: CVE-2026-8369
     reason: We use Espressif’s NAT64 implementation and hence this CVE from the upstream NAT64 implementation is not applicable.

components/openthread/src/port/esp_openthread_trel.c

@@ -64,7 +64,12 @@ static int s_trel_event_fd = -1;
 static void trel_browse_notifier(mdns_result_t *result)
 {
     while (result) {
-        if (result->addr && result->addr->addr.type == IPADDR_TYPE_V6) {
+        mdns_ip_addr_t *addr = result->addr;
+        while (addr && addr->addr.type != IPADDR_TYPE_V6) {
+            addr = addr->next;
+        }
+
+        if (addr) {
             otPlatTrelPeerInfo info;
             uint8_t *trel_txt = NULL;
             size_t trel_txt_len = 0;
@@ -104,9 +109,9 @@ static void trel_browse_notifier(mdns_result_t *result)
             info.mTxtData = trel_txt;
             info.mTxtLength = trel_txt_len;
             info.mSockAddr.mPort = result->port;
-            memcpy(info.mSockAddr.mAddress.mFields.m32, result->addr->addr.u_addr.ip6.addr, OT_IP6_ADDRESS_SIZE);
+            memcpy(info.mSockAddr.mAddress.mFields.m32, addr->addr.u_addr.ip6.addr, OT_IP6_ADDRESS_SIZE);
             info.mRemoved = (result->ttl == 0);
-            ESP_LOGI(OT_PLAT_LOG_TAG, "%s TREL peer: address: %s, port:%d", info.mRemoved ? "Remove" : "Found", ip6addr_ntoa((ip6_addr_t*)(&result->addr->addr.u_addr.ip6)), info.mSockAddr.mPort);
+            ESP_LOGI(OT_PLAT_LOG_TAG, "%s TREL peer: address: %s, port:%d", info.mRemoved ? "Remove" : "Found", ip6addr_ntoa((ip6_addr_t*)(&addr->addr.u_addr.ip6)), info.mSockAddr.mPort);
             esp_openthread_task_switching_lock_acquire(portMAX_DELAY);
             otPlatTrelHandleDiscoveredPeerInfo(esp_openthread_get_instance(), &info);
             esp_openthread_task_switching_lock_release();

components/openthread/srcs_radio.cmake

@@ -41,6 +41,7 @@ set(rcp_srcs
     openthread/src/core/radio/radio.cpp
     openthread/src/core/radio/radio_callbacks.cpp
     openthread/src/core/radio/radio_platform.cpp
+    openthread/src/core/radio/radio_types.cpp
     openthread/src/core/thread/link_quality.cpp
     openthread/src/core/utils/otns.cpp
     openthread/src/core/utils/parse_cmdline.cpp