Make TCTI configurable and force the tests to use the simulator #18
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Jonas Witschel <diabonas@gmx.de>
The tcti context can be set using this option or via the environment variable TPM2TOTP_TCTI. The syntax follows the one from tpm2-tools and tpm2-tss-engine. The code is implemented in a separate file so that it can be reused in the integration tests. Signed-off-by: Jonas Witschel <diabonas@gmx.de>
Codecov Report
@@ Coverage Diff @@
## master #18 +/- ##
==========================================
- Coverage 84.34% 80.53% -3.81%
==========================================
Files 3 4 +1
Lines 658 745 +87
==========================================
+ Hits 555 600 +45
- Misses 103 145 +42
Continue to review full report at Codecov.
|
Currently the integration tests use the first TPM they find on the system. This commit starts a TPM simulator for every integration test and configures the TCTI environment variable to use it, allowing parallel execution of the tests. The test harness is adapted from the one in tpm2-tss-engine. Signed-off-by: Jonas Witschel <diabonas@gmx.de>
This is possible after the preceeding changes to the integration test harness. Signed-off-by: Jonas Witschel <diabonas@gmx.de>
AndreasFuchsTPM
approved these changes
Apr 24, 2019
There was a problem hiding this comment.
Thanks a lot for the effort.
I'll merge it for now, but before the next release, I want to get rid of the static tcti variable.
However, I'd wait for https://github.com/tpm2-software/tpm2-tss/wiki/TCTI-loader-library to be done and then it should be easy to switch over, given all the existing work already done.
AndreasFuchsTPM
approved these changes
Apr 24, 2019
Closed
|
Awesome, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR makes allows configuring the TCTI to be used with
TSS2_TCTI_CONTEXTargument (can beNULL) for the library functions and-T/--tctioption or the environment variableTPM2TOTP_TCTIfor the tpm2-totp command.The syntax and the implementation for the command option/environment variable follow the implementations in tpm2-tools (tpm2-software/tpm2-tools#765,
tpm2_options.candtpm2_tcti_ldr.c) and tpm2-tss-engine (tpm2-software/tpm2-tss-engine#62,tpm2-tss-engine-tcti.c).Using these configuration options, we can force the tests to use the TPM simulator, enabling the possibility to run the tests (in parallel) on systems with existing hardware TPMs. The implementation is adapted from tpm2-tss-engine (tpm2-software/tpm2-tss-engine#107,
sh_log_compiler.sh).Closes #7.