Commit Graph

1331 Commits

Author SHA1 Message Date
Stefan Berger
b4d81572c1 tpm2: Define TPMI_RH_NV_DEFINED_INDEX_H_UNMARSHAL and use it
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-08-07 11:05:51 -04:00
Stefan Berger
c9ed596fe4 tpm2: Add missing ADD_FLAG to X509Certificate definition
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-08-07 11:05:51 -04:00
Stefan Berger
e7e8c38281 tpm2: Rename PlatformPCR.c to PlatformPcr.c and sync
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-08-06 13:55:46 -04:00
Stefan Berger
04bd7d4b2b tpm2: Sync (unused) structures and defines related to FIPS-140
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-08-06 10:24:30 -04:00
Stefan Berger
e02951cd05 tpm2: Add or remove empty lines to reduce diffs
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-08-05 10:47:24 -04:00
Stefan Berger
7eb43b9ebe tpm2: Remove commented-out blocks
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-08-05 10:47:24 -04:00
Stefan Berger
8fd1293d60 tpm2: Sync defines for unsupported AC_GetCapability
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-08-05 10:47:24 -04:00
Stefan Berger
bee52fbed3 tpm2: Add definitions for new algorithms and curves
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-08-05 10:47:24 -04:00
Stefan Berger
3edd48d6b1 tpm2: Sync with new defines on symmetric algorithms' sizes
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-08-05 10:47:24 -04:00
Stefan Berger
8c89e53ed4 tpm2: Move defines for commands from TpmAlgorithmDefines to TpmTypes.h
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-08-05 10:47:24 -04:00
Stefan Berger
c0a2f22226 tpm2: Add explicit casts to UINT32 to avoid UBSAN issue
UBSAN complains about the following now:

  runtime error: left shift of 129 by 24 places cannot be
     represented in type 'int'

Fix this (again) in the affected variables by casting the values to UINT32.
Some of the fixes got lost in the recent re-base, others are new due to
how the values are defined.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-08-03 17:47:15 -04:00
Stefan Berger
13a41ca095 tpm2: Add missing defines for existing structures, remove others
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
2a5baa8800 tpm2: Sync up RunCommand.c with upstream
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
e60fafc61a tpm2: Add missing SVN-related cases in TPMPropertyIsDefined
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
b2839e2613 tpm2: Sync TPM_PT_MODES case in TPMPropertyIsDefined
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
865b356292 tpm2: Add missing '|| TABLE_DRIVEN_MARSHAL' to CommandDispatcher.c
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
fccc05845b tpm2: Add support for CRYPTO_LIB_REPORTING but do not use it
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
74bd4ee1d6 tpm2: Use TPM2B_DIGEST in MAC_Out
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
79e233c607 tpm2: Remove CLOCK_ defines for header since already in Clock.c
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
1278421db9 tpm2: Add TPMI_RH_BASE_HIERARCHY type and use it
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
04dab706c5 tpm2: Add (unused) defines to TpmTcpProtocol.h
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
fa637145b8 tpm2: Fix definition of CertifyX509 error codes
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
0945ad07ef tpm2: Fix definition of ChangePPS error codes
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
a954fa214b tpm2: Fix definition of NV_ReadPublic error codes
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
2360ec6d83 tpm2: Fix definition of HierarchyChnageAuth error codes
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
bd282cce6a tpm2: Fix definition of SequenceUpdate error codes
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
f8ddf879af tpm2: Replace occurrences of xorr with xor
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
4c7dcf2db3 tpm2: Rebase on TPM v1.83: Reduce diffs
- Rename files so the filenames match
- Reduce whitespace diffs
- Other trivial changes

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
5de6c7fe40 scripts: Implement scripts to be able to use meld on upstream codebase
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-31 18:57:14 -04:00
Stefan Berger
4c374f9994 tpm2: Have TPM2_NV_DefineSpace call NvDefineSpace
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-22 15:45:42 -04:00
Stefan Berger
7dfe310f06 configure.ac: Remove old debug enablement and commented statements
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-07 17:44:55 -04:00
Stefan Berger
826771bb4f configure.ac: Use m4sh for if statement
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-07 17:44:55 -04:00
Stefan Berger
1a7aa5a146 configure.ac: Use m4sh for hardending
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-07 17:44:55 -04:00
Stefan Berger
923ecc0994 configure.ac: Use m4sh for test-coverage
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-07 17:44:55 -04:00
Stefan Berger
aebb81b74e configure.ac: Use m4sh for OpenSSL functions-checking block
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-07 17:44:55 -04:00
Stefan Berger
05318a30c8 configure.ac: Reformat to 4 spaces indentation
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-07 17:44:55 -04:00
Stefan Berger
f1b7e02fb5 configure.ac: Use m4sh for case statments
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-07-07 17:44:55 -04:00
Stefan Berger
0453e7b7df tpm2: Helpers: Have ObjectGetPublicParameters return TPM_RC
Convert ObjectGetPublicParameters to return TPM_RC and have it return
TPM_RC_MEMORY in case of a NULL pointer returned from BN_new() and
TPM_RC_FAILURE for any other error. Adjust the 2 callers.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-06-13 17:08:18 -04:00
Stefan Berger
e369684b99 tpm2: Helpers,OpenSSL: Convert some TPM_RC_FAILURE to TPM_RC_MEMORY
Convert those TPM_RC_FAILURE return codes to TPM_RC_MEMORY where
it is certain that it is only an issue related to no memory being available
rather than anything else. The following OpenSSL functions qualify for
this:

