Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 18:50:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/disable-key-mgr_v6.0' into 'release/v6.0'

Browse Source 
Disable Key Manager support (v6.0)

See merge request espressif/esp-idf!51391
This commit is contained in:
Mahavir Jain
2026-09-03 13:42:49 +05:30
parent e06143eb5e 516e849636
commit 78f0f418c8
23 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_hal_security/CMakeLists.txt
+4 -1
View File
@@ -72,8 +72,11 @@ elseif(NOT BOOTLOADER_BUILD)
endif()
# Key Manager and HUK HAL (available in both bootloader and app builds)
if(CONFIG_SOC_KEY_MANAGER_SUPPORTED)
if(CONFIG_SOC_KEY_MANAGER_SUPPORT_KEY_DEPLOYMENT)
list(APPEND srcs "key_mgr_hal.c")
endif()
if(CONFIG_SOC_HUK_SUPPORTED)
list(APPEND srcs "huk_hal.c")
endif()
components/esp_hal_security/ecdsa_hal.c
+1 -1
View File
@@ -49,7 +49,7 @@ static void configure_ecdsa_periph(ecdsa_hal_config_t *conf)
key_mgr_hal_set_key_usage(ESP_KEY_MGR_ECDSA_KEY, ESP_KEY_MGR_USE_EFUSE_KEY);
#endif
}
#if SOC_KEY_MANAGER_SUPPORTED
#if SOC_KEY_MANAGER_ECDSA_KEY_DEPLOY
else {
if (!key_mgr_ll_is_supported()) {
HAL_ASSERT(false && "Key manager is not supported");
components/esp_hal_security/esp32c5/include/hal/huk_ll.h
+1 -1
View File
@@ -13,7 +13,7 @@
#include "soc/soc_caps.h"
#if SOC_KEY_MANAGER_SUPPORTED
#if SOC_HUK_SUPPORTED
#include <stdint.h>
#include <stdbool.h>
components/esp_hal_security/esp32p4/include/hal/huk_ll.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -13,7 +13,7 @@
#include "soc/soc_caps.h"
#if SOC_KEY_MANAGER_SUPPORTED
#if SOC_HUK_SUPPORTED
#include <stdint.h>
#include <stdbool.h>
components/esp_hal_security/huk_hal.c
+1 -1
View File
@@ -14,7 +14,7 @@
#include "esp_err.h"
#include "soc/soc_caps.h"
#if SOC_KEY_MANAGER_SUPPORTED
#if SOC_HUK_SUPPORTED
esp_huk_state_t huk_hal_get_state(void)
{
return huk_ll_get_state();
components/esp_hal_security/include/hal/huk_types.h
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -7,7 +7,7 @@
#include "soc/soc_caps.h"
#if SOC_KEY_MANAGER_SUPPORTED
#if SOC_HUK_SUPPORTED
#include "esp_assert.h"
#include "rom/km.h"
components/esp_hal_security/include/hal/key_mgr_hal.h
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -9,7 +9,7 @@
#include "soc/soc_caps.h"
#if SOC_KEY_MANAGER_SUPPORTED
#if SOC_KEY_MANAGER_SUPPORT_KEY_DEPLOYMENT
#include "hal/key_mgr_types.h"
#ifdef __cplusplus
@@ -138,4 +138,4 @@ void key_mgr_hal_set_date_info(const uint32_t date_info);
#ifdef __cplusplus
}
#endif
#endif /* SOC_KEY_MANAGER_SUPPORTED */
#endif /* SOC_KEY_MANAGER_SUPPORT_KEY_DEPLOYMENT */
components/esp_hal_security/test_apps/crypto/main/Kconfig.projbuild
+4 -1
View File
@@ -46,8 +46,11 @@ menu "Test App Configuration"
bool
default n if IDF_TARGET_ESP32P4 && ESP32P4_SELECTS_REV_LESS_V3
default y
depends on SOC_KEY_MANAGER_SUPPORTED
depends on SOC_KEY_MANAGER_SUPPORT_KEY_DEPLOYMENT
help
A hidden config to determine if the Key Manager tests should be included.
The tests build the esp_key_mgr driver from source so that the Key Manager
hardware stays covered by CI even on targets where IDF does not support
the Key Manager (SOC_KEY_MANAGER_SUPPORTED = 0).
endmenu