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 14:03:50 +05:30
committed by Harshal Patil
parent b10ae7f167
commit ce27a6e7e0
7 changed files with 90 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_security/include/esp_crypto_lock.h
+8 -2
View File
@@ -110,14 +110,16 @@ void esp_crypto_ecc_lock_release(void);
/**
* @brief Acquire lock for ECDSA cryptography peripheral
*
* Internally also locks the ECC and MPI peripheral, as the ECDSA depends on these peripherals
* Internally also locks the ECC and MPI peripheral, as the ECDSA depends on these peripherals,
* and the SHA/AES peripheral, because the ECDSA reset holds SHA in reset as well
*/
void esp_crypto_ecdsa_lock_acquire(void);
/**
* @brief Release lock for ECDSA cryptography peripheral
*
* Internally also releases the ECC and MPI peripheral, as the ECDSA depends on these peripherals
* Internally also releases the ECC and MPI peripheral, as the ECDSA depends on these peripherals,
* and the SHA/AES peripheral, because the ECDSA reset holds SHA in reset as well
*/
void esp_crypto_ecdsa_lock_release(void);
#endif /* SOC_ECDSA_SUPPORTED */
@@ -126,12 +128,16 @@ void esp_crypto_ecdsa_lock_release(void);
/**
* @brief Acquire lock for Key Manager peripheral
*
* Must be held across esp_crypto_key_mgr_enable_periph_clk(true/false): that
* helper pulses the Key Manager reset, which also covers the XTS-AES flash
* encryption key-usage selector on targets that deploy FE keys through KM.
*/
void esp_crypto_key_manager_lock_acquire(void);
/**
* @brief Release lock for Key Manager peripheral
*
* Must be released only after the matching esp_crypto_key_mgr_enable_periph_clk(false).
*/
void esp_crypto_key_manager_lock_release(void);
#endif /* SOC_KEY_MANAGER_SUPPORT_KEY_DEPLOYMENT */