espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 03:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/update_disabling_hmac_jtag_method_v5.0' into 'release/v5.0'

Browse Source 
fix(esp_hw_support): update hmac toggle method due to discrepency in ROM code (v5.0)

See merge request espressif/esp-idf!29532
This commit is contained in:
Aditya Patwardhan
2024-03-13 19:25:09 +08:00
parent 20792606de 14d7caa921
commit 822399516c
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_hw_support/port/esp32c3/esp_hmac.c
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -159,7 +159,7 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
ESP_LOGD(TAG, "HMAC computation in downstream mode is completed.");
ets_hmac_disable();
periph_module_disable(PERIPH_HMAC_MODULE);
esp_crypto_hmac_lock_release();
@@ -169,9 +169,9 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
esp_err_t esp_hmac_jtag_disable()
{
esp_crypto_hmac_lock_acquire();
ets_hmac_enable();
periph_module_enable(PERIPH_HMAC_MODULE);
REG_SET_BIT(HMAC_SET_INVALIDATE_JTAG_REG, HMAC_INVALIDATE_JTAG);
ets_hmac_disable();
periph_module_disable(PERIPH_HMAC_MODULE);
esp_crypto_hmac_lock_release();
ESP_LOGD(TAG, "Invalidate JTAG result register. JTAG disabled.");

6
components/esp_hw_support/port/esp32h2/esp_hmac.c
View File

@@ -159,7 +159,7 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
ESP_LOGD(TAG, "HMAC computation in downstream mode is completed.");
ets_hmac_disable();
periph_module_disable(PERIPH_HMAC_MODULE);
esp_crypto_hmac_lock_release();
@@ -169,9 +169,9 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
esp_err_t esp_hmac_jtag_disable()
{
esp_crypto_hmac_lock_acquire();
ets_hmac_enable();
periph_module_enable(PERIPH_HMAC_MODULE);
REG_SET_BIT(HMAC_SET_INVALIDATE_JTAG_REG, HMAC_INVALIDATE_JTAG);
ets_hmac_disable();
periph_module_disable(PERIPH_HMAC_MODULE);
esp_crypto_hmac_lock_release();
ESP_LOGD(TAG, "Invalidate JTAG result register. JTAG disabled.");

10
components/esp_hw_support/port/esp32s3/esp_hmac.c
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -160,7 +160,7 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
ESP_LOGD(TAG, "HMAC computation in downstream mode is completed.");
ets_hmac_disable();
periph_module_disable(PERIPH_HMAC_MODULE);
esp_crypto_hmac_lock_release();
@@ -170,9 +170,9 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
esp_err_t esp_hmac_jtag_disable()
{
esp_crypto_hmac_lock_acquire();
ets_hmac_enable();
REG_SET_BIT(HMAC_SET_INVALIDATE_JTAG_REG, HMAC_INVALIDATE_JTAG);
ets_hmac_disable();
periph_module_enable(PERIPH_HMAC_MODULE);
REG_WRITE(HMAC_SET_INVALIDATE_JTAG_REG, 1);
periph_module_disable(PERIPH_HMAC_MODULE);
esp_crypto_hmac_lock_release();
ESP_LOGD(TAG, "Invalidate JTAG result register. JTAG disabled.");