From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Tue, 21 May 2013 14:40:47 +0000 (-0400)
Subject: tpm: move TPM_DIGEST_SIZE defintion
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1c16c9636cad24f0e654f19e8f73ede0c7bd5540;p=linux.git

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 0770d1d79366d..4334232887097 100644
--- 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 fcb627ff8d3eb..9a9051bb1a03b 100644
--- 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
  */