diff mbox

[2/8] UBUNTU: [Config] CONFIG_IMA=y

Message ID 1403911188-32182-3-git-send-email-tyhicks@canonical.com
State New
Headers show

Commit Message

Tyler Hicks June 27, 2014, 11:19 p.m. UTC 
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
---
 debian.goldfish/config/config.common.ubuntu | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/debian.goldfish/config/config.common.ubuntu b/debian.goldfish/config/config.common.ubuntu
index a66ed12..890a735 100644
--- a/debian.goldfish/config/config.common.ubuntu
+++ b/debian.goldfish/config/config.common.ubuntu
@@ -1238,7 +1238,10 @@  CONFIG_IIO_SYSFS_TRIGGER=m
 CONFIG_IIO_TRIGGER=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_ILLEGAL_POINTER_VALUE=0
-# CONFIG_IMA is not set
+CONFIG_IMA=y
+CONFIG_IMA_AUDIT=y
+CONFIG_IMA_LSM_RULES=y
+CONFIG_IMA_MEASURE_PCR_IDX=10
 CONFIG_INET=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -2825,7 +2828,11 @@  CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_TASK_XACCT=y
 CONFIG_TC1100_WMI=m
-# CONFIG_TCG_TPM is not set
+# CONFIG_TCG_ATMEL is not set
+# CONFIG_TCG_INFINEON is not set
+# CONFIG_TCG_NSC is not set
+CONFIG_TCG_TIS=y
+CONFIG_TCG_TPM=y
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_PSCSI=m
@@ -2917,6 +2924,7 @@  CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
 CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 # CONFIG_TREE_RCU_TRACE is not set
+CONFIG_TRUSTED_KEYS=y
 CONFIG_TSL2583=m
 CONFIG_TTY_PRINTK=y
 # CONFIG_TULIP is not set