Repository navigation
Conversation
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.
The v1.85 ECC DHKEM path behind
TPM2_Encapsulate/TPM2_Decapsulate(RFC 9180) callswc_HKDF_Extractandwc_HKDF_Expand, but it was compiled whenever ML-KEM andHAVE_ECCwere enabled. Auser_settings.hbuild with ML-KEM and ECC but withoutHAVE_HKDFhit an implicit declaration and then an undefined reference at link. configure builds did not see it because wolfSSL enables HKDF by default.Fix
wolftpm/fwtpm/fwtpm.h- newFWTPM_HAVE_DHKEM, set when bothHAVE_ECCandHAVE_HKDFare defined.src/fwtpm/fwtpm_crypto.c- the DHKEM helpers andFwEncapsulateEcdhDhkem/FwDecapsulateEcdhDhkembuild underFWTPM_HAVE_DHKEMinstead ofHAVE_ECC.src/fwtpm/fwtpm_command.c- Encapsulate and Decapsulate dispatch an ECC key to DHKEM only underFWTPM_HAVE_DHKEM; otherwise the key is rejected withTPM_RC_KEY.tests/fwtpm_unit_tests.c- the DHKEM roundtrip tests are guarded onFWTPM_HAVE_DHKEMplus the ML-KEM encap/decap commands they drive.ML-KEM itself is unaffected; only ECC KEM keys depend on HKDF.
Testing
HAVE_HKDFnow builds cleanly.fwtpm_unit.testDHKEM roundtrips pass (P-256, P-384, P-521).