Skip to content

Separate FMC Cert/CSR Owner and Vendor Info #2837

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.

Sign up for GitHub

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

Jump to bottom
Open
nquarton wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Separate FMC Cert/CSR Owner and Vendor Info #2837

nquarton wants to merge 2 commits into from

Conversation

@nquarton
Copy link
Contributor

@nquarton nquarton commented Nov 24, 2025

  • Separate owner and vendor fuse info
  • Make TCB type names more specific in FMC cert/CSR and RT cert
  • Add missing testing for FMC MLDSA CSR

@nquarton nquarton linked an issue Nov 24, 2025 that may be closed by this pull request
Separate Measurement of Owner and Vendor Controlled Fuses in Caliptra FMC_Alias #2282
Open
@nquarton nquarton marked this pull request as ready for review November 24, 2025 18:40
@nquarton
Copy link
Contributor Author

nquarton commented Dec 2, 2025

It was brought to my attention that several related changes are needed in the PCR generation which feeds key derivation for the FMC Alias layer. Those changes will be made and added here ASAP.

@nquarton nquarton force-pushed the fmc_cert_separate_vndr_ownr_info branch from 58fac4e to 22c7dcb Compare December 3, 2025 03:47
@nquarton
Copy link
Contributor Author

nquarton commented Dec 3, 2025

It was brought to my attention that several related changes are needed in the PCR generation which feeds key derivation for the FMC Alias layer. Those changes will be made and added here ASAP.

This is included in this PR now. Ideally, there would be shared code to keep the key derivation and TCB infos in-line, but the formatting and grouping for the two are completely different (one is TCB info and one goes into the PCR and PCR log) so there really isn't much of an opportunity to consolidate this.

@nquarton nquarton force-pushed the fmc_cert_separate_vndr_ownr_info branch from 22c7dcb to 30e5e6d Compare December 3, 2025 15:56
@nquarton
Copy link
Contributor Author

nquarton commented Dec 3, 2025

PR to update spec with these changes is here: chipsalliance/Caliptra#579

@nquarton
Copy link
Contributor Author

nquarton commented Dec 3, 2025

Note a change in direction was made here where I need to add the vendor PK index used and SVN from the manifest back into the cert and FMC key derivation.

@nquarton nquarton force-pushed the fmc_cert_separate_vndr_ownr_info branch from 30e5e6d to 4211de4 Compare December 4, 2025 16:41
@nquarton nquarton changed the base branch from caliptra-2.1-dev to main December 4, 2025 16:46
@nquarton nquarton force-pushed the fmc_cert_separate_vndr_ownr_info branch from 4211de4 to b8f53e3 Compare December 5, 2025 00:28
@nquarton
Copy link
Contributor Author

nquarton commented Dec 5, 2025

Note a change in direction was made here where I need to add the vendor PK index used and SVN from the manifest back into the cert and FMC key derivation.

These have been re-added as well as the bool indicator for the owner pub key being fused. This is ready for review again.

zhalvorsen
zhalvorsen previously approved these changes Dec 9, 2025
View reviewed changes
zhalvorsen
zhalvorsen reviewed Dec 9, 2025
View reviewed changes
common/src/dice.rs
data_vault: &DataVault,
sha2_512_384: &mut Sha2_512_384,
) -> CaliptraResult<[u8; 48]> {
// NOTE: The contents of this TCB info and FMC PCR info must stay in sync.
Copy link
Collaborator

@zhalvorsen zhalvorsen Dec 9, 2025

Choose a reason for hiding this comment

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

Would it make sense to have a common struct with all of the information needed for both? You could add helper functions for both scenarios something like tcb_info() and pcr_info(). That could help make sure it isn't forgotten in one place or the other

@nquarton nquarton force-pushed the fmc_cert_separate_vndr_ownr_info branch from b8f53e3 to b8526c8 Compare December 10, 2025 21:08
@nquarton
Separate FMC Cert/CSR Owner and Vendor Info
9d33582 
- Separate owner and vendor fuse info
- Add more contents to TCB owner/vendor TCB info
- Align FMC TCI with TCB info contents
- Make TCB type names more specific in FMC cert/CSR and RT cert
- Add missing testing for FMC MLDSA CSR
@nquarton nquarton force-pushed the fmc_cert_separate_vndr_ownr_info branch from b8526c8 to 973dd02 Compare January 5, 2026 19:05
@nquarton
FMC cert/csr/key derivation - re-adding inputs
23eb769 
- SVN
- pub key index (ecc and pqc)
- owner pub key hash in fuses (bool indicator)
@nquarton nquarton force-pushed the fmc_cert_separate_vndr_ownr_info branch from 973dd02 to 23eb769 Compare January 9, 2026 00:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zhalvorsen zhalvorsen zhalvorsen left review comments

@fdamato fdamato Awaiting requested review from fdamato fdamato is a code owner

@wmaroneAMD wmaroneAMD Awaiting requested review from wmaroneAMD wmaroneAMD is a code owner

@JohnTraverAmd JohnTraverAmd Awaiting requested review from JohnTraverAmd JohnTraverAmd is a code owner

@jlmahowa-amd jlmahowa-amd Awaiting requested review from jlmahowa-amd jlmahowa-amd is a code owner

@korran korran Awaiting requested review from korran korran is a code owner

@mhatrevi mhatrevi Awaiting requested review from mhatrevi mhatrevi is a code owner

@swenson swenson Awaiting requested review from swenson swenson is a code owner

@vsonims vsonims Awaiting requested review from vsonims vsonims is a code owner

@jhand2 jhand2 Awaiting requested review from jhand2 jhand2 is a code owner

@FerralCoder FerralCoder Awaiting requested review from FerralCoder FerralCoder is a code owner

@rusty1968 rusty1968 Awaiting requested review from rusty1968 rusty1968 is a code owner

@bluegate010 bluegate010 Awaiting requested review from bluegate010 bluegate010 is a code owner

@ajisaxena ajisaxena Awaiting requested review from ajisaxena ajisaxena is a code owner

@timothytrippel timothytrippel Awaiting requested review from timothytrippel timothytrippel is a code owner

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Separate Measurement of Owner and Vendor Controlled Fuses in Caliptra FMC_Alias

2 participants

@nquarton @zhalvorsen