From bb94fc7d53de4170df6a470716c7aa6fd6f2f2f3 Mon Sep 17 00:00:00 2001 From: Norvin Shuster Date: Mon, 23 Jan 2012 09:05:07 -0800 Subject: [PATCH] Disk Encryption: Enable user file system encryption BZ: 20830 Include the device-mapper in the kernel configuration o Include crypto SHA256 and CBC in the kernel configuraiton. Change-Id: Ic75bbe96ebf8ddbb4799119eb69aa3a1bea590bd Signed-off-by: Norvin Shuster Reviewed-on: http://android.intel.com:8080/32762 Reviewed-by: Allyn, Mark A Reviewed-by: Shuster, Norvin Reviewed-by: Yang, Fei Reviewed-by: Gross, Mark Reviewed-by: Mangalampalli, Jayant Tested-by: Mangalampalli, Jayant Reviewed-by: buildbot Tested-by: buildbot --- arch/x86/configs/i386_mfld_defconfig | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/x86/configs/i386_mfld_defconfig b/arch/x86/configs/i386_mfld_defconfig index d193eb4..7b6c8ae 100644 --- a/arch/x86/configs/i386_mfld_defconfig +++ b/arch/x86/configs/i386_mfld_defconfig @@ -961,7 +961,19 @@ CONFIG_SCSI_MOD=y # CONFIG_SCSI_DMA is not set # CONFIG_SCSI_NETLINK is not set # CONFIG_ATA is not set -# CONFIG_MD is not set +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +CONFIG_BLK_DEV_DM=y +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=y +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_RAID is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_UEVENT is not set +# CONFIG_DM_FLAKEY is not set # CONFIG_FUSION is not set # @@ -2732,7 +2744,7 @@ CONFIG_CRYPTO_WORKQUEUE=y # # Block modes # -# CONFIG_CRYPTO_CBC is not set +CONFIG_CRYPTO_CBC=y # CONFIG_CRYPTO_CTR is not set # CONFIG_CRYPTO_CTS is not set CONFIG_CRYPTO_ECB=y @@ -2761,7 +2773,7 @@ CONFIG_CRYPTO_MD5=y # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set CONFIG_CRYPTO_SHA1=y -# CONFIG_CRYPTO_SHA256 is not set +CONFIG_CRYPTO_SHA256=y # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_TGR192 is not set # CONFIG_CRYPTO_WP512 is not set -- 2.7.4