tpm: move TPM_DIGEST_SIZE defintion

IMA requires access to TPM_DIGEST_SIZE definition.  This patch
moves the definition to <linux/tpm.h>.

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>

diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 0770d1d79366d31d4832dd2186d677a6ad3a565c..43342328870970bdc7bbe74905aa42d8a614042b 100644 (file)
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -272,7 +272,6 @@ typedef union {
        struct  tpm_output_header out;
 } tpm_cmd_header;
 
-#define TPM_DIGEST_SIZE 20
 struct tpm_pcrread_out {
        u8      pcr_result[TPM_DIGEST_SIZE];
 } __packed;

diff --git a/include/linux/tpm.h b/include/linux/tpm.h
index fcb627ff8d3eb71ad49ced6763a0ff061b83f62e..9a9051bb1a03be1ad8df3bc407ee9f8895df8a07 100644 (file)
--- a/include/linux/tpm.h
+++ b/include/linux/tpm.h
@@ -22,6 +22,8 @@
 #ifndef __LINUX_TPM_H__
 #define __LINUX_TPM_H__
 
+#define TPM_DIGEST_SIZE 20     /* Max TPM v1.2 PCR size */
+
 /*
  * Chip num is this value or a valid tpm idx
  */