Commit Graph

577 Commits

Author SHA1 Message Date
Stefan Berger
10d4e5fd9d tpm2: Rename NV_ROUNDUP to TPM2_ROUNDUP and move to new Utils.h
Move NV_ROUNDUP to Utils.h and call it TPM2_ROUNDUP for reuse by
other functions.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-05-23 11:39:24 -04:00
Stefan Berger
e2129d2939 tpm2: Add CMAC test cases from RFC 4493
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-05-09 23:11:27 -04:00
Stefan Berger
137b9da5c8 tpm2: Reset the internal CMAC state when starting a CMAC
Initialize the internal CMAC state to 0s when starting a CMAC.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-05-09 23:11:27 -04:00
Stefan Berger
a829ddbdeb Extend TDES test cases (CFB, OFB) with test cases for short input
Add TDES test cases testing CFB and OFB with non-blocksized short
input.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-05-08 14:59:55 -04:00
Stefan Berger
c14f1b01c9 tpm2: Extend internal test case with tests for TDES
Also test the TDES implementations.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-05-08 11:11:41 -04:00
Stefan Berger
cb386e4c7f tpm2: Add script to re-generate the test data for AES and new test for TDES
Add a script that uses openssl to create the test data we are using
in the TPM 2 code already. Extend this script with TDES 128 and 192 bit
key sizes and tests.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-05-08 11:11:41 -04:00
Stefan Berger
bd7dc396e1 tests: Add a test program to run the TPM 2 self tests
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-05-07 16:01:48 -04:00
Stefan Berger
edd720a1ad tests: Restrict number of command line parameters to fuzz
Restrict the number of command line parameters passed to the
fuzz program in order not to overstep command line parameter
size restrictions.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-05-07 16:01:48 -04:00
Stefan Berger
04971a0fb9 tests: run a lot less tests in base64decode.sh
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-05-07 16:01:48 -04:00
Stefan Berger
96e8ed4aa3 Travis: Display test failures
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-05-07 16:01:48 -04:00
Stefan Berger
0540739531 tests: Fix memory leak in test cases
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-05-07 16:01:48 -04:00
Marc-André Lureau
552bd634ca build-sys: don't tweak LD_LIBRARY_PATH
libtool already provides helper scripts around executables.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
2019-04-16 07:17:53 -04:00
Stefan Berger
5ac0d9a3d5 Add missing #define TPM_HAVE_TPM2_DECLARATIONS in tpm2 code (RHEL 6)
Add some missing #define TPM_HAVE_TPM2_DECLARATIONS before the include
of "tpm_library_intern.h" in TPM 2 code so we don't run into compile
errors on RHEL 6 when data types are redefined in TPM 1.2 code.

