Commit aa042475 authored by Roberto Sassu's avatar Roberto Sassu Committed by Jarkko Sakkinen
Browse files

tpm: rename and export tpm2_digest and tpm2_algorithms 



Rename tpm2_* to tpm_* and move the definitions to include/linux/tpm.h so
that these can be used by other kernel subsystems (e.g. IMA).

Also, set the length of the digest array in tpm_digest to a new constant
named TPM_MAX_DIGEST_SIZE, equal to SHA512_DIGEST_SIZE.

Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Acked-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent bcfff838

drivers/char/tpm/tpm-interface.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ EXPORT_SYMBOL_GPL(tpm_pcr_read); 
int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, const u8 *hash)

{

	int rc;

	struct tpm2_digest *digest_list;

	struct tpm_digest *digest_list;

	int i;



	chip = tpm_find_get_ops(chip);

drivers/char/tpm/tpm.h

+1 −12
Original line number Diff line number Diff line
@@ -122,17 +122,6 @@ enum tpm2_return_codes { 
	TPM2_RC_RETRY		= 0x0922,

};



enum tpm2_algorithms {

	TPM2_ALG_ERROR		= 0x0000,

	TPM2_ALG_SHA1		= 0x0004,

	TPM2_ALG_KEYEDHASH	= 0x0008,

	TPM2_ALG_SHA256		= 0x000B,

	TPM2_ALG_SHA384		= 0x000C,

	TPM2_ALG_SHA512		= 0x000D,

	TPM2_ALG_NULL		= 0x0010,

	TPM2_ALG_SM3_256	= 0x0012,

};



enum tpm2_command_codes {

	TPM2_CC_FIRST		        = 0x011F,

	TPM2_CC_HIERARCHY_CONTROL       = 0x0121,
@@ -545,7 +534,7 @@ static inline u32 tpm2_rc_value(u32 rc) 
int tpm2_get_timeouts(struct tpm_chip *chip);

int tpm2_pcr_read(struct tpm_chip *chip, u32 pcr_idx, u8 *res_buf);

int tpm2_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, u32 count,

		    struct tpm2_digest *digests);

		    struct tpm_digest *digests);

int tpm2_get_random(struct tpm_chip *chip, u8 *dest, size_t max);

void tpm2_flush_context(struct tpm_chip *chip, u32 handle);

int tpm2_seal_trusted(struct tpm_chip *chip,

drivers/char/tpm/tpm1-cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ int tpm1_auto_startup(struct tpm_chip *chip) 
		goto out;

	}



	chip->allocated_banks[0] = TPM2_ALG_SHA1;

	chip->allocated_banks[0] = TPM_ALG_SHA1;

	chip->nr_allocated_banks = 1;



	return rc;

drivers/char/tpm/tpm2-cmd.c

+9 −9
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ struct tpm2_hash { 
};



static struct tpm2_hash tpm2_hash_map[] = {

	{HASH_ALGO_SHA1, TPM2_ALG_SHA1},

	{HASH_ALGO_SHA256, TPM2_ALG_SHA256},

	{HASH_ALGO_SHA384, TPM2_ALG_SHA384},

	{HASH_ALGO_SHA512, TPM2_ALG_SHA512},

	{HASH_ALGO_SM3_256, TPM2_ALG_SM3_256},

	{HASH_ALGO_SHA1, TPM_ALG_SHA1},

	{HASH_ALGO_SHA256, TPM_ALG_SHA256},

	{HASH_ALGO_SHA384, TPM_ALG_SHA384},

	{HASH_ALGO_SHA512, TPM_ALG_SHA512},

	{HASH_ALGO_SM3_256, TPM_ALG_SM3_256},

};



int tpm2_get_timeouts(struct tpm_chip *chip)
@@ -192,7 +192,7 @@ int tpm2_pcr_read(struct tpm_chip *chip, u32 pcr_idx, u8 *res_buf) 
	pcr_select[pcr_idx >> 3] = 1 << (pcr_idx & 0x7);



	tpm_buf_append_u32(&buf, 1);

	tpm_buf_append_u16(&buf, TPM2_ALG_SHA1);

	tpm_buf_append_u16(&buf, TPM_ALG_SHA1);

	tpm_buf_append_u8(&buf, TPM2_PCR_SELECT_MIN);

	tpm_buf_append(&buf, (const unsigned char *)pcr_select,

		       sizeof(pcr_select));
@@ -226,7 +226,7 @@ struct tpm2_null_auth_area { 
 * Return: Same as with tpm_transmit_cmd.

 */

int tpm2_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, u32 count,

		    struct tpm2_digest *digests)

		    struct tpm_digest *digests)

{

	struct tpm_buf buf;

	struct tpm2_null_auth_area auth_area;
@@ -443,7 +443,7 @@ int tpm2_seal_trusted(struct tpm_chip *chip, 


	/* public */

	tpm_buf_append_u16(&buf, 14 + options->policydigest_len);

	tpm_buf_append_u16(&buf, TPM2_ALG_KEYEDHASH);

	tpm_buf_append_u16(&buf, TPM_ALG_KEYEDHASH);

	tpm_buf_append_u16(&buf, hash);



	/* policy */
@@ -458,7 +458,7 @@ int tpm2_seal_trusted(struct tpm_chip *chip, 
	}



	/* public parameters */

	tpm_buf_append_u16(&buf, TPM2_ALG_NULL);

	tpm_buf_append_u16(&buf, TPM_ALG_NULL);

	tpm_buf_append_u16(&buf, 0);



	/* outside info */

include/linux/tpm.h

+19 −0
Original line number Diff line number Diff line
@@ -22,12 +22,31 @@ 
#ifndef __LINUX_TPM_H__

#define __LINUX_TPM_H__



#include <crypto/hash_info.h>



#define TPM_DIGEST_SIZE 20	/* Max TPM v1.2 PCR size */

#define TPM_MAX_DIGEST_SIZE SHA512_DIGEST_SIZE



struct tpm_chip;

struct trusted_key_payload;

struct trusted_key_options;



enum tpm_algorithms {

	TPM_ALG_ERROR		= 0x0000,

	TPM_ALG_SHA1		= 0x0004,

	TPM_ALG_KEYEDHASH	= 0x0008,

	TPM_ALG_SHA256		= 0x000B,

	TPM_ALG_SHA384		= 0x000C,

	TPM_ALG_SHA512		= 0x000D,

	TPM_ALG_NULL		= 0x0010,

	TPM_ALG_SM3_256		= 0x0012,

};



struct tpm_digest {

	u16 alg_id;

	u8 digest[TPM_MAX_DIGEST_SIZE];

} __packed;



enum TPM_OPS_FLAGS {

	TPM_OPS_AUTO_STARTUP = BIT(0),

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE