[Tboot-changelog] changeset in tboot.hg: Moved definitions of tpm_pcrvalue_t and t...

[Joseph C. <jos...@in...>]

changeset 0e1078c60e84 in /var/www/tboot.hg
details: tboot.hg?cmd=changeset;node=0e1078c60e84
description:
	Moved definitions of tpm_pcrvalue_t and tpm_pcr_composite_t from lcp2.h back to pconf_elt.c, sinc they are only needed by pconf_elt.c

	Signed-off-by: Joseph Cihula <jos...@in...>

diffstat:

 include/lcp2.h       |  11 -----------
 lcptools/pconf_elt.c |  12 ++++++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

diffs (50 lines):

diff -r 3641c48e4672 -r 0e1078c60e84 include/lcp2.h
--- a/include/lcp2.h	Thu Aug 26 18:35:21 2010 +0800
+++ b/include/lcp2.h	Thu Aug 26 11:19:02 2010 -0700
@@ -160,10 +160,6 @@
 
 #define LCP_POLELT_TYPE_PCONF   1
 
-/*
- * (from tboot/tpm.{h,c}
- */
-
 typedef struct __packed {
     uint16_t    size_of_select;
     uint8_t     pcr_select[3];
@@ -177,13 +173,6 @@
 } tpm_digest_t;
 
 typedef tpm_digest_t tpm_composite_hash_t;
-typedef tpm_digest_t tpm_pcrvalue_t;
-
-typedef struct __packed {
-    tpm_pcr_selection_t   select;
-    uint32_t              value_size;
-    tpm_pcrvalue_t        pcr_value[];
-} tpm_pcr_composite_t;
 
 typedef struct __packed {
     tpm_pcr_selection_t         pcr_selection;
diff -r 3641c48e4672 -r 0e1078c60e84 lcptools/pconf_elt.c
--- a/lcptools/pconf_elt.c	Thu Aug 26 18:35:21 2010 +0800
+++ b/lcptools/pconf_elt.c	Thu Aug 26 11:19:02 2010 -0700
@@ -50,6 +50,18 @@
 #include "polelt_plugin.h"
 #include "lcputils2.h"
 
+/*
+ * (from tboot/tpm.{h,c}
+ */
+
+typedef tpm_digest_t tpm_pcrvalue_t;
+
+typedef struct __packed {
+    tpm_pcr_selection_t   select;
+    uint32_t              value_size;
+    tpm_pcrvalue_t        pcr_value[];
+} tpm_pcr_composite_t;
+
 #define NR_PCRS             24
 
 #define MAX_PCR_INFOS       32