Commit Graph

1271 Commits

Author SHA1 Message Date
Stefan Berger
54671af0a0 tpm2: Implement API call to recreate the SVN base secret
Implement TPMLIB_RecreateSvnBaseSecret() to allow the user to recreate
the SVN base secret. Trigger the storage of the persistent state. Add
a man page.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-11-12 08:26:54 -05:00
Stefan Berger
d5368c7c41 tpm2: Enable SVN-limited hierarchy: svn-limited-hierarchy (SFL 8)
Implement support for a profile attribute svn-limited-hierarchy that must
be set for SVN-limited hiearchy support to be enabled. Bump up the
StateFormatLevel to 8 and store the SVN base secret starting with
StateFormatLevel 8.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-11-12 08:26:54 -05:00
Stefan Berger
ac3bfdbd72 tpm2: Add checks for profile-enabled SVN hierarchy
In several locations where #if SVN_LIMITED_SUPPORT is used to deactivate
SVN hierarchy related code, add a profile attribute check for whether the
svn-limited-hierarchy attribute's flag is set. If it is not set, handle it
in the same way is if SVN hierarchy support was disabled.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-11-12 08:26:54 -05:00
Stefan Berger
828b3dbadb tpm2: Use 16-byte SVN base secret to calculate TpmFirmwareSvnSecret
Use the TPM's unique 16 byte SVN base secret to deterministically calculate
the TpmFirmwareSvnSecret from it by first hashing this 16 byte number and
then adding the 16bit SVN to the hash.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-11-12 08:26:54 -05:00
Stefan Berger
1bf63f0955 tpm2: Create an SVN base secret at first TPM manufacturing time
Introduce a per-TPM SVN base secret of 16 bytes that is to be used for the
SVN-limited hierarchy to derive its secrets from when the 16bit SVN
number is mixed in. Create it at first manufacturing time.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-11-12 08:26:53 -05:00
Stefan Berger
2a202158d7 tpm2: Comment-out MAX_SVN and related function
MAX_SVN and its related function are not currently used, so comment
them out.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-11-12 08:23:48 -05:00
Stefan Berger
b44c0a866a tpm2: Set currentSvn to number derived from library version
Set the currentSvn number to a number derived from the library version.
Start out with currentSvn '0'. The number would then follow the
following numbering scheme relative to possible future libtpms versions:

v0.10   : 0x0000
v0.10.1 : 0x0001
v0.10.2 : 0x0002
v0.11   : 0x0010
v0.11.1 : 0x0011
v1.0    : 0x0020
v1.0.1  : 0x0021

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-11-12 08:23:48 -05:00
Stefan Berger
7e2526a265 tests: Initialize len_cmp to 0 so it has an assigned value
Avoid the following error message due to potentially
uninitialized variable:

base64decode.c:64:20: warning: The right operand of '!=' is a garbage \
  value [core.UndefinedBinaryOperatorResult] <--[clang]

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-11-11 17:11:19 -05:00
Stefan Berger
64d263aff0 build-sys: Do not build statically linked tests when --disable-static used
When --disable-static is used statically linked tests cannot be run.
Therefore, put the evaluation of --enable-static-tests after
--disable-static has been tested for and only set ENABLE_STATIC_TESTS
if both are 'yes'.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-11-11 17:11:19 -05:00
Stefan Berger
fa4f9ab561 tests: Ignore gcc -Wmissing-braces on OBJECT initialization
Have gcc ignore -Wmissing-braces to suppress 15 of these types of
warnings:

