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>

1 files changed, 0 insertions, 11 deletions

diff --git a/security/keys/trusted.h b/security/keys/trusted.h
index 3249fbd2b653..ff001a5dcb24 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