Previous patch 73cad883ba seems to have missed those.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-04-12 11:53:28 -04:00
Stefan Berger
5b13401a35 tpm2: Sync with TPM 2 code comments or commented code
Sync with TPM 2 code where the only difference is now comments
or commented/dead code.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-04-08 10:12:14 -04:00
Stefan Berger
639243d60d build-sys: Remove cruft from 'check'
Remove some cruft that was useful when TPM 2 code was still in the
works but now that things have settled don't need it anymore.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-04-04 13:19:16 -04:00
Stefan Berger
65769f9d3c travis: Run cpp-coveralls without sudo
Change file and directory ownerships so that we can run cpp-coveralls
without sudo.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-04-03 11:14:30 -04:00
Stefan Berger
7620f55ac1 tpm2: TPMT_PUBLIC_PARMS_Marshal is unused
... and TPMU_PUBLIC_PARMS_Marshal is used, so leave its prototype active.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-04-03 10:50:16 -04:00
Stefan Berger
25f267c491 tpm2: Deactivate unused code
Also TPM 2 code has a lot of unused code that we can #if 0 out.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-04-01 16:41:21 -04:00
Stefan Berger
8f99250251 gitignore: Ignore coverage related files
Ignore files related to gcov.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-04-01 16:41:21 -04:00
Marc-André Lureau
b214dabfc8 fuzz: better oss-fuzz integration
There were a few issues with the oss-fuzz integration from commit
8373f09854 ("build-sys: add oss-fuzz
support").

When building on OSS-Fuzz, the projects should use the provided CFLAGS
and CXXFLAGS and don't append any extra sanitization / fuzzing flags.

$LIB_FUZZING_ENGINE is defined to set the library to link to, and it
is a c++ library, so we should build fuzzer with c++...

Now --enable-fuzzer is only used for -fsanitize=fuzzer.

Add a tests/fuzz-main.c as fallback, to run the corpus on other builds.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
2019-04-01 11:22:03 -04:00
Marc-André Lureau
3e591832c4 build-sys: fix grep warnings when building out-of-tree
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
2019-04-01 11:22:03 -04:00
Stefan Berger
402fc2b1e1 tpm12: Build without support for maintentance commands
Introduce TPM_NOMAINTENANCE_COMMANDS #define to build the TPM 1.2 code
without maintenance commands support. The state for the maintenance
commands has been written out so far, so we have to leave this part
alive even though nothing can be done with the maintenance key anymore.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-04-01 10:16:25 -04:00
Stefan Berger
d0b9d9a9ff tpm12: Deactivate unused code
There are several functions in the code that do not have a caller.
Deactivate all of them to get higher coverage of the code.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-04-01 10:16:25 -04:00
Stefan Berger
a700edec87 travis: Use cpp-coveralls with the -b option for proper path creation
Add the option -b ./src for proper path creation. Exclude the test
dir to avoid malformed path creation. Also exclude the swtpm dir
since nothing interesting is to be found there.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-03-29 16:04:15 -04:00
Marc-André Lureau
8373f09854 build-sys: add oss-fuzz support
This script will permit integration with Google OSS-FUZZ
https://github.com/google/oss-fuzz

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
2019-03-27 14:19:37 -04:00
Stefan Berger
db5af63392 gitignore: Ignore corpus of test cases and auto-created files
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-03-26 10:24:41 -04:00
Stefan Berger
63433c5be1 man: Leave note about leaving store- and loaddata functions unset
Leave a note in the TPMLIB_RegisterCallbacks() function about
the effects of leaving the store- and loaddata functions in the
interface unset.

Leave another not in TPMLIB_MainInit() to not use the library without
calling TPMLIB_RegiserCallbacks().

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-03-26 10:24:41 -04:00
Stefan Berger
4b4c3e4ee0 tests: Add test case for testing permanent state restore
Add a test case that test the restoring of the permanent
state that must have a persisted key.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-03-26 10:24:41 -04:00
Stefan Berger
399a07e3cd tests: Extend PCR and read again after restart of TPM with restored state
Extend the existing test case with extending PCR 10 and reading back
the result, then storing the state blobs and setting them and checking
the value of PCR 10 again.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-03-26 10:24:41 -04:00
Stefan Berger
174bae9542 tpm2: TPM2_MainInit: Enable NVRAM in NVChip file case
When no callbacks are set and the plain NVChip file is used it wasn't
possible to save the state of the TPM 2 after a TPMLIB_Terminate()
TPMLIB_MainInit() sequence with a cached state (TPMLIB_SetState) since
in this case the NVRAM was not initialized. We now initialize the NV
in case no callback for restoring the state is set.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-03-26 10:24:41 -04:00
Stefan Berger
f31840453a tpm2: Split off _plat__NVEnable_NVChipFile from _plat__NVEnable
Split off the part that was handling the NVChip file in _plat__NVEnable
and call this new function _plat__NVEnable_ChipFile so we can call it
separately in case the caller works with the plain NVChip file.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-03-26 10:24:41 -04:00
Stefan Berger
95ab136b83 tpm2: Adapt code for OpenSSL 1.2 deprecated API calls
Some OpenSSL EC API calls are deprecated starting in OpenSSL 1.2
and may fail the build due to the #warning they produce.

The affected functions have been renamed and consolidated with
other functions inside OpenSSL:

- EC_POINT_set_affine_coorindates_GFp
https://github.com/openssl/openssl/blob/OpenSSL_1_1_1-stable/crypto/ec/ec_lib.c#L730

- EC_POINT_get_affine_coordinates_GFp
https://github.com/openssl/openssl/blob/OpenSSL_1_1_1-stable/crypto/ec/ec_lib.c#L768

On both functions the suffix _GFp has been removed by the renaming.
We need to call the new functions if OPENSSL_API_COMPAT is defined
and is >= 0x10200000L.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-03-19 09:25:44 -04:00
Stefan Berger
e6da4834cd travis: Add libseccomp-dev as package to install for swtpm
To build recent swtpm we also need libseccomp-dev now.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-03-18 21:14:49 -04:00
Stefan Berger
af7e924372 Bump up the revision of the library for next version to 0.7.0
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-03-18 21:14:49 -04:00
Stefan Berger
366af2ac1f build-sys: Fix typo in manpages variable name
Some man pages were not installed due to a typo in the name of
the variable. This patch fixes the issue.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-16 09:44:12 -05:00
Stefan Berger
0b60a44790 Extend CHANGES file with what is new in v0.6.0
Mention support for TPM 2 (up to rev 150) and new API calls.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-14 08:50:41 -05:00
Stefan Berger
61440eebf8 debian: Set version to 0.6.0-1 for release.
Set the version to 0.6.0-1 for a release. Cheat a bit on the previous
version by changing the suffix to ~dev from -dev.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-11 07:39:50 -05:00
Stefan Berger
6ef15f2a77 debian: Fix Architecture and Depends of libtpms-dev
Fix Architecture and Depends entries of libtpms-dev in control file.

Thanks to alex@strugee.net for pointing this out in PR#22.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-11 07:39:50 -05:00
Stefan Berger
567ece331f debian: Fix the build dependencies
Fix the build dependencies.

Thanks to alex@strugee.net for pointing this out in PR#22.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-11 07:39:50 -05:00
Stefan Berger
1e71cf48eb debian: Rename package libtpms to libtpms0
Fix the lintian complaint about wrong package name for the shared library.

Thanks to alex@strugee.net for pointing this out in PR#22.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-11 07:39:50 -05:00
Stefan Berger
1762b62f8c travis: Add OS X target
Also test-compile on OS X. The 'distcheck' target cannot be used
since it results in deplicate symbol errors while linking (no idea
why it happens only with distcheck).

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-09 11:51:41 -05:00
Stefan Berger
baf9b1ee92 travis: Build libtpms for coverage and test with swtpm
Build libtpms with code coverage enabled and run the swtpm test
suite on it.

Unfortunately cpp-coveralls has a problem creating correct file paths when
collecting the results so that the coverage results are not correctly sub-
mitted to coveralls.io. The issue may stem from the fact that the
Makefile.am in src/ contains rules for source files in subdirs src/tmp12/
and src/tpm2/ etc. I hope that this issue can be fixed at some point.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-09 11:51:41 -05:00
Stefan Berger
d9ea4ea3c3 build-sys: Allow user to pass CFLAGS
Allow the user to pass in the CFLAGS. Previously they were overwritten
with -O2 -g, which are the default CFLAGS if none are passed.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-09 11:51:41 -05:00
Stefan Berger
139925229d build-sys: Add support for --enable-test-coverage to configure
Add support for --enable-test-coverage that sets additional CFLAGS
and LDFLAGS.

gcov creates files with suffixes .gcov, .gcno, and .gcda that we
need clean up in a few directories.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-09 11:51:41 -05:00
Stefan Berger
dc6e504522 travis: Parameterize script and invoke from matrix
Add a matrix: part so we can test on multiple systems concurrently and
make the script use environment variables.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-09 11:51:41 -05:00
Stefan Berger
de0d14a6e5 travis: Move package installation under addons
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-09 11:51:41 -05:00
Stefan Berger
9070c15d72 tpm2: Remove unnecessary LITTLE_ENDIAN_TPM #define for __APPLE__
Remove an unnecessary LITTLE_ENDIAN_TPM #define for the __APPLE__
case.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-07 16:40:03 +00:00
Stefan Berger
163f79e597 tests: Fix missing semicolon in test case
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-06 15:58:02 -05:00
Stefan Berger
580a7f7881 tests: Do not fail the test in case of an error but display message
Do not fail the entire test run in case of a failure but display an
error message instead and continue running tests.

Errors may happen in very rare cases and we just continue then while
assuming the output is logged.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-03 13:15:44 -05:00
Stefan Berger
8cb5f7d4c0 tpm2: Propagate error from CryptRandStartup() and report error info
CryptRandStartup() did not propagate initialization errors to the caller
but always returned TRUE. We now return the initialization errors and
display an error message and some state variables.

This error should almost never occur, but the fuzzer was able to trigger
it with rev 146 when the random number generated returned 32 bit numbers only
and the same 32 bit number was returned as the one before it. With rev 150
the random number generating function now returns as many random numbers as
the caller requested and this error is not getting triggered anymore.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-01-03 13:15:44 -05:00