/home/stefanb/dev/libtpms/tests/object_size.c:13:21: warning: missing braces around initializer [-Wmissing-braces] <--[gcc]
   13 |     OBJECT object = {
      |                     ^
/home/stefanb/dev/libtpms/tests/object_size.c:13:21: warning: missing braces around initializer [-Wmissing-braces] <--[gcc]
[...]

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-11-11 17:11:19 -05:00
Stefan Berger
48d52b5e40 tests: Initialize cmd with NULL at top of function
Fix the following gcc warning on Fedora rawhide:

tpm2_cve-2023-1017.c: In function ‘main’:
tpm2_cve-2023-1017.c:169:5: warning: ‘cmd’ may be used uninitialized [-Wmaybe-uninitialized]
  169 |     free(cmd);
      |     ^~~~~~~~~
tpm2_cve-2023-1017.c:125:20: note: ‘cmd’ was declared here
  125 |     unsigned char *cmd = malloc(maxcmdsize);
      |                    ^~~

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-11-11 17:11:19 -05:00
Stefan Berger
b8c9153a3f tpm2: Only copy Attributes when non-modifyable profile is chosen
If the user provides no Attributes field in the profile then do not copy
the attributes from the internal profile if that profile may be modified.
In this case assume that the the user wanted no attributes. It now is
also unnecessary that any Attributes be set in a modifyable profile ever,
since they will not be copied.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-10-17 16:30:30 -04:00
Stefan Berger
a5248a9859 test: Allow setting Attributes in JSON profile with an empty string
Adjust the regex checking the JSON input to allow for empty string values,
which will be only used by 'Attributes' since they are all optional.
Then, allow the user to provide an empty string with the Attributes in the
JSON like this: {...,"Attributes":"", ...}

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-10-17 16:30:30 -04:00
Stefan Berger
aef0ecbeb4 tpm2: Add missing attributes to code documentation and man pages
Add attributes documentation where found missing.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-10-17 16:30:30 -04:00
Stefan Berger
ecff064e8d tpm2: Implement check to disable ECC key derivation: no-ecc-key-derivation
Per "TCG FIPS 140-3 guidance for TPM 2.0" document the following functions
must prevent an asymmetric ECC key derivation:
- Table 14: TPM2_CreateLoaded
- Table 18: TPM2_ZGen_2Phase
- Table 26: TPM2_Commit
- Table 26: TPM2_EC_Ephemeral

Return TPM_RC_TYPE as a return code to indicate failure of deriving a key.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-10-15 11:56:24 -04:00
Stefan Berger
774cee962e tpm2: Restrict profile names to 32 characters
Restrict profile names to 32 characters to avoid having to carry
excessively long names in the TPM's state file.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-10-10 08:42:36 -04:00
Stefan Berger
0d8377b1b4 tpm2: Allow setting the minimum HMAC key size: hmac-min-key-size
Allow setting the minimum HMAC key size and add enforcement gates.

Check that the value of hmac=min-key-size given in the profile is not
larger than 1024. This value is taken from the maximum size of
TPM2B_SENSITIVE, which is MAX_SYM_DATA (=128), which can be provided as
key to an HMAC.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-10-08 15:55:19 -04:00
Stefan Berger
57074695bc tpm2: Mark unused function parameters to avoid static analyzer warnings
Some function parameters are unused due to OpenSSL usage and other changes
by libtpms. Mark those as unused to avoid static analyzer warnings.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-10-03 14:35:16 -04:00
Stefan Berger
cbd894e281 tpm2: Add fallthrough comments to avoid static analyzer warnings
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-10-03 14:35:16 -04:00
Stefan Berger
648cc1ec78 tpm2: Wrap asprintf to avoid static analyzer warnings
To avoid static analyzer warnings due to non-literal format strings being
used, wrap asprintf in TPMLIB_asprintf and call vasprintf from there.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-10-03 14:35:16 -04:00
Stefan Berger
21e19ffe8d tpm2: Run PCT test on RSA keys and EC signing keys: pct
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-10-03 14:06:33 -04:00
Stefan Berger
81fbc10a7e tpm2: Implement pairwise consistency test for RSA keys
Implemewnt a pairwise consistency test for RSA keys that is to be enabled
with FIPS_COMPLIANT #define temporarily. Test encryption+decryption and
sign+verify with the created key on random input data.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-10-03 14:06:33 -04:00
Stefan Berger
99b52fa982 tpm2: Enable DRBG continous test: drbg-continous-test
drbg-continous-test enables an existing code block that was previously
only enabled when FIPS_COMPLIANT #define was set. This code block
ensures that previous 4 consecutive random numbers do not appear again
at the beginning of a 16-byte block.

Extend an existing test case with this new attribute.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-10-03 08:52:35 -04:00
Stefan Berger
363cbae3b0 tpm2: Allow naming of custom profiles with prefix 'custom:'
Allow the name of custom profiles to also have the prefix 'custom:'.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-10-01 10:56:52 -04:00
Stefan Berger
6adb99a42c tpm2: Add an assert(profileJSON) since it must never be NULL
When profileJSON is passed to String_Marshal it must never be NULL.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-24 09:32:02 -04:00
Stefan Berger
ab3da80dec tpm2: Compare CONTEXT_ENCRYPT_ALG against ALG_AES_VALUE
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-24 09:32:02 -04:00
Stefan Berger
2a883017d6 tpm2: Remove unused function parameters or mark them as unused
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-24 09:32:02 -04:00
Stefan Berger
8b4ad203d0 tpm2: Correct the ending of the string at max characters
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-24 09:32:02 -04:00
Stefan Berger
b97c3bb776 tpm2: Check for n < 0 from asprintf before return
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-24 09:32:02 -04:00
Stefan Berger
27ceda7173 tpm2: Cast void * to BYTE * when doing arithmetic
To avoid warnings from the static analyzer cast void * to BYTE *
when doing arithmetic.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-24 09:32:02 -04:00
Stefan Berger
3b5b842e16 tpm2: Use mgs parameter in error log message
Use unused msg parameter in error log message

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-24 09:32:02 -04:00
Stefan Berger
11dfb9a611 tpm2: Check context hash algorithm with static assert
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-23 21:17:21 -04:00
Stefan Berger
8b3efff19e tpm2: Add const qualifier to char array in StringToUint32
Only constant strings will be passed to StringToUint32 and therefore
add the const qualifier.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-23 21:17:21 -04:00
Stefan Berger
e6c1ac7062 tpm2: Declare constant string as const char *
Only constant strings will be assigned to the static array, so make the
name field also a const char *.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-23 21:17:21 -04:00
Stefan Berger
3b0bc31692 build-sys: Set -Wshadow to avoid shadowing variables
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-23 19:39:55 -04:00
Stefan Berger
7cbdd6113d tpm2: Rename variable to avoid clashes with type and shadowing
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-23 19:39:55 -04:00
Stefan Berger
0903c69105 tpm2: Rename block_skip to block_skip_t to avoid shadowing
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-23 19:39:55 -04:00
Stefan Berger
a811c35fca tpm2: Rename buffer to objbuf to avoid shadowing buffer variable
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-23 19:39:55 -04:00
Stefan Berger
e898872637 tpm2: Adjust selection of StateFormatLevel
When a non-modifyable profile is chosen then copy the StateFormatLevel
(SFL) from the internal profile as before. A reason for copying the SFL
is also because the user is not allowed to make modifications to this
type of profile. Otherwise, if the user chooses a modifyable profile,
then let the user choose the StateFormatLevel.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-13 17:04:38 -04:00
Stefan Berger
46548da8ed tpm2: Add missing break statement
Add a missing break statement that was forgotten in recent
commit b389781f49.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-11 19:01:26 -04:00
Stefan Berger
c7baa7e1ac tpm2: Deduplicate verbs in Commands, Algorithms and Attributes in profile
Deduplicate verbs in Commands, Algorithms, and Attributes strings in a
profile and when a verb with an '=' sign is found, such as
ecc-min-size=224, and there is a duplicate later in the string, such as
ecc-min-size=256, then keep the last one.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-11 16:14:08 -04:00
Stefan Berger
7d95e9ce41 tpm2: Remove test case for OpenSSL SSKDF to KDFe comparison
Remove the test case and renaming of the reference implementation of
CryptKDFe. Reverting this patch would bring the test case back in case
it was necessary.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-09 14:56:44 -04:00
Stefan Berger
2ff2f84170 tests: Rename reference KDFe implemention to ReferenceCryptKDFe for tests
To still be able to run the KDFe test case when the OpenSSL replacement
for the KDFe is to be used, rename the reference implemention to
ReferenceCryptKDFe that coexists with the CryptKDFe function that then
calls OSSLCryptKDFe.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-09 14:56:44 -04:00
Stefan Berger
209b9adcd3 tpm2: Use OpenSSL-based KDFe implementation if possible
Use the OpenSSL-based KDFe implementation when USE_OPENSSL_FUNCTIONS_SSKDF
is set.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-09 14:56:44 -04:00
Stefan Berger
c0dcce5afd tests: Add KDFe replacement by OpenSSL 'SSKDF' and test case
Implement a KDFe replacement using OpenSSL's SSKDF and add a test
case that compares the current implementation against the one based
on the OpenSSL SSKDF.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-09 14:56:44 -04:00
Stefan Berger
37ca5d3ddb build-sys: Check for availability of SSKDF (KDFe) in OpenSSL
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-09 14:56:44 -04:00
Stefan Berger
d635ef81e2 tpm2: Prevent HMAC creation & verification with sha1: no-sha1-hmac
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-09 14:43:05 -04:00
Stefan Berger
24afa414ff tpm2: Prevent HMAC verification with sha1: no-sha1-hmac-verification
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-09 14:43:05 -04:00
Stefan Berger
b389781f49 tpm2: Prevent HMAC creation with sha1: no-sha1-hmac-creation
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-09 14:43:05 -04:00
Stefan Berger
e983cdf05c tpm2: Display RuntimeAttributes as part of TPMLIB_GetInfo
Display RuntimeAttributes as part of TPMLIB_GetInfo when the flag
'128' (0x80) is set.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2024-09-03 10:28:55 -04:00