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

fix(esp_security): Stop ECDSA and Key Manager resets from corrupting concurrent crypto

Browse Source 
ECDSA enable pulses a reset that also holds SHA in reset, and SHA shares
its DMA with AES. Key Manager enable pulses a reset that also covers the
XTS-AES flash encryption key-usage selector. Neither path was serialized
against those victims, so a hardware ECDSA/HMAC/DS operation could
corrupt a concurrent SHA/AES transfer or an in-flight encrypted flash
read.

- Take the SHA/AES lock inside esp_crypto_ecdsa_lock_acquire(), before
  MPI, matching the DS lock order (sha_aes < mpi)
- Add esp_crypto_key_mgr_enable_periph_clk_no_reset() and switch ECDSA,
  HMAC and DS to it; they only need the key-usage selector writable
- Hold esp_crypto_key_manager_lock across those clock enable/disable
  pairs so selector writes stay serialized without resetting KM
This commit is contained in:
radek.tandler
2026-09-08 19:46:19 +05:30
committed by Harshal Patil
parent d27411ddb9
commit da41d31a14
7 changed files with 94 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_security/include/esp_crypto_periph_clk.h
+21 -1
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2025-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -63,10 +63,30 @@ void esp_crypto_ecdsa_enable_periph_clk(bool enable);
/**
* @brief Enable or disable the Key Manager peripheral clock
*
* When enable is true this also pulses the Key Manager reset. The caller must
* hold esp_crypto_key_manager_lock across the matching true/false pair, because
* that reset also covers the XTS-AES flash encryption key-usage selector.
*
* Prefer esp_crypto_key_mgr_enable_periph_clk_no_reset() when the caller only
* needs the key-usage selector writable (ECDSA/HMAC/DS).
*
* @param enable true: enable; false: disable
*/
void esp_crypto_key_mgr_enable_periph_clk(bool enable);
/**
* @brief Enable or disable the Key Manager clocks without resetting the peripheral
*
* Use this when a crypto accelerator only needs to write its own key-usage
* selector. Resetting would drop the XTS-AES flash encryption selector that
* MSPI may be using, and flash DMA does not take the Key Manager lock.
* The caller must still hold esp_crypto_key_manager_lock across the matching
* true/false pair to serialize selector writes.
*
* @param enable true: enable; false: disable
*/
void esp_crypto_key_mgr_enable_periph_clk_no_reset(bool enable);
#ifdef __cplusplus
}
#endif