mirror of
https://github.com/esphome/esphome.git
synced 2025-10-12 23:03:46 +01:00
merge
This commit is contained in:
@@ -42,11 +42,7 @@ class SHA256 : public esphome::HashBase {
|
|||||||
// CRITICAL: The mbedtls context MUST be stack-allocated (not a pointer) for ESP32-S3 hardware SHA acceleration.
|
// CRITICAL: The mbedtls context MUST be stack-allocated (not a pointer) for ESP32-S3 hardware SHA acceleration.
|
||||||
// The ESP32-S3 DMA engine references this structure's memory addresses. If the context is passed to another
|
// The ESP32-S3 DMA engine references this structure's memory addresses. If the context is passed to another
|
||||||
// function (crossing stack frames) or if VLAs are present, the DMA operations will corrupt memory and produce
|
// function (crossing stack frames) or if VLAs are present, the DMA operations will corrupt memory and produce
|
||||||
<<<<<<< HEAD
|
|
||||||
// truncated/incorrect hash results. See s3_hardware_sha.md for details.
|
|
||||||
=======
|
|
||||||
// truncated/incorrect hash results.
|
// truncated/incorrect hash results.
|
||||||
>>>>>>> upstream/dev
|
|
||||||
mbedtls_sha256_context ctx_{};
|
mbedtls_sha256_context ctx_{};
|
||||||
#elif defined(USE_ESP8266) || defined(USE_RP2040)
|
#elif defined(USE_ESP8266) || defined(USE_RP2040)
|
||||||
br_sha256_context ctx_{};
|
br_sha256_context ctx_{};
|
||||||
|
Reference in New Issue
Block a user