From c557c6f2bd7cc4d8f3870dc09153bf16ba68ebc2 Mon Sep 17 00:00:00 2001 From: David Garske Date: Tue, 29 Oct 2024 16:56:50 -0700 Subject: [PATCH] Fix issue with error: conflicting types for 'BlockSha3'. ``` [CC-AARCH64] lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha3-asm_c.o lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha3-asm_c.c:212:6: error: conflicting types for 'BlockSha3'; have 'void(long unsigned int *)' 212 | void BlockSha3(unsigned long* state) | ^~~~~~~~~ In file included from lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha3-asm_c.c:35: lib/wolfssl/wolfssl/wolfcrypt/sha3.h:224:20: note: previous declaration of 'BlockSha3' with type 'void(word64 *)' {aka 'void(long long unsigned int *)'} 224 | WOLFSSL_LOCAL void BlockSha3(word64 *s); | ^~~~~~~~~ ``` --- wolfcrypt/src/port/arm/armv8-sha3-asm_c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wolfcrypt/src/port/arm/armv8-sha3-asm_c.c b/wolfcrypt/src/port/arm/armv8-sha3-asm_c.c index e52d02de1..71ac40a22 100644 --- a/wolfcrypt/src/port/arm/armv8-sha3-asm_c.c +++ b/wolfcrypt/src/port/arm/armv8-sha3-asm_c.c @@ -63,7 +63,7 @@ static const uint64_t L_SHA3_transform_crypto_r[] = { 0x8000000080008008UL, }; -void BlockSha3(unsigned long* state) +void BlockSha3(word64* state) { __asm__ __volatile__ ( #ifdef __APPLE__ @@ -209,7 +209,7 @@ static const uint64_t L_SHA3_transform_base_r[] = { 0x8000000080008008UL, }; -void BlockSha3(unsigned long* state) +void BlockSha3(word64* state) { __asm__ __volatile__ ( "stp x29, x30, [sp, #-64]!\n\t"