diff options
| author | Mattias Nissler <mnissler@chromium.org> | 2017-12-05 16:27:42 +0100 |
|---|---|---|
| committer | Mattias Nissler <mnissler@chromium.org> | 2018-04-13 10:03:32 +0000 |
| commit | bc5b2db15b93f37820574b8f14a1b2e165012403 (patch) | |
| tree | 04579ca3414f4258c7c3070075ce88e56fbeb877 /firmware/include/tpm1_tss_constants.h | |
| parent | ac2286e8f8337a6ced00f219ec59aab52a2ac6d7 (diff) | |
| download | vboot-bc5b2db15b93f37820574b8f14a1b2e165012403.tar.gz | |
tpm_lite: Add more general DefineSpaceEx function
Add a TlclDefineSpaceEx function that allows to pass additional
parameters when creating NVRAM spaces, i.e. owner authorization as
well as PCR bindings.
BRANCH=None
BUG=chromium:788719
TEST=New unit tests.
Change-Id: I73404c05528a89604fea3bcb1f00741fb865ba77
Reviewed-on: https://chromium-review.googlesource.com/814114
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Trybot-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Trybot-Ready: Mattias Nissler <mnissler@chromium.org>
Tested-by: Mattias Nissler <mnissler@chromium.org>
Diffstat (limited to 'firmware/include/tpm1_tss_constants.h')
| -rw-r--r-- | firmware/include/tpm1_tss_constants.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/firmware/include/tpm1_tss_constants.h b/firmware/include/tpm1_tss_constants.h index 625b9aea..572d5c61 100644 --- a/firmware/include/tpm1_tss_constants.h +++ b/firmware/include/tpm1_tss_constants.h @@ -68,6 +68,8 @@ typedef uint32_t TPM_CAPABILITY_AREA; #define TPM_PID_OWNER ((uint16_t) 0x0005) +#define TPM_ET_OWNER ((uint32_t) 0x02) + #define TPM_ST_CLEAR ((uint16_t) 0x0001) #define TPM_ST_STATE ((uint16_t) 0x0002) #define TPM_ST_DEACTIVATED ((uint16_t) 0x0003) @@ -78,6 +80,9 @@ typedef uint32_t TPM_CAPABILITY_AREA; #define TPM_LOC_ONE (((uint32_t)1)<<1) #define TPM_LOC_ZERO (((uint32_t)1)<<0) +#define TPM_ALL_LOCALITIES (TPM_LOC_ZERO | TPM_LOC_ONE | TPM_LOC_TWO \ + | TPM_LOC_THREE | TPM_LOC_FOUR) /* 0x1f */ + #define TPM_PHYSICAL_PRESENCE_LOCK ((uint16_t) 0x0004) #define TPM_PHYSICAL_PRESENCE_PRESENT ((uint16_t) 0x0008) #define TPM_PHYSICAL_PRESENCE_NOTPRESENT ((uint16_t) 0x0010) @@ -104,21 +109,21 @@ typedef TPM_DIGEST TPM_COMPOSITE_HASH; typedef struct tdTPM_PCR_SELECTION { uint16_t sizeOfSelect; - uint8_t *pcrSelect; -} TPM_PCR_SELECTION; + uint8_t pcrSelect[3]; +} __attribute__((packed)) TPM_PCR_SELECTION; typedef struct tdTPM_NV_ATTRIBUTES { TPM_STRUCTURE_TAG tag; TPM_NV_PER_ATTRIBUTES attributes; -} TPM_NV_ATTRIBUTES; +} __attribute__((packed)) TPM_NV_ATTRIBUTES; typedef struct tdTPM_PCR_INFO_SHORT { TPM_PCR_SELECTION pcrSelection; TPM_LOCALITY_SELECTION localityAtRelease; TPM_COMPOSITE_HASH digestAtRelease; -} TPM_PCR_INFO_SHORT; +} __attribute__((packed)) TPM_PCR_INFO_SHORT; typedef struct tdTPM_PERMANENT_FLAGS { @@ -188,6 +193,12 @@ typedef struct tdTPM_IFX_FIELDUPGRADEINFO uint16_t wFieldUpgradeCounter; } TPM_IFX_FIELDUPGRADEINFO; +typedef struct tdTPM_NV_AUTH_POLICY +{ + TPM_PCR_INFO_SHORT pcr_info_read; + TPM_PCR_INFO_SHORT pcr_info_write; +} TPM_NV_AUTH_POLICY; + #define TPM_IFX_FieldUpgradeInfoRequest2 ((uint8_t) 0x11) /* Ordinals */ @@ -202,6 +213,7 @@ typedef struct tdTPM_IFX_FIELDUPGRADEINFO #define TPM_ORD_NV_ReadValue ((uint32_t) 0x000000CF) #define TPM_ORD_NV_WriteValue ((uint32_t) 0x000000CD) #define TPM_ORD_OIAP ((uint32_t) 0x0000000A) +#define TPM_ORD_OSAP ((uint32_t) 0x0000000B) #define TPM_ORD_PcrRead ((uint32_t) 0x00000015) #define TPM_ORD_PhysicalEnable ((uint32_t) 0x0000006F) #define TPM_ORD_PhysicalDisable ((uint32_t) 0x00000070) |