summaryrefslogtreecommitdiff
path: root/include/keys
diff options
context:
space:
mode:
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2015-06-12 23:34:01 +0200
committerPeter Huewe <peterhuewe@gmx.de>2015-10-19 01:01:21 +0200
commitfe351e8d4eec801beeba1df1f36d76316be6f1a2 (patch)
treecc20c7855bad077522788bc7f1eaf16f4a5584fb /include/keys
parenta74f8b36352e79b13d48fa92759c9ea6b78d5817 (diff)
downloadlinux-rpi3-fe351e8d4eec801beeba1df1f36d76316be6f1a2.tar.gz
linux-rpi3-fe351e8d4eec801beeba1df1f36d76316be6f1a2.tar.bz2
linux-rpi3-fe351e8d4eec801beeba1df1f36d76316be6f1a2.zip
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 'include/keys')
-rw-r--r--include/keys/trusted-type.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/keys/trusted-type.h b/include/keys/trusted-type.h
index 56f82e5c9975..c91651f91687 100644
--- 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 */