diff mbox

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

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

Commit Message

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

Patch

diff --git a/debian.manta/config/config.common.ubuntu b/debian.manta/config/config.common.ubuntu
index b7d4b52..c6d254f 100644
--- a/debian.manta/config/config.common.ubuntu
+++ b/debian.manta/config/config.common.ubuntu
@@ -971,7 +971,10 @@  CONFIG_IIO_KFIFO_BUF=y
 CONFIG_IIO_TRIGGER=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-# 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=y
 CONFIG_INET6_ESP=y
@@ -2190,7 +2193,7 @@  CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_TASK_XACCT=y
-# CONFIG_TCG_TPM is not set
+CONFIG_TCG_TPM=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TCP_MD5SIG is not set
@@ -2264,6 +2267,7 @@  CONFIG_TRACING_SUPPORT=y
 # CONFIG_TRANZPORT is not set
 CONFIG_TREE_PREEMPT_RCU=y
 # CONFIG_TREE_RCU_TRACE is not set
+CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSL2583 is not set
 # CONFIG_TTY_PRINTK is not set
 CONFIG_TUN=y