From: Jason Andryuk <andryuk@aero.org>
Date: Mon, 21 Apr 2014 17:22:59 +0000 (-0400)
Subject: vtpmmgr: Store hardware TPM Locality
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5175
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d426026701b3a74bbd2776a5c45c265e7775773e;p=xen.git

vtpmmgr: Store hardware TPM Locality

The TPM locality must be specified when using TPM_PCR_INFO_LONG for
TPM_Seal.  Store the locality so it can be provided later.

Signed-off-by: Jason Andryuk <andryuk@aero.org>
Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
---

diff --git a/stubdom/vtpmmgr/init.c b/stubdom/vtpmmgr/init.c
index 89643e7bab..c35ab8fe7b 100644
--- a/stubdom/vtpmmgr/init.c
+++ b/stubdom/vtpmmgr/init.c
@@ -69,7 +69,8 @@ const TPM_AUTHDATA WELLKNOWN_AUTH = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0
 
 struct vtpm_globals vtpm_globals = {
    .tpm_fd = -1,
-   .oiap = { .AuthHandle = 0 }
+   .oiap = { .AuthHandle = 0 },
+   .hw_locality = 0
 };
 
 static int tpm_entropy_source(void* dummy, unsigned char* data, size_t len, size_t* olen) {
@@ -436,6 +437,7 @@ TPM_RESULT vtpmmgr_init(int argc, char** argv) {
             }
             vtpm_globals.tpm_fd = tpm_tis_open(tpm);
             tpm_tis_request_locality(tpm, opts.tpmlocality);
+            vtpm_globals.hw_locality = opts.tpmlocality;
          }
          break;
       case TPMDRV_TPMFRONT:
diff --git a/stubdom/vtpmmgr/vtpmmgr.h b/stubdom/vtpmmgr/vtpmmgr.h
index cf2b9629a0..68edd4cf61 100644
--- a/stubdom/vtpmmgr/vtpmmgr.h
+++ b/stubdom/vtpmmgr/vtpmmgr.h
@@ -57,6 +57,8 @@ struct vtpm_globals {
 
    entropy_context     entropy;
    ctr_drbg_context    ctr_drbg;
+
+   int hw_locality;
 };
 
 struct tpm_opaque {