Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
security
/
keys
/
trusted.h
diff --git
a/kernel/security/keys/trusted.h
b/kernel/security/keys/trusted.h
index
3249fbd
..
ff001a5
100644
(file)
--- a/
kernel/security/keys/trusted.h
+++ b/
kernel/security/keys/trusted.h
@@
-2,7
+2,6
@@
#define __TRUSTED_KEY_H
/* implementation specific TPM constants */
#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
#define MAX_BUF_SIZE 512
#define TPM_GETRANDOM_SIZE 14
#define TPM_OSAP_SIZE 36
@@
-36,16
+35,6
@@
enum {
SRK_keytype = 4
};
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
#define TPM_DEBUG 0
#if TPM_DEBUG