Skip to content

Commit

Permalink
Fix issue with error: conflicting types for 'BlockSha3'.
Browse files Browse the repository at this point in the history
```
[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);
      |                    ^~~~~~~~~
```
  • Loading branch information
dgarske committed Oct 29, 2024
1 parent 72306b9 commit c557c6f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions wolfcrypt/src/port/arm/armv8-sha3-asm_c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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__
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit c557c6f

Please sign in to comment.