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

XCODE support for v5.2.3 of the FIPS module #7140

Merged
merged 2 commits into from
Jun 21, 2024

Conversation

kaleb-himes
Copy link
Contributor

Description

Fixes some warnings found by XCODE and adds options for customer(s) who will be depending on v5.3.0 of the FIPS module.

Testing

See fips repo for test applications, full harness and optesting done in-house, ready to go to a CSTL for review

Checklist

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

lealem47
lealem47 previously approved these changes Jan 18, 2024
@lealem47
Copy link
Contributor

Jenkins Retest this please

@kaleb-himes kaleb-himes changed the title XCODE support for v5.3.0 of the FIPS module XCODE support for v5.2.3 of the FIPS module Jan 23, 2024
@kaleb-himes
Copy link
Contributor Author

NOTE: After internal versioning discussion, changing version to v5.2.3 from v5.3.0 which is in contention with fips-ready and fips-dev

@@ -374,6 +432,7 @@ extern "C" {
#undef WOLFSSL_SHA3
#if 1
#define WOLFSSL_SHA3
#define Sha3 wc_Sha3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be handled in wolfssl/wolfcrypt/sha3.h as long as NO_OLD_WC_NAMES is not defined?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sha3.h gets replaced by an older version of sha3.h when FIPS is checked out, unfortunately that older version doesn't handle this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double checking to be sure.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ope, I was wrong. Good catch, thank you! Updated user_settings.h to define NO_OLD_WC_NAMES.

@JacobBarthelmeh
Copy link
Contributor

This looks good, @kaleb-himes please rebase it onto master branch when you get a chance and resolve the merge conflict.

@kaleb-himes
Copy link
Contributor Author

rebased on Jun 21 2024

@JacobBarthelmeh JacobBarthelmeh merged commit aea32e3 into wolfSSL:master Jun 21, 2024
119 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.

4 participants