Skip to content

Apply patches for sync with rev 1.84#551

Draft
stefanberger wants to merge 50 commits intomasterfrom
rev184_public
Draft

Apply patches for sync with rev 1.84#551
stefanberger wants to merge 50 commits intomasterfrom
rev184_public

Conversation

@stefanberger
Copy link
Owner

@stefanberger stefanberger commented Jan 20, 2026

This PR applies some of the patches needed to sync with upstream rev 1.84.

When applying changes to files, also adjust the license of the file by removing the existing TCG license from it IF the file has no significant code changes from 3rd parties.

@stefanberger stefanberger marked this pull request as draft January 20, 2026 17:22
@stefanberger stefanberger force-pushed the rev184_public branch 3 times, most recently from 2827380 to d19251c Compare January 21, 2026 16:05
@stefanberger
scripts: Implement meld-commit to meld by commit Id
deef230 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
LICENSE: Add copyright notices and BSD license for newer TPM 2 code
e82d952 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Remove USE_BIT_FIELD_STRUCTURES build switch and bit fields
532d540 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Remove USE_MARSHALING_DEFINES build switch
3fdacdf 
The build swtich was not used anywhere else.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
tpm2: Get rid of IS_IMPLEMENTED flag for CC attributes
08c9dd1 
Upstream has gotten rid of the IS_IMPLEMENTED flag but upstream is also
using compressed lists where each element in the command lists represents
an implemented command. Libtpms does not use compressed lists but we may
have a list with gaps in it due to unimplemented commands where this flag
may be the only one set and help identify an implemented command. However,
since profiles indicate enablement and implementation of commands, and
nearly all tests for the IS_IMPLEMENTED flag are paired with a check on
the profile with RuntimeCommandsCheckEnabled(), we can get rid of tests for
IS_IMPLEMENTED and finally the flag altogether since it is redundant.

Also get rid of NOT_IMPLEMENTED flag that was not used anywhere.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Remove TABLE_DRIVEN_DISPATCH build switch
d562df5 
Remove the TABLE_DRIVEN_DISPATCH build switch that was set to 'YES'.
Remove code that assumed it to be set to 'NO'.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Sync on white space changes
3a0ff39 
Resolve only white space changes on a previously applied patch resolving a
CVE where my version looked slightly different.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Introduce ReadOnlyControl command but do not activate it
cd621c1 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Introduce PolicyTransportSPDM command but do not activate it
9f24389 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Reformat some files
e5f20af 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Use clang-format 19.1.4 to reformat sources
3f74537 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Fix some build issues, reformat code and add more comments
c09440c 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
tpm2: Include stdint.h/def.h in BaseTypes.h and some other changes
260606a 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Move vendor commands support into own directory
a90c39b 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Add options for simulator (unused)
06f37a3 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Improve platform initialization
0f13d33 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Implemented debugging macros and enable with build switch
528b68b 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Have _TPM_Hash_Start/Data/End and FlushObject return error codes
1231884 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Have several crypto functions return TPM_RC now
adc24dc 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Put pAssert after every SessionGet
9bca656 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Add pAsserts after many HandleToObject calls
2328694 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Rework some NVRAM functions to return TPM_RC and adjust pAsserts
e4abc77 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Have ComputeCommandHMAC return TPM_RC
82e13e4 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Have Object and PCR related functions return TPM_RC
e306f07 
Split-out those TPM 2 command functions that need to be adapted due to the
functions they call returning an error code. Split them out into their own
files so they can be synchronized easier.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Have PolicyContextUpdate return TPM_RC
1cfe277 
Split-out those TPM 2 command functions that need to be adapted due to the
functions they call returning an error code. Split them out into their own
files so they can be synchronized easier.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Adjust pAssert variant being used depending on function return …
aad6c9c 
…type

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Rework failure handling and replace g_inFailureMode
0c7b00e 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Fix code comments and function descriptions and trivial changes
e9c6437 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Add checks for locator == (NV_REF)0
017e8c2 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Check for NULL pointers in CommandDispatcher
e1de6c1 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Report versioning information using a structe passed to a function
13361f1 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Format TpmProfile_CommandList.h
e8a33c5 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Reformat comments in Global.h
19e3841 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Throw a build error if CC_AC_GetCapability is enabled
1d7b5b1 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Add NOT_REFERENCED to avoid build error
3377743 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Add more buffer size checks to CryptParameterDecryption
dcca646 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Only build x509 related functions if CC_CertifyX509 is '1'
842b5e7 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Fix comments
0a8842c 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Add another fallthrough hint for static analysis tools
00c6e02 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Replace a printf with DEBUG_PRINT in BnToOsslMath.c
52170b7 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Introduce platform functions for accessing NV indices
781a071 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Implement platform function to determine enabled self tests
f502fec 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
tpm2: Adopt the directory structure of upstream code repo
902d449 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Fix masking-out of unneeded bits in TpmMath_GetRandomBits
ee4472d 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Fix and extend compile-time testing of NUM_AUTHVALUE_PCR_GROUP
86cb40e 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Add include to simulator_sysheaders.h
6553f13 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
tpm2: Split of TDES related parts from TpmToOsslSym.h and adjust lice…
22c09d7 
…nses

Sync the whitespace differences in TpmToOsslSym.h with upstream.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync: Sync minor changes in several files with upstream
f1d4565 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger stefanberger force-pushed the rev184_public branch 2 times, most recently from 084cf7d to 24f708a Compare January 21, 2026 20:37
@stefanberger
Sync: Move many files to BSD-2-Clause license
291d143 
Move many files to the BSD-2-clause license that either
- have no modifications in them at all
- where all modifictions are from 'me'
- where I have permission to move the modifications by 3rd paries under
  the new license

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
@stefanberger
Sync:Remove some unused files
02bfbb1 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@stefanberger