Repository navigation
Replace V523_NONFIPS_SHAKE path reference to shake.c/h - #11900
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
🔵 Needs a closer look
The intended FIPS target needs maintainer confirmation because the diagnostic and eligibility checks specify different versions.
1 open issue
What changed in this PR
Updates the V523_NONFIPS_SHAKE integration introduced in #11831 to use standard wolfSSL paths instead of the internal fips/ directory, which is omitted from releases.
Changes:
- Updates SHAKE header references across library code, tests, and benchmarks.
- Adjusts configure checks and Automake build/install paths.
- Revises the prerequisite diagnostic to name FIPS 5.2.3 and certificate #5548.
| File | Description |
|---|---|
| wolfssl/wolfcrypt/wc_mlkem.h | Updates the SHAKE include while preserving include order. |
| wolfssl/wolfcrypt/wc_mldsa.h | Uses the standard SHAKE header path. |
| wolfssl/wolfcrypt/settings.h | Revises the FIPS prerequisite diagnostic. |
| wolfssl/wolfcrypt/include.am | Updates the SHAKE header installation path. |
| wolfcrypt/test/test.c | Updates the self-test SHAKE include. |
| wolfcrypt/src/wc_mldsa.c | Updates the ML-DSA SHAKE include. |
| wolfcrypt/src/hash.c | Updates the hashing SHAKE include. |
| wolfcrypt/src/asn.c | Updates the ASN.1 SHAKE include. |
| wolfcrypt/benchmark/benchmark.c | Updates the benchmark SHAKE include. |
| tests/api/test_sha3.c | Updates the API-test SHAKE include. |
| src/include.am | Builds SHAKE from wolfcrypt/src/shake.c. |
| configure.ac | Checks the new overlay paths and updates related guidance. |
Review effort: Balanced
|
rlm2002
force-pushed
the
fipsV5customSHAKEPQ
branch
from
October 27, 2026 15:39
9598dc9 to
7052b51
Compare
rlm2002
force-pushed
the
fipsV5customSHAKEPQ
branch
from
October 27, 2026 18:48
7052b51 to
9c827f6
Compare
philljj
requested changes
Oct 28, 2026
Reference shake.c/h via wolfcrypt/src/ and wolfssl/wolfcrypt/ instead of fips/, which isn't included in FIPS bundles. Use Cert wolfSSL#5548, v5.2.3 in the error message. Also fix the FIPS version guard to error only when there is no FIPS cert or the cert is <v5.0.0 or >=v6.0.0, not for valid v5.x certs.
Generalize the macro name since the version check already accepts any v5.x cert. Also drop the autotools gate's minor/patch checks so it matches the broader settings.h guard.
rlm2002
force-pushed
the
fipsV5customSHAKEPQ
branch
from
October 28, 2026 16:47
9c827f6 to
9eac0d0
Compare
Contributor
|
Tests good with multi-test with various |
philljj
approved these changes
Oct 28, 2026
Contributor
|
Retest this please. (fips windows test was disrupted) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
PR #11831 added an opt-in V523_NONFIPS_SHAKE to enable SHAKE 128/256 algorithms. The path to the new files was incorrect.
Replace path to
fips/v5.2.3-custom-shake-pq/<shake.c/h>to referencewolfcrypt/src/shake.candwolfssl/wolfcrypt/shake.h. Removes reference tofips/which is not included in release process.Also fixes error message for
V523_NONFIPS_SHAKEto reference v5.2.3 and correct cert.Testing