Merge pull request #7652 from douzzer/20240617-fix-wc_Sha256-overalignment

20240617-fix-wc_Sha256-overalignment
This commit is contained in:
Sean Parkinson
2024-06-18 10:39:15 +10:00
committed by GitHub
2 changed files with 5 additions and 6 deletions

View File

@ -3086,12 +3086,6 @@ extern void uITRON4_free(void *p) ;
#define OPENSSL_EXTRA_X509_SMALL
#endif /* OPENSSL_EXTRA */
/* compatibility for EVP_CipherUpdate with AES-GCM */
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL)
#undef WOLFSSL_AESGCM_STREAM
#define WOLFSSL_AESGCM_STREAM
#endif
/* support for converting DER to PEM */
#if (defined(WOLFSSL_KEY_GEN) && !defined(WOLFSSL_NO_DER_TO_PEM)) || \
defined(WOLFSSL_CERT_GEN) || defined(OPENSSL_EXTRA)

View File

@ -179,9 +179,14 @@ struct wc_Sha256 {
#elif defined(WOLFSSL_HAVE_PSA) && !defined(WOLFSSL_PSA_NO_HASH)
psa_hash_operation_t psa_ctx;
#else
#ifdef WC_64BIT_CPU
/* alignment on digest and buffer speeds up ARMv8 crypto operations */
ALIGN16 word32 digest[WC_SHA256_DIGEST_SIZE / sizeof(word32)];
ALIGN16 word32 buffer[WC_SHA256_BLOCK_SIZE / sizeof(word32)];
#else
word32 digest[WC_SHA256_DIGEST_SIZE / sizeof(word32)];
word32 buffer[WC_SHA256_BLOCK_SIZE / sizeof(word32)];
#endif
word32 buffLen; /* in bytes */
word32 loLen; /* length in bytes */
word32 hiLen; /* length in bytes */