Add: import of TPM keys #140
Closed
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: Andreas Fuchs <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #140 +/- ##
==========================================
+ Coverage 67.34% 67.47% +0.13%
==========================================
Files 9 9
Lines 1228 1276 +48
==========================================
+ Hits 827 861 +34
- Misses 401 415 +14
Continue to review full report at Codecov.
|
AndreasFuchsTPM
requested changes
Sep 2, 2019
| @@ -199,6 +213,12 @@ parse_opts(int argc, char **argv) | |||
| ERR("%s", help); | |||
| exit(1); | |||
| } | |||
|
|
|||
| if (opt.importpub && !opt.importtpm) { | |||
There was a problem hiding this comment.
( ... || (!opt.importpub && opt.importtpm))
| * @retval 1 on success | ||
| * @retval 0 on failure | ||
| */ | ||
| //TODO: all the Errors !!! |
| * Read a tpm key as marshaled TPM2B_PUBLIC and (encrypted) TPM2B_PRIVATE from | ||
| * disk and convert them into a TPM2_DATA representation | ||
| * @param filename The filename to read the data from. | ||
| * @param tpm2Datap The data after read. |
| return 0; | ||
| } | ||
|
|
||
| tpm2data = OPENSSL_malloc(sizeof(TPM2_DATA)); |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
| } | ||
|
|
||
| tpm2data = OPENSSL_malloc(sizeof(TPM2_DATA)); | ||
| if (!tpm2data) |
| @@ -199,6 +213,12 @@ parse_opts(int argc, char **argv) | |||
| ERR("%s", help); | |||
| exit(1); | |||
| } | |||
|
|
|||
| if (opt.importpub && !opt.importtpm) { | |||
| @@ -199,6 +213,12 @@ parse_opts(int argc, char **argv) | |||
| ERR("%s", help); | |||
| exit(1); | |||
| } | |||
|
|
|||
| if (opt.importpub && !opt.importtpm) { | |||
| ERR("--importpub requires --importtpm"); | |||
There was a problem hiding this comment.
Do we really need this limitation? Can't we just import a public key only?
gotthardp
added a commit
to gotthardp/tpm2-tss-engine
that referenced
this pull request
Oct 24, 2020
gotthardp
added a commit
to gotthardp/tpm2-tss-engine
that referenced
this pull request
Oct 24, 2020
Signed-off-by: Petr Gotthard <[email protected]>
Closed
gotthardp
added a commit
to gotthardp/tpm2-tss-engine
that referenced
this pull request
Oct 25, 2020
- Migrated tests to tpm2-tools 4.x - Added missing documentation - Fixed indentation Signed-off-by: Petr Gotthard <[email protected]>
|
Closing; see #194 |
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.
I have merged AndreasFuchsTPM@7f35306 , removed -j option, and fixed testcases so that they works with tpm2-tools 3.2.1-rc0.
I confirmed that existing openssl-generated RSA keys can be imported with tpm2-tools-4.0-rc0 in this way:
tpm2_createprimary -C o -g sha256 -G ecc -a "fixedtpm|fixedparent|sensitivedataorigin|noda|decrypt|restricted|userwithauth" -c primary.ctxtpm2_import -G rsa -g sha256 -i rsakey.pem -C primary.ctx -u tpmkey.pub -r tpmkey.privtpm2tss-genkey -i tpmkey.pub -k tpmkey.priv rsakey.tssI did not added testcase for this though since it requires migration to tpm2-tools-4.0, which breaks other testcases.
so Issue #39 could be closed after migration to tpm2-tools-4.0.