From 836f9cdcd4374828e05e24ef7ccdf089dd2a88a8 Mon Sep 17 00:00:00 2001 From: Fei Yang Date: Thu, 19 Apr 2012 16:26:38 -0700 Subject: [PATCH] CRYPTO: enable twofish for android_secure BZ: 33312 VOLD creates android_secure on primary storage, which requires twofish cipher algorithm support from kernel. This patch enables TWOFISH. Change-Id: I7dddb5bb7ef26a329cb1694268d68e869f438c6f Signed-off-by: Fei Yang Reviewed-on: http://android.intel.com:8080/44087 Reviewed-by: Kuppuswamy, Sathyanarayanan Reviewed-by: Gross, Mark Reviewed-by: Monroy, German Tested-by: Ng, Cheon-woei Reviewed-by: buildbot Tested-by: buildbot --- arch/x86/configs/i386_ctp_defconfig | 6 +++--- arch/x86/configs/i386_mfld_defconfig | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/configs/i386_ctp_defconfig b/arch/x86/configs/i386_ctp_defconfig index 453f6df..d622f63 100644 --- a/arch/x86/configs/i386_ctp_defconfig +++ b/arch/x86/configs/i386_ctp_defconfig @@ -948,7 +948,7 @@ CONFIG_DM_CRYPT=y # 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_UEVENT=y # CONFIG_DM_FLAKEY is not set # CONFIG_FUSION is not set @@ -2724,8 +2724,8 @@ CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set -# CONFIG_CRYPTO_TWOFISH_586 is not set +CONFIG_CRYPTO_TWOFISH=y +CONFIG_CRYPTO_TWOFISH_586=y # # Compression diff --git a/arch/x86/configs/i386_mfld_defconfig b/arch/x86/configs/i386_mfld_defconfig index 4365c10..a68e1a4 100644 --- a/arch/x86/configs/i386_mfld_defconfig +++ b/arch/x86/configs/i386_mfld_defconfig @@ -974,7 +974,7 @@ CONFIG_DM_CRYPT=y # 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_UEVENT=y # CONFIG_DM_FLAKEY is not set # CONFIG_FUSION is not set @@ -2806,8 +2806,8 @@ CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set -# CONFIG_CRYPTO_TWOFISH_586 is not set +CONFIG_CRYPTO_TWOFISH=y +CONFIG_CRYPTO_TWOFISH_586=y # # Compression -- 2.7.4