From: Jason Andryuk <jandryuk@gmail.com>
To: xen-devel@lists.xenproject.org
Cc: Jason Andryuk <jandryuk@gmail.com>,
Ian Jackson <iwj@xenproject.org>, Wei Liu <wl@xen.org>,
Daniel De Graaf <dgdegra@tycho.nsa.gov>,
Quan Xu <quan.xu0@gmail.com>,
Samuel Thibault <samuel.thibault@ens-lyon.org>
Subject: [PATCH 4/9] vtpmmgr: Allow specifying srk_handle for TPM2
Date: Tue, 4 May 2021 08:48:37 -0400 [thread overview]
Message-ID: <20210504124842.220445-5-jandryuk@gmail.com> (raw)
In-Reply-To: <20210504124842.220445-1-jandryuk@gmail.com>
Bypass taking ownership of the TPM2 if an srk_handle is specified.
This srk_handle must be usable with Null auth for the time being.
Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
---
docs/man/xen-vtpmmgr.7.pod | 7 +++++++
stubdom/vtpmmgr/init.c | 11 ++++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/docs/man/xen-vtpmmgr.7.pod b/docs/man/xen-vtpmmgr.7.pod
index 875dcce508..3286954568 100644
--- a/docs/man/xen-vtpmmgr.7.pod
+++ b/docs/man/xen-vtpmmgr.7.pod
@@ -92,6 +92,13 @@ Valid arguments:
=over 4
+=item srk_handle=<HANDLE>
+
+Specify a srk_handle for TPM 2.0. TPM 2.0 uses a key hierarchy, and
+this allow specifying the parent handle for vtpmmgr to create its own
+key under. Using this option bypasses vtpmmgr trying to take ownership
+of the TPM.
+
=item owner_auth=<AUTHSPEC>
=item srk_auth=<AUTHSPEC>
diff --git a/stubdom/vtpmmgr/init.c b/stubdom/vtpmmgr/init.c
index 1506735051..c01d03e9f4 100644
--- a/stubdom/vtpmmgr/init.c
+++ b/stubdom/vtpmmgr/init.c
@@ -302,6 +302,11 @@ int parse_cmdline_opts(int argc, char** argv, struct Opts* opts)
goto err_invalid;
}
}
+ else if(!strncmp(argv[i], "srk_handle:", 11)) {
+ if(sscanf(argv[i] + 11, "%x", &vtpm_globals.srk_handle) != 1) {
+ goto err_invalid;
+ }
+ }
else if(!strncmp(argv[i], "tpmdriver=", 10)) {
if(!strcmp(argv[i] + 10, "tpm_tis")) {
opts->tpmdriver = TPMDRV_TPM_TIS;
@@ -586,7 +591,11 @@ TPM_RESULT vtpmmgr2_create(void)
{
TPM_RESULT status = TPM_SUCCESS;
- TPMTRYRETURN(tpm2_take_ownership());
+ if ( vtpm_globals.srk_handle == 0 ) {
+ TPMTRYRETURN(tpm2_take_ownership());
+ } else {
+ tpm2_AuthArea_ctor(NULL, 0, &vtpm_globals.srk_auth_area);
+ }
/* create SK */
TPM2_Create_Params_out out;
--
2.30.2
next prev parent reply other threads:[~2021-05-04 12:49 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-04 12:48 [PATCH 0/9] vtpmmgr: Some fixes - still incomplete Jason Andryuk
2021-05-04 12:48 ` [PATCH 1/9] docs: Warn about incomplete vtpmmgr TPM 2.0 support Jason Andryuk
2021-05-04 17:55 ` Andrew Cooper
2021-05-07 15:31 ` Daniel P. Smith
2021-05-04 12:48 ` [PATCH 2/9] vtpmmgr: Print error code to aid debugging Jason Andryuk
2021-05-04 13:03 ` Samuel Thibault
2021-05-07 15:33 ` Daniel P. Smith
2021-05-04 12:48 ` [PATCH 3/9] stubom: newlib: Enable C99 formats for %z Jason Andryuk
2021-05-04 13:08 ` Samuel Thibault
2021-05-07 15:37 ` Daniel P. Smith
2021-05-04 12:48 ` Jason Andryuk [this message]
2021-05-04 13:13 ` [PATCH 4/9] vtpmmgr: Allow specifying srk_handle for TPM2 Samuel Thibault
2021-05-04 17:04 ` Jason Andryuk
2021-05-04 17:07 ` Samuel Thibault
2021-05-04 17:27 ` Jason Andryuk
2021-05-04 17:48 ` Samuel Thibault
2021-05-04 12:48 ` [PATCH 5/9] vtpmmgr: Move vtpmmgr_shutdown Jason Andryuk
2021-05-04 13:14 ` Samuel Thibault
2021-05-04 12:48 ` [PATCH 6/9] vtpmmgr: Flush transient keys on shutdown Jason Andryuk
2021-05-04 13:15 ` Samuel Thibault
2021-05-04 12:48 ` [PATCH 7/9] vtpmmgr: Flush all transient keys Jason Andryuk
2021-05-04 13:16 ` Samuel Thibault
2021-05-04 17:05 ` Jason Andryuk
2021-05-04 17:07 ` Samuel Thibault
2021-05-04 12:48 ` [PATCH 8/9] vtpmmgr: Shutdown more gracefully Jason Andryuk
2021-05-04 13:18 ` Samuel Thibault
2021-05-04 12:48 ` [PATCH 9/9] vtpmmgr: Support GetRandom passthrough on TPM 2.0 Jason Andryuk
2021-05-04 13:33 ` Samuel Thibault
2021-05-04 17:23 ` Jason Andryuk
2021-05-04 17:47 ` Samuel Thibault
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210504124842.220445-5-jandryuk@gmail.com \
--to=jandryuk@gmail.com \
--cc=dgdegra@tycho.nsa.gov \
--cc=iwj@xenproject.org \
--cc=quan.xu0@gmail.com \
--cc=samuel.thibault@ens-lyon.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).