Basic trusted keys support for TPM 2.0
Subsystems (4)
cover Basic trusted keys support for TPM 2.0
Jarkko Sakkinen (4):
tpm: introduce struct tpm_buf
trusted: move struct trusted_key_options to trusted-type.h
tpm: seal/unseal for TPM 2.0
keys, trusted: seal/unseal with TPM 2.0 chips
drivers/char/tpm/tpm-interface.c | 75 ++++++ drivers/char/tpm/tpm.h | 77 ++++++ drivers/char/tpm/tpm2-cmd.c | 489 +++++++++++++++++++++++---------------- include/keys/trusted-type.h | 13 ++ include/linux/tpm.h | 26 +++ include/linux/tpm_command.h | 1 - security/keys/trusted.c | 18 +- security/keys/trusted.h | 18 +- 8 files changed, 496 insertions(+), 221 deletions(-)
Signature · 1 line
2.1.4
PATCH 1/4 tpm: introduce struct tpm_buf
This patch introduces struct tpm_buf that provides a string buffer for constructing TPM commands. This allows to construct variable sized TPM commands. This feature is needed for sealing and unsealing trusted keys because the input data is of variable size.
The commands in tpm2-cmd.c have been updated to use struct tpm_buf.
The code is based in the string buffer code in security/trusted/trusted.h.
--- drivers/char/tpm/tpm.h | 64 +++++++++ drivers/char/tpm/tpm2-cmd.c | 317 +++++++++++++++----------------------------- 2 files changed, 173 insertions(+), 208 deletions(-)
drivers/char/tpm/tpm.h +64 -0
@@ -382,6 +382,70 @@ struct tpm_cmd_t {tpm_cmd_params params; } __packed; +/* A string buffer type for constructing TPM commands. This is based on the +* string buffer code in security/keys/trusted.h. +*/ + +#define TPM_BUF_SIZE 512 + +struct tpm_buf { +u8 data[TPM_BUF_SIZE ]; +}__aligned(8) ; + +static inline void tpm_buf_init (struct tpm_buf *buf,u16 tag,u32 ordinal) +{ +struct tpm_input_header *head = (struct tpm_input_header *) buf->data; + + head->tag =cpu_to_be16 (tag); + head->length =cpu_to_be32 (sizeof (*head)); + head->ordinal =cpu_to_be32 (ordinal); +} + +static inline u32 tpm_buf_length (struct tpm_buf *buf) +{ +struct tpm_input_header *head = (struct tpm_input_header *) buf->data; + +return be32_to_cpu (head->length); +} + +static inline u16 tpm_buf_tag (struct tpm_buf *buf) +{ +struct tpm_input_header *head = (struct tpm_input_header *) buf->data; + +return be16_to_cpu (head->tag); +} + +static inline void tpm_buf_append (struct tpm_buf *buf, +const unsigned char *data, +unsigned int len) +{ +struct tpm_input_header *head = (struct tpm_input_header *) buf->data; + +BUG_ON ((len +tpm_buf_length (buf)) >TPM_BUF_SIZE ); + +memcpy (&buf->data[tpm_buf_length (buf)], data, len); + head->length =cpu_to_be32 (tpm_buf_length (buf) + len); +} + +static inline void tpm_buf_append_u8 (struct tpm_buf *buf,const u8 value) +{ +tpm_buf_append (buf, &value,1 ); +} + +static inline void tpm_buf_append_u16 (struct tpm_buf *buf,const u16 value) +{ +__be16 value2 =cpu_to_be16 (value); + +tpm_buf_append (buf, (u8 *) &value2,2 ); +} + +static inline void tpm_buf_append_u32 (struct tpm_buf *buf,const u32 value) +{ +__be32 value2 =cpu_to_be32 (value); + +tpm_buf_append (buf, (u8 *) &value2,4 ); +} +extern struct class *tpm_class;extern dev_t tpm_devt;extern const struct file_operations tpm_fops;
drivers/char/tpm/tpm2-cmd.c +109 -208
482 lines not on this page · raw message
Signature · 1 line
2.1.4
PATCH 2/4 trusted: move struct trusted_key_options to trusted-type.h
In reply to Jarkko SakkinenMoved struct trusted_key_options to trustes-type.h so that the fields can be accessed from drivers/char/tpm.
--- include/keys/trusted-type.h | 13 +++++++++++++ security/keys/trusted.h | 11 ----------- 2 files changed, 13 insertions(+), 11 deletions(-)
include/keys/trusted-type.h +13 -0
@@ -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 64struct trusted_key_payload {struct rcu_head rcu;
@@ -26,6 +28,17 @@ 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 */
security/keys/trusted.h +0 -11
@@ -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
Signature · 1 line
2.1.4
PATCH 3/4 tpm: seal/unseal for TPM 2.0
In reply to Jarkko SakkinenAdded tpm_trusted_seal() and tpm_trusted_unseal() API for sealing trusted keys.
This patch implements basic sealing and unsealing functionality for TPM 2.0:
* Seal with a parent key using a 20 byte auth value.
* Unseal with a parent key using a 20 byte auth value.
--- drivers/char/tpm/tpm-interface.c | 75 ++++++++++++++++ drivers/char/tpm/tpm.h | 13 +++ drivers/char/tpm/tpm2-cmd.c | 182 +++++++++++++++++++++++++++++++++++++++ include/linux/tpm.h | 26 ++++++ 4 files changed, 296 insertions(+)
drivers/char/tpm/tpm-interface.c +75 -0
@@ -666,6 +666,29 @@ int tpm_pcr_read_dev(struct tpm_chip *chip, int pcr_idx, u8 *res_buf) }/** +* tpm_is_tpm2 - is the chip a TPM2 chip? +* @chip_num: tpm idx # or ANY +* +* Returns 1 if the chip is a TPM2 chip. +*/ +int tpm_is_tpm2 (u32 chip_num) +{ +struct tpm_chip *chip; +int rc; + + chip =tpm_chip_find_get (chip_num); +if (chip ==NULL ) +return -ENODEV ; + + rc = (chip->flags &TPM_CHIP_FLAG_TPM2 ) !=0 ; + +tpm_chip_put (chip); + +return rc; +} +EXPORT_SYMBOL_GPL (tpm_is_tpm2); + +/** * tpm_pcr_read - read a pcr value * @chip_num: tpm idx # or ANY * @pcr_idx: pcr idx to retrieve
@@ -1021,6 +1044,58 @@ int tpm_get_random(u32 chip_num, u8 *out, size_t max) }EXPORT_SYMBOL_GPL (tpm_get_random); +/** +* tpm_seal_trusted() - seal a trusted key +* @chip_num: A specific chip number for the request or TPM_ANY_NUM +* @options: authentication values and other options +* @payload: the key data in clear and encrypted form +* +* Returns < 0 on error and 0 on success. At the moment, only TPM 2.0 chips +* are supported. +*/ +int tpm_seal_trusted (u32 chip_num,struct trusted_key_payload *payload, +struct trusted_key_options *options) +{ +struct tpm_chip *chip; +int rc; + + chip =tpm_chip_find_get (chip_num); +if (chip ==NULL || !(chip->flags &TPM_CHIP_FLAG_TPM2 )) +return -ENODEV ; + + rc =tpm2_seal_trusted (chip, payload, options); + +tpm_chip_put (chip); +return rc; +} +EXPORT_SYMBOL_GPL (tpm_seal_trusted); + +/** +* tpm_unseal_trusted() - unseal a trusted key +* @chip_num: A specific chip number for the request or TPM_ANY_NUM +* @options: authentication values and other options +* @payload: the key data in clear and encrypted form +* +* Returns < 0 on error and 0 on success. At the moment, only TPM 2.0 chips +* are supported. +*/ +int tpm_unseal_trusted (u32 chip_num,struct trusted_key_payload *payload, +struct trusted_key_options *options) +{ +struct tpm_chip *chip; +int rc; + + chip =tpm_chip_find_get (chip_num); +if (chip ==NULL || !(chip->flags &TPM_CHIP_FLAG_TPM2 )) +return -ENODEV ; + + rc =tpm2_unseal_trusted (chip, payload, options); + +tpm_chip_put (chip); +return rc; +} +EXPORT_SYMBOL_GPL (tpm_unseal_trusted); +static int __init tpm_init (void ) {int rc;
drivers/char/tpm/tpm.h +13 -0
@@ -88,6 +88,8 @@ enum tpm2_return_codes {enum tpm2_algorithms {TPM2_ALG_SHA1 =0x0004 , +TPM2_ALG_KEYEDHASH =0x0008 , +TPM2_ALG_NULL =0x0010 };enum tpm2_command_codes {
@@ -95,6 +97,10 @@ enum tpm2_command_codes {TPM2_CC_SELF_TEST =0x0143 ,TPM2_CC_STARTUP =0x0144 ,TPM2_CC_SHUTDOWN =0x0145 , +TPM2_CC_CREATE =0x0153 , +TPM2_CC_LOAD =0x0157 , +TPM2_CC_UNSEAL =0x015E , +TPM2_CC_FLUSH_CONTEXT =0x0165 ,TPM2_CC_GET_CAPABILITY =0x017A ,TPM2_CC_GET_RANDOM =0x017B , TPM2_CC_PCR_READ = 0x017E,
@@ -492,6 +498,13 @@ static inline void tpm_remove_ppi(struct tpm_chip *chip)int tpm2_pcr_read (struct tpm_chip *chip,int pcr_idx,u8 *res_buf);int tpm2_pcr_extend (struct tpm_chip *chip,int pcr_idx,const u8 *hash);int tpm2_get_random (struct tpm_chip *chip,u8 *out,size_t max); +int tpm2_seal_trusted (struct tpm_chip *chip, +struct trusted_key_payload *payload, +struct trusted_key_options *options); +int tpm2_unseal_trusted (struct tpm_chip *chip, +struct trusted_key_payload *payload, +struct trusted_key_options *options); +ssize_t tpm2_get_tpm_pt (struct tpm_chip *chip,u32 property_id,u32 *value,const char *desc);
drivers/char/tpm/tpm2-cmd.c +182 -0
194 lines not on this page · raw message
include/linux/tpm.h +26 -0
@@ -30,6 +30,8 @@#define TPM_ANY_NUM 0xFFFFstruct tpm_chip ; +struct trusted_key_payload ; +struct trusted_key_options ;struct tpm_class_ops {const u8 req_complete_mask;
@@ -46,11 +48,22 @@ struct tpm_class_ops {#if defined(CONFIG_TCG_TPM ) || defined(CONFIG_TCG_TPM_MODULE ) +extern int tpm_is_tpm2 (u32 chip_num);extern int tpm_pcr_read (u32 chip_num,int pcr_idx,u8 *res_buf);extern int tpm_pcr_extend (u32 chip_num,int pcr_idx,const u8 *hash);extern int tpm_send (u32 chip_num,void *cmd,size_t buflen);extern int tpm_get_random (u32 chip_num,u8 *data,size_t max); +extern int tpm_seal_trusted (u32 chip_num, +struct trusted_key_payload *payload, +struct trusted_key_options *options); +extern int tpm_unseal_trusted (u32 chip_num, +struct trusted_key_payload *payload, +struct trusted_key_options *options);#else +static inline int tpm_is_tpm2 (u32 chip_num) +{ +return -ENODEV ; +}static inline int tpm_pcr_read (u32 chip_num,int pcr_idx,u8 *res_buf) {return -ENODEV ; }
@@ -63,5 +76,18 @@ static inline int tpm_send(u32 chip_num, void *cmd, size_t buflen) {static inline int tpm_get_random (u32 chip_num,u8 *data,size_t max) {return -ENODEV ; } + +static inline int tpm_seal_trusted (u32 chip_num, +struct trusted_key_payload *payload, +struct trusted_key_options *options) +{ +return -ENODEV ; +} +static inline int tpm_unseal_trusted (u32 chip_num, +struct trusted_key_payload *payload, +struct trusted_key_options *options) +{ +return -ENODEV ; +}#endif #endif
Signature · 1 line
2.1.4
PATCH 4/4 keys, trusted: seal/unseal with TPM 2.0 chips
In reply to Jarkko SakkinenCall tpm_seal_trusted() and tpm_unseal_trusted() for TPM 2.0 chips.
--- drivers/char/tpm/tpm2-cmd.c | 6 +----- include/linux/tpm_command.h | 1 - security/keys/trusted.c | 18 ++++++++++++++---- security/keys/trusted.h | 7 +++++++ 4 files changed, 22 insertions(+), 10 deletions(-)
drivers/char/tpm/tpm2-cmd.c +1 -5
@@ -406,21 +406,17 @@ static int tpm2_load(struct tpm_chip *chip,if (private_len > (payload->blob_len -2 ))return -E2BIG ; -pr_info ("private_len=%u\n" , private_len); - public_len =be16_to_cpup ((__be16 *) &payload->blob[2 + private_len]); blob_len = private_len + public_len +4 ;if (blob_len > payload->blob_len)return -E2BIG ; -pr_info ("public_len=%u\n" , public_len); -tpm_buf_init (&buf,TPM2_ST_SESSIONS ,TPM2_CC_LOAD );tpm_buf_append_u32 (&buf, options->keyhandle);tpm2_buf_append_auth (&buf,TPM2_RS_PW ,NULL /* nonce */ ,0 ,0 /* session_attributes */ ,NULL /* hmac */ ,0 ); -tpm_buf_append (&buf, payload->blob, payload->blob_len); +tpm_buf_append (&buf, payload->blob, blob_len); rc =tpm_transmit_cmd (chip, buf.data,TPM_BUF_SIZE ,"loading blob" );if (!rc)
include/linux/tpm_command.h +0 -1
@@ -22,7 +22,6 @@#define TPM_ORD_UNSEAL 24/* Other constants */ -#define SRKHANDLE 0x40000000#define TPM_NONCE_SIZE 20#endif
security/keys/trusted.c +14 -4
@@ -601,7 +601,7 @@ static int tpm_unseal(struct tpm_buf *tb, } ordinal =htonl (TPM_ORD_UNSEAL ); - keyhndl =htonl (SRKHANDLE ); + keyhndl =htonl (TPM1_SRKHANDLE ); ret =tpm_get_random (TPM_ANY_NUM , nonceodd,TPM_NONCE_SIZE );if (ret !=TPM_NONCE_SIZE ) {pr_info ("trusted_key: tpm_get_random failed (%d)\n" , ret);
@@ -867,7 +867,11 @@ static struct trusted_key_options *trusted_options_alloc(void)if (options) {/* set any non-zero defaults */ options->keytype = SRK_keytype; - options->keyhandle =SRKHANDLE ; + +if (tpm_is_tpm2 (TPM_ANY_NUM )) + options->keyhandle =TPM2_SRKHANDLE ; +else + options->keyhandle =TPM1_SRKHANDLE ; }return options; }
@@ -937,7 +941,10 @@ static int trusted_instantiate(struct key *key,switch (key_cmd) {case Opt_load: - ret =key_unseal (payload, options); +if (tpm_is_tpm2 (TPM_ANY_NUM )) + ret =tpm_unseal_trusted (TPM_ANY_NUM , payload, options); +else + ret =key_unseal (payload, options);dump_payload (payload);dump_options (options);if (ret <0 )
@@ -950,7 +957,10 @@ static int trusted_instantiate(struct key *key,pr_info ("trusted_key: key_create failed (%d)\n" , ret); goto out; } - ret =key_seal (payload, options); +if (tpm_is_tpm2 (TPM_ANY_NUM )) + ret =tpm_seal_trusted (TPM_ANY_NUM , payload, options); +else + ret =key_seal (payload, options);if (ret <0 )pr_info ("trusted_key: key_seal failed (%d)\n" , ret);break ;
security/keys/trusted.h +7 -0
@@ -12,6 +12,13 @@#define TPM_RETURN_OFFSET 6#define TPM_DATA_OFFSET 10 +/* Transient object handles start from 0x80000000 in TPM 2.0, which makes it +* a sane default. +*/ + +#define TPM1_SRKHANDLE 0x40000000 +#define TPM2_SRKHANDLE 0x80000000 +#define LOAD32 (buffer, offset) (ntohl(*(uint32_t *)&buffer[offset]))#define LOAD32N (buffer, offset) (*(uint32_t *)&buffer[offset])#define LOAD16 (buffer, offset) (ntohs(*(uint16_t *)&buffer[offset]))
Signature · 1 line
2.1.4