- BN_CTX_new & BN_CTX_new_ex
- BN_new

The following ones do not qualify:

- RSA_new: could have failure with ENGINE_init() and ENGINE_get_RSA()
- EC_KEY_new: could have failure with ENGINE_init() and ENGINE_get_EC()
- BigInitialized: initializer could be NULL
- BN_bin2bn: length could be 0

Some functions now test for NULL pointers early on to return TPM_RC_MEMORY.
They would previously have failed in BigInitialized() if the BIGNUM had
been a NULL pointer.

Since TPM_RC_FAILURES should never occur, the new TPM_RC_MEMORYs should
never occur, either. So, this is primarily a clean-up.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-06-13 17:08:18 -04:00
Stefan Berger
22bb8db8e6 tpm2: Helpers: Fix a possible memory leak
Fix a possible memory leak that may occur in case of a failure in
ObjectGetPublicParameters. The already allocated dP, dQ, and qInv
need to be freed.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-06-13 17:08:18 -04:00
Stefan Berger
daa2dbdc4d tpm2: Avoid NULL pointer access in case allocation fails
EC_POINT_set_affine_coordinates_GFp would dereference the EC_POINT if it
was NULL. Check P != NULL before calling this function.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-06-13 17:08:18 -04:00
Stefan Berger
04b2d8e9af tpm2: Fix potential out-of-bound access & abort due to HMAC signing issue
Some checks failed
Coverity Scan / coverity (push) Has been cancelled
Fix an HMAC signing issue that may causes an out-of-bounds access in a
TPM2B that in turn was running into an assert() in libtpms causing an
abort. The signing issue was due to an inconsistent pairing of the signKey
and signScheme parameters, where the signKey is ALG_KEYEDHASH key and
inScheme is an ECC or RSA scheme.

This fixes CVE-2025-49133.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-06-10 12:27:45 -04:00
Stefan Berger
95d144c510 man: Fix typo in man page
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-06-02 17:23:32 -04:00
orbea
95fff22c9b tpm2: fix build for LibreSSL 4.1.0
With LibreSSL 4.1.0 the EC_POINTs_mul function was removed, but the
newer OpenSSL 3 code path works instead.

Signed-off-by: orbea <orbea@riseup.net>
2025-05-26 14:03:38 -04:00
Stefan Berger
e79d68e2d9 ci: Run 'apt update' before 'apt install'
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-05-26 12:56:28 -04:00
Stefan Berger
5da0738636 tpm2: In CheckLockedOut replace TPM_RC_RETRY with TPM_RC_SUCCESS
Some checks failed
Coverity Scan / coverity (push) Has been cancelled
In CheckLockedOut replace the return code of TPM_RC_RETRY with
TPM_RC_SUCCESS since it does not seem to be necessary to run the TPM2
command again but the TPM2 can continue executing the current command.
If NVRAM wasn't available then the code in CheckLockedOut would return
with an error already.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-05-17 09:25:54 -04:00
Stefan Berger
4dd12eb253 tpm2: Set SFL of default-v2 profile to STATE_FORMAT_LEVEL_CURRENT
To enable RSA-4096 in the default-v2 profile, set the stateFormatLevel
to STATE_FORMAT_LEVEL_CURRENT (8).

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-05-08 20:48:06 -04:00
Stefan Berger
dca9540bc2 tpm2: Fix bugs in RuntimeProfileDedupStrItems
Fix the following bugs in RuntimeProfileDedupStrItems:
- RuntimeProfileDedupStrItems did not memmove the correct number of bytes,
  leading to potential crashes.
- Also, it did not handle deduplicating the last item in the comma-
  separated list correctly.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-05-08 09:13:06 -04:00
Dan Streetman
e814a1c731 tpm2: Enable support for 4096 bit RSA keys (with fixes)
- Enable RSA_4096
- Add RSA_4096 to s_KeySizesRSA at stateFormatLevel 8
- Increase STATE_FORMAT_LEVEL_CURRENT to 8
- Update tests for larger object size and increased StateFormatLevel
- In NVMarshal.c replace MAX_RSA_KEY_BITS with old value 3072
  so that the state is acceptable to older versions of libtpms;
  if we wrote 4096, then older versions of libtpms would reject the
  state.
- In NVMarshal.c replace RSA_4096 with '0' so it is acceptable to older
  versions; if we wrote '1', then older versions of libtpms would reject
  the state.

Fixes: #491

Signed-off-by: Dan Streetman <ddstreet@ieee.org>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-05-07 12:23:44 -04:00
Stefan Berger
f756952283 Revert "tpm2: Enable support for 4096 bit RSA keys"
This reverts commit 63627b335e.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2025-05-07 11:45:36 -04:00