Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue with error: conflicting types for 'BlockSha3' #8123

Merged
merged 2 commits into from
Oct 30, 2024

Conversation

dgarske
Copy link
Contributor

@dgarske dgarske commented Oct 29, 2024

Description

[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);
      |                    ^~~~~~~~~

Testing

wolfBoot cp ./config/examples/zynqmp.config .config

Checklist

  • added tests
  • updated/added doxygen
  • updated appropriate READMEs
  • Updated manual and documentation

```
[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);
      |                    ^~~~~~~~~
```
@dgarske dgarske self-assigned this Oct 29, 2024
@dgarske
Copy link
Contributor Author

dgarske commented Oct 29, 2024

@SparkiDev , is there a reason we don't include #include <stdint.h> at the top of these arm asm files? For example they use uint64_t and wolfSSL headers do not explicitly include it. In wolfBoot I had to add to the user_settings.h to get it to build.

SparkiDev
SparkiDev previously approved these changes Oct 29, 2024
@SparkiDev
Copy link
Contributor

We shouldn't be using uint64_t. These need to change to word64.

@dgarske
Copy link
Contributor Author

dgarske commented Oct 30, 2024

Retest this please: Unit.test for 'PRB-dtls.txt_27'

@dgarske dgarske assigned SparkiDev and unassigned dgarske Oct 30, 2024
@SparkiDev SparkiDev merged commit 614a0e3 into wolfSSL:master Oct 30, 2024
142 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants