projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keys, trusted: move struct trusted_key_options to trusted-type.h
[cascardo/linux.git]
/
include
/
keys
/
trusted-type.h
diff --git
a/include/keys/trusted-type.h
b/include/keys/trusted-type.h
index
56f82e5
..
c91651f
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/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 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;
struct trusted_key_payload {
struct rcu_head rcu;
@@
-26,6
+28,16
@@
struct trusted_key_payload {
unsigned char blob[MAX_BLOB_SIZE];
};
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 */
extern struct key_type key_type_trusted;
#endif /* _KEYS_TRUSTED_TYPE_H */