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>

diff --git a/include/keys/trusted-type.h b/include/keys/trusted-type.h
index 56f82e5c99757f159ceb74203d88d723add1ff6d..c91651f91687c1354d6031771d6f715eaa150745 100644 (file)
--- a/include/keys/trusted-type.h
+++ b/include/keys/trusted-type.h
@@ -12,10 +12,12 @@
 
 #include <linux/key.h>
 #include <linux/rcupdate.h>
+#include <linux/tpm.h>
 
 #define MIN_KEY_SIZE                   32
 #define MAX_KEY_SIZE                   128
 #define MAX_BLOB_SIZE                  320
+#define MAX_PCRINFO_SIZE               64
 
 struct trusted_key_payload {
        struct rcu_head rcu;
@@ -26,6 +28,16 @@ struct trusted_key_payload {
        unsigned char blob[MAX_BLOB_SIZE];
 };
 
+struct trusted_key_options {
+       uint16_t keytype;
+       uint32_t keyhandle;
+       unsigned char keyauth[TPM_DIGEST_SIZE];
+       unsigned char blobauth[TPM_DIGEST_SIZE];
+       uint32_t pcrinfo_len;
+       unsigned char pcrinfo[MAX_PCRINFO_SIZE];
+       int pcrlock;
+};
+
 extern struct key_type key_type_trusted;
 
 #endif /* _KEYS_TRUSTED_TYPE_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