hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jarkko Sakkinen 2015-06-12 23:34:01 +02:00 committed by Peter Huewe
parent a74f8b3635
commit fe351e8d4e
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/keys/trusted-type.h
View File

@ -12,10 +12,12 @@
#include <linux/key.h> #include <linux/key.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/tpm.h>
#define MIN_KEY_SIZE 32 #define MIN_KEY_SIZE 32
#define MAX_KEY_SIZE 128 #define MAX_KEY_SIZE 128
#define MAX_BLOB_SIZE 320 #define MAX_BLOB_SIZE 320
#define MAX_PCRINFO_SIZE 64
struct trusted_key_payload { struct trusted_key_payload {
struct rcu_head rcu; 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; extern struct key_type key_type_trusted;
#endif /* _KEYS_TRUSTED_TYPE_H */ #endif /* _KEYS_TRUSTED_TYPE_H */

11
security/keys/trusted.h
View File

@ -2,7 +2,6 @@
#define __TRUSTED_KEY_H #define __TRUSTED_KEY_H
/* implementation specific TPM constants */ /* implementation specific TPM constants */
#define MAX_PCRINFO_SIZE 64
#define MAX_BUF_SIZE 512 #define MAX_BUF_SIZE 512
#define TPM_GETRANDOM_SIZE 14 #define TPM_GETRANDOM_SIZE 14
#define TPM_OSAP_SIZE 36 #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 #define TPM_DEBUG 0
#if TPM_DEBUG #if TPM_DEBUG