[PATCH 4/8] UBUNTU: [Config] CONFIG_IMA=y

[Tyler Hicks]

Signed-off-by: Tyler Hicks <tyhicks at canonical.com>
---
 debian.flo/config/config.common.ubuntu | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian.flo/config/config.common.ubuntu b/debian.flo/config/config.common.ubuntu
index 743a15b..e881736 100644
--- a/debian.flo/config/config.common.ubuntu
+++ b/debian.flo/config/config.common.ubuntu
@@ -364,6 +364,7 @@ CONFIG_CLEANCACHE=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLS_U32_MARK=y
 # CONFIG_CLS_U32_PERF is not set
+CONFIG_CLZ_TAB=y
 CONFIG_CMA=y
 CONFIG_CMA_ALIGNMENT=8
 CONFIG_CMA_AREAS=7
@@ -1108,7 +1109,10 @@ CONFIG_I2C_QUP=y
 # CONFIG_IIO is not set
 CONFIG_IKCONFIG=y
 # CONFIG_IKCONFIG_PROC is not set
-# CONFIG_IMA is not set
+CONFIG_IMA=y
+CONFIG_IMA_AUDIT=y
+CONFIG_IMA_LSM_RULES=y
+CONFIG_IMA_MEASURE_PCR_IDX=10
 # CONFIG_IMX111 is not set
 # CONFIG_IMX111_ACT is not set
 # CONFIG_IMX119 is not set
@@ -1206,6 +1210,8 @@ CONFIG_INPUT_MPU3050=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_UINPUT=y
 # CONFIG_INPUT_YEALINK is not set
+CONFIG_INTEGRITY=y
+CONFIG_INTEGRITY_SIGNATURE=y
 # CONFIG_INTEL_MID_PTI is not set
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_PGTABLES_L2=y
@@ -1641,6 +1647,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
 # CONFIG_MOUSE_SYNAPTICS_USB is not set
 # CONFIG_MOUSE_VSXXXAA is not set
+CONFIG_MPILIB=y
 # CONFIG_MSDOS_FS is not set
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSM7X00A_IDLE_SLEEP_MIN_TIME=20000000
@@ -2644,6 +2651,7 @@ CONFIG_SERIO_SERPORT=y
 # CONFIG_SGI_PARTITION is not set
 CONFIG_SHMEM=y
 CONFIG_SIGNALFD=y
+CONFIG_SIGNATURE=y
 # CONFIG_SIS190 is not set
 # CONFIG_SIS900 is not set
 # CONFIG_SKGE is not set
@@ -2866,7 +2874,10 @@ CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TARGET_CORE is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_TCG_TPM is not set
+# CONFIG_TCG_ATMEL is not set
+# CONFIG_TCG_ST_I2C is not set
+CONFIG_TCG_TPM=y
+# CONFIG_TCG_TPMD_DEV is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TCP_MD5SIG is not set
@@ -2960,6 +2971,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_TSIF is not set
 # CONFIG_TSPP is not set
 # CONFIG_TTY_PRINTK is not set
-- 
1.9.1