Commit 1ad6640c authored by Tomas Winkler's avatar Tomas Winkler Committed by Jarkko Sakkinen
Browse files

tpm: move tpm1_pcr_extend to tpm1-cmd.c 



Move tpm1_pcr_extend to tpm1-cmd.c and remove
unused pcrextend_header structure and
EXTEND_PCR_RESULT_SIZE and EXTEND_PCR_RESULT_BODY_SIZE
defines.

Fixes warning:
drivers/char/tpm/tpm-interface.c:609:38: warning: ‘pcrextend_header’ defined but not used [-Wunused-const-variable=]
 static const struct tpm_input_header pcrextend_header = {
                                      ^~~~~~~~~~~~~~~~

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: default avatarNayna Jain <nayna@linux.ibm.com>
Tested-by: default avatarNayna Jain <nayna@linux.ibm.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 70a3199a

drivers/char/tpm/tpm-interface.c

+0 −28
Original line number Diff line number Diff line
@@ -614,34 +614,6 @@ int tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf) 
}

EXPORT_SYMBOL_GPL(tpm_pcr_read);



#define TPM_ORD_PCR_EXTEND 20

#define EXTEND_PCR_RESULT_SIZE 34

#define EXTEND_PCR_RESULT_BODY_SIZE 20

static const struct tpm_input_header pcrextend_header = {

	.tag = cpu_to_be16(TPM_TAG_RQU_COMMAND),

	.length = cpu_to_be32(34),

	.ordinal = cpu_to_be32(TPM_ORD_PCR_EXTEND)

};



static int tpm1_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash,

			   char *log_msg)

{

	struct tpm_buf buf;

	int rc;



	rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_PCR_EXTEND);

	if (rc)

		return rc;



	tpm_buf_append_u32(&buf, pcr_idx);

	tpm_buf_append(&buf, hash, TPM_DIGEST_SIZE);



	rc = tpm_transmit_cmd(chip, NULL, buf.data, EXTEND_PCR_RESULT_SIZE,

			      EXTEND_PCR_RESULT_BODY_SIZE, 0, log_msg);

	tpm_buf_destroy(&buf);

	return rc;

}



/**

 * tpm_pcr_extend - extend a PCR value in SHA1 bank.

 * @chip:	a &struct tpm_chip instance, %NULL for the default chip

drivers/char/tpm/tpm.h

+2 −0
Original line number Diff line number Diff line
@@ -549,6 +549,8 @@ int tpm_do_selftest(struct tpm_chip *chip); 


int tpm1_get_timeouts(struct tpm_chip *chip);

unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal);

int tpm1_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash,

		    const char *log_msg);

unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal);

int tpm_pm_suspend(struct device *dev);

int tpm_pm_resume(struct device *dev);

drivers/char/tpm/tpm1-cmd.c

+21 −0
Original line number Diff line number Diff line
@@ -413,3 +413,24 @@ int tpm1_get_timeouts(struct tpm_chip *chip) 
	chip->flags |= TPM_CHIP_FLAG_HAVE_TIMEOUTS;

	return 0;

}



#define TPM_ORD_PCR_EXTEND 20

int tpm1_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash,

		    const char *log_msg)

{

	struct tpm_buf buf;

	int rc;



	rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_PCR_EXTEND);

	if (rc)

		return rc;



	tpm_buf_append_u32(&buf, pcr_idx);

	tpm_buf_append(&buf, hash, TPM_DIGEST_SIZE);



	rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE,

			      TPM_DIGEST_SIZE, 0, log_msg);



	tpm_buf_destroy(&buf);

	return rc;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE