Skip to content

Bring in fips.h into pwdbased.h for FIPS v6+ - #11328

Merged
philljj merged 1 commit into
wolfSSL:masterfrom
lealem47:pwdbased_fips
Sep 4, 2026
Merged

Bring in fips.h into pwdbased.h for FIPS v6+#11328
philljj merged 1 commit into
wolfSSL:masterfrom
lealem47:pwdbased_fips

Conversation

@lealem47

Copy link
Copy Markdown
Contributor

Description

Redirect PBKDF API's to _fips versions without requiring a manual fips.h include

Testing

Make check

Checklist

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

@lealem47 lealem47 self-assigned this Aug 31, 2026
@lealem47
lealem47 requested review from kaleb-himes and a lite review from Copilot August 31, 2026 22:19

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the wolfCrypt password-based key derivation header to automatically pull in the FIPS interface for FIPS v6+ builds, so PBKDF callers don’t need to manually include fips.h to reach the _fips redirections.

Changes:

  • Add a conditional #include <wolfssl/wolfcrypt/fips.h> in pwdbased.h when FIPS_VERSION3_GE(6,0,0) is true.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread wolfssl/wolfcrypt/pwdbased.h
@lealem47

lealem47 commented Sep 1, 2026

Copy link
Copy Markdown
Contributor Author

Jenkins Retest this Please.

@kaleb-himes kaleb-himes left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thank you @lealem47

@lealem47

lealem47 commented Sep 3, 2026

Copy link
Copy Markdown
Contributor Author

Jenkins Retest this Please.

@lealem47 lealem47 assigned wolfSSL-Bot and kaleb-himes and unassigned lealem47 Sep 3, 2026
@philljj
philljj merged commit e107360 into wolfSSL:master Sep 4, 2026
385 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.

5 participants