Fix the NXP MMCAU HW acceleration for SHA2-256. Broken with LMS SHA2 refactor.

pull/7389/head
David Garske 2024-04-02 19:32:41 -07:00
parent d930825a92
commit d7c6d7af44
1 changed files with 7 additions and 4 deletions

View File

@ -168,8 +168,7 @@ on the specific device platform.
#define HAVE_INTEL_RORX #define HAVE_INTEL_RORX
#endif #endif
#if defined(LITTLE_ENDIAN_ORDER)
#if defined(LITTLE_ENDIAN_ORDER) && !defined(FREESCALE_MMCAU_SHA)
#if ( defined(CONFIG_IDF_TARGET_ESP32C2) || \ #if ( defined(CONFIG_IDF_TARGET_ESP32C2) || \
defined(CONFIG_IDF_TARGET_ESP8684) || \ defined(CONFIG_IDF_TARGET_ESP8684) || \
defined(CONFIG_IDF_TARGET_ESP32C3) || \ defined(CONFIG_IDF_TARGET_ESP32C3) || \
@ -182,20 +181,24 @@ on the specific device platform.
* depending on if HW is active or not. */ * depending on if HW is active or not. */
#define SHA256_REV_BYTES(ctx) \ #define SHA256_REV_BYTES(ctx) \
(esp_sha_need_byte_reversal(ctx)) (esp_sha_need_byte_reversal(ctx))
#elif defined(FREESCALE_MMCAU_SHA)
#define SHA256_REV_BYTES(ctx) 1 /* reverse needed on final */
#endif #endif
#endif #endif
#ifndef SHA256_REV_BYTES #ifndef SHA256_REV_BYTES
#if defined(LITTLE_ENDIAN_ORDER) && !defined(FREESCALE_MMCAU_SHA) #if defined(LITTLE_ENDIAN_ORDER)
#define SHA256_REV_BYTES(ctx) 1 #define SHA256_REV_BYTES(ctx) 1
#else #else
#define SHA256_REV_BYTES(ctx) 0 #define SHA256_REV_BYTES(ctx) 0
#endif #endif
#endif #endif
#if defined(LITTLE_ENDIAN_ORDER) && !defined(FREESCALE_MMCAU_SHA) && \ #if defined(LITTLE_ENDIAN_ORDER) && \
defined(WOLFSSL_X86_64_BUILD) && defined(USE_INTEL_SPEEDUP) && \ defined(WOLFSSL_X86_64_BUILD) && defined(USE_INTEL_SPEEDUP) && \
(defined(HAVE_INTEL_AVX1) || defined(HAVE_INTEL_AVX2)) (defined(HAVE_INTEL_AVX1) || defined(HAVE_INTEL_AVX2))
#define SHA256_UPDATE_REV_BYTES(ctx) \ #define SHA256_UPDATE_REV_BYTES(ctx) \
(!IS_INTEL_AVX1(intel_flags) && !IS_INTEL_AVX2(intel_flags)) (!IS_INTEL_AVX1(intel_flags) && !IS_INTEL_AVX2(intel_flags))
#elif defined(FREESCALE_MMCAU_SHA)
#define SHA256_UPDATE_REV_BYTES(ctx) 0 /* reverse not needed on update */
#else #else
#define SHA256_UPDATE_REV_BYTES(ctx) SHA256_REV_BYTES(ctx) #define SHA256_UPDATE_REV_BYTES(ctx) SHA256_REV_BYTES(ctx)
#endif #endif