diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2015-06-12 23:34:01 +0200 |
|---|---|---|
| committer | Peter Huewe <peterhuewe@gmx.de> | 2015-10-19 01:01:21 +0200 |
| commit | fe351e8d4eec801beeba1df1f36d76316be6f1a2 (patch) | |
| tree | cc20c7855bad077522788bc7f1eaf16f4a5584fb /security | |
| parent | a74f8b36352e79b13d48fa92759c9ea6b78d5817 (diff) | |
| download | linux-0-day-fe351e8d4eec801beeba1df1f36d76316be6f1a2.tar.gz linux-0-day-fe351e8d4eec801beeba1df1f36d76316be6f1a2.tar.xz | |
keys, trusted: move struct trusted_key_options to trusted-type.h
Moved struct trusted_key_options to trustes-type.h so that the fields
can be accessed from drivers/char/tpm.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/trusted.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/security/keys/trusted.h b/security/keys/trusted.h index 3249fbd2b6531..ff001a5dcb247 100644 --- a/security/keys/trusted.h +++ b/security/keys/trusted.h @@ -2,7 +2,6 @@ #define __TRUSTED_KEY_H /* implementation specific TPM constants */ -#define MAX_PCRINFO_SIZE 64 #define MAX_BUF_SIZE 512 #define TPM_GETRANDOM_SIZE 14 #define TPM_OSAP_SIZE 36 @@ -36,16 +35,6 @@ enum { SRK_keytype = 4 }; -struct trusted_key_options { - uint16_t keytype; - uint32_t keyhandle; - unsigned char keyauth[SHA1_DIGEST_SIZE]; - unsigned char blobauth[SHA1_DIGEST_SIZE]; - uint32_t pcrinfo_len; - unsigned char pcrinfo[MAX_PCRINFO_SIZE]; - int pcrlock; -}; - #define TPM_DEBUG 0 #if TPM_DEBUG |