Merge pull request #7087 from dgarske/cryptocb_sha1

Allow crypto callbacks with SHA-1 HW
pull/7090/head
Sean Parkinson 2023-12-22 07:54:50 +10:00 committed by GitHub
commit f5ff72aa56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 35 deletions

View File

@ -122,48 +122,48 @@ enum {
/* Sha digest */ /* Sha digest */
struct wc_Sha { struct wc_Sha {
#ifdef FREESCALE_LTC_SHA #ifdef FREESCALE_LTC_SHA
ltc_hash_ctx_t ctx; ltc_hash_ctx_t ctx;
#elif defined(WOLFSSL_SE050) && defined(WOLFSSL_SE050_HASH) #elif defined(WOLFSSL_SE050) && defined(WOLFSSL_SE050_HASH)
SE050_HASH_Context se050Ctx; SE050_HASH_Context se050Ctx;
#elif defined(STM32_HASH) #elif defined(STM32_HASH)
STM32_HASH_Context stmCtx; STM32_HASH_Context stmCtx;
#elif defined(WOLFSSL_SILABS_SE_ACCEL) #elif defined(WOLFSSL_SILABS_SE_ACCEL)
wc_silabs_sha_t silabsCtx; wc_silabs_sha_t silabsCtx;
#elif defined(WOLFSSL_IMXRT_DCP) #elif defined(WOLFSSL_IMXRT_DCP)
dcp_handle_t handle; dcp_handle_t handle;
dcp_hash_ctx_t ctx; dcp_hash_ctx_t ctx;
#elif defined(WOLFSSL_HAVE_PSA) && !defined(WOLFSSL_PSA_NO_HASH) #elif defined(WOLFSSL_HAVE_PSA) && !defined(WOLFSSL_PSA_NO_HASH)
psa_hash_operation_t psa_ctx; psa_hash_operation_t psa_ctx;
#else #else
word32 buffLen; /* in bytes */ word32 buffLen; /* in bytes */
word32 loLen; /* length in bytes */ word32 loLen; /* length in bytes */
word32 hiLen; /* length in bytes */ word32 hiLen; /* length in bytes */
word32 buffer[WC_SHA_BLOCK_SIZE / sizeof(word32)]; word32 buffer[WC_SHA_BLOCK_SIZE / sizeof(word32)];
#ifdef WOLFSSL_PIC32MZ_HASH #ifdef WOLFSSL_PIC32MZ_HASH
word32 digest[PIC32_DIGEST_SIZE / sizeof(word32)]; word32 digest[PIC32_DIGEST_SIZE / sizeof(word32)];
#else #else
word32 digest[WC_SHA_DIGEST_SIZE / sizeof(word32)]; word32 digest[WC_SHA_DIGEST_SIZE / sizeof(word32)];
#endif
void* heap;
#ifdef WOLFSSL_PIC32MZ_HASH
hashUpdCache cache; /* cache for updates */
#endif
#ifdef WOLFSSL_ASYNC_CRYPT
WC_ASYNC_DEV asyncDev;
#endif /* WOLFSSL_ASYNC_CRYPT */
#ifdef WOLF_CRYPTO_CB
int devId;
void* devCtx; /* generic crypto callback context */
#endif
#ifdef WOLFSSL_IMXRT1170_CAAM
caam_hash_ctx_t ctx;
caam_handle_t hndl;
#endif
#if defined(WOLFSSL_DEVCRYPTO_HASH) || defined(WOLFSSL_HASH_KEEP)
byte* msg;
word32 used;
word32 len;
#endif #endif
void* heap;
#endif
#ifdef WOLFSSL_PIC32MZ_HASH
hashUpdCache cache; /* cache for updates */
#endif
#ifdef WOLFSSL_ASYNC_CRYPT
WC_ASYNC_DEV asyncDev;
#endif /* WOLFSSL_ASYNC_CRYPT */
#ifdef WOLF_CRYPTO_CB
int devId;
void* devCtx; /* generic crypto callback context */
#endif
#ifdef WOLFSSL_IMXRT1170_CAAM
caam_hash_ctx_t ctx;
caam_handle_t hndl;
#endif
#if defined(WOLFSSL_DEVCRYPTO_HASH) || defined(WOLFSSL_HASH_KEEP)
byte* msg;
word32 used;
word32 len;
#endif #endif
#if defined(WOLFSSL_ESP32_CRYPT) && \ #if defined(WOLFSSL_ESP32_CRYPT) && \
!defined(NO_WOLFSSL_ESP32_CRYPT_HASH) !defined(NO_WOLFSSL_ESP32_CRYPT_HASH)

View File

@ -164,7 +164,7 @@ struct wc_Sha256 {
#elif defined(STM32_HASH_SHA2) #elif defined(STM32_HASH_SHA2)
STM32_HASH_Context stmCtx; STM32_HASH_Context stmCtx;
#elif defined(WOLFSSL_SILABS_SE_ACCEL) #elif defined(WOLFSSL_SILABS_SE_ACCEL)
wc_silabs_sha_t silabsCtx; wc_silabs_sha_t silabsCtx;
#elif defined(WOLFSSL_IMXRT_DCP) #elif defined(WOLFSSL_IMXRT_DCP)
dcp_handle_t handle; dcp_handle_t handle;
dcp_hash_ctx_t ctx; dcp_hash_ctx_t ctx;

View File

@ -159,7 +159,7 @@ struct wc_Sha512 {
WC_ESP32SHA ctx; WC_ESP32SHA ctx;
#endif #endif
#if defined(WOLFSSL_SILABS_SE_ACCEL) #if defined(WOLFSSL_SILABS_SE_ACCEL)
wc_silabs_sha_t silabsCtx; wc_silabs_sha_t silabsCtx;
#endif #endif
#ifdef WOLFSSL_KCAPI_HASH #ifdef WOLFSSL_KCAPI_HASH
wolfssl_KCAPI_Hash kcapi; wolfssl_KCAPI_Hash kcapi;