From 0bdf8b54db64316ef8d205335fd4b6453fa71acd Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Fri, 30 May 2025 14:16:25 -0500 Subject: [PATCH] wolfssl/wolfcrypt/sha3.h: in asm prototypes section, snip out redundant prototypes for BlockSha3(), and add indentation for clarity. --- wolfssl/wolfcrypt/sha3.h | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/wolfssl/wolfcrypt/sha3.h b/wolfssl/wolfcrypt/sha3.h index 3280445c2..6cea28eb1 100644 --- a/wolfssl/wolfcrypt/sha3.h +++ b/wolfssl/wolfcrypt/sha3.h @@ -223,26 +223,22 @@ WOLFSSL_API int wc_Shake256_Copy(wc_Shake* src, wc_Sha3* dst); WOLFSSL_LOCAL void BlockSha3(word64 *s); #ifdef WC_SHA3_NO_ASM -/* asm speedups disabled */ -#if defined(USE_INTEL_SPEEDUP) && !defined(WC_MLKEM_NO_ASM) - /* native ML-KEM uses this directly. */ - WOLFSSL_LOCAL void sha3_blocksx4_avx2(word64* s); -#endif + /* asm speedups disabled */ + #if defined(USE_INTEL_SPEEDUP) && !defined(WC_MLKEM_NO_ASM) + /* native ML-KEM uses this directly. */ + WOLFSSL_LOCAL void sha3_blocksx4_avx2(word64* s); + #endif #elif defined(USE_INTEL_SPEEDUP) -WOLFSSL_LOCAL void sha3_block_n_bmi2(word64* s, const byte* data, word32 n, - word64 c); -WOLFSSL_LOCAL void sha3_block_bmi2(word64* s); -WOLFSSL_LOCAL void sha3_block_avx2(word64* s); -WOLFSSL_LOCAL void sha3_blocksx4_avx2(word64* s); -WOLFSSL_LOCAL void BlockSha3(word64 *s); + WOLFSSL_LOCAL void sha3_block_n_bmi2(word64* s, const byte* data, word32 n, + word64 c); + WOLFSSL_LOCAL void sha3_block_bmi2(word64* s); + WOLFSSL_LOCAL void sha3_block_avx2(word64* s); + WOLFSSL_LOCAL void sha3_blocksx4_avx2(word64* s); #elif defined(__aarch64__) && defined(WOLFSSL_ARMASM) -#ifdef WOLFSSL_ARMASM_CRYPTO_SHA3 -WOLFSSL_LOCAL void BlockSha3_crypto(word64 *s); -#endif -WOLFSSL_LOCAL void BlockSha3_base(word64 *s); -WOLFSSL_LOCAL void BlockSha3(word64 *s); -#elif defined(WOLFSSL_ARMASM) || defined(WOLFSSL_RISCV_ASM) -WOLFSSL_LOCAL void BlockSha3(word64 *s); + #ifdef WOLFSSL_ARMASM_CRYPTO_SHA3 + WOLFSSL_LOCAL void BlockSha3_crypto(word64 *s); + #endif + WOLFSSL_LOCAL void BlockSha3_base(word64 *s); #endif #ifdef __cplusplus