Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / security / keys / trusted.h

diff --git a/security/keys/trusted.h b/security/keys/trusted.h
index 3249fbd2b6531f9fb661c1f62849f4f4e322c183..ff001a5dcb2479af78108a0e2451b6ff965cda90 100644 (file)
--- 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