[PATCH 4/6] UBUNTU: [Config] Common cryptographic API options.

[Brad Figg]

Signed-off-by: Brad Figg <brad.figg at canonical.com>
---
 debian.mvl-dove/config/config.common.ubuntu |  104 ++++++++++++++-------------
 1 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/debian.mvl-dove/config/config.common.ubuntu b/debian.mvl-dove/config/config.common.ubuntu
index c9014ec..c8fab63 100644
--- a/debian.mvl-dove/config/config.common.ubuntu
+++ b/debian.mvl-dove/config/config.common.ubuntu
@@ -189,7 +189,7 @@ CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
 # CONFIG_BLK_DEV_BSG is not set
-CONFIG_BLK_DEV_COMPCACHE=m
+# CONFIG_BLK_DEV_COMPCACHE is not set
 # CONFIG_BLK_DEV_COMPCACHE_DEBUG is not set
 # CONFIG_BLK_DEV_COMPCACHE_STATS is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
@@ -369,70 +369,71 @@ CONFIG_CRC_T10DIF=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_BLOWFISH=y
-# CONFIG_CRYPTO_CAMELLIA is not set
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 # CONFIG_CRYPTO_CAST6 is not set
 CONFIG_CRYPTO_CBC=y
-# CONFIG_CRYPTO_CCM is not set
-CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_FCRYPT=m
-# CONFIG_CRYPTO_FIPS is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_FIPS=y
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_LRW is not set
-CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCOMP=y
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_RNG=m
 CONFIG_CRYPTO_RNG2=y
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SEQIV is not set
-# CONFIG_CRYPTO_SERPENT is not set
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_TEA=y
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_WORKQUEUE=y
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-# CONFIG_CRYPTO_ZLIB is not set
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_ZLIB=m
 CONFIG_CUSE=m
 # CONFIG_DAVICOM_PHY is not set
 CONFIG_DCB=y
@@ -1078,8 +1079,8 @@ CONFIG_LOGO_LINUX_CLUT224=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_LXT_PHY is not set
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m
 CONFIG_M25PXX_USE_FAST_READ=y
 CONFIG_MA600_DONGLE=m
 CONFIG_MAC80211=m
@@ -1545,17 +1546,18 @@ CONFIG_OCFS2_FS_O2CB=m
 CONFIG_OCFS2_FS_POSIX_ACL=y
 CONFIG_OCFS2_FS_STATS=y
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-# CONFIG_OCF_BENCH is not set
-CONFIG_OCF_CRYPTODEV=y
-CONFIG_OCF_CRYPTOSOFT=y
-# CONFIG_OCF_EP80579 is not set
-# CONFIG_OCF_HIFN is not set
+CONFIG_OCF_BENCH=m
+# CONFIG_OCF_CRYPTODEV is not set
+CONFIG_OCF_CRYPTOSOFT=m
+CONFIG_OCF_EP80579=m
+CONFIG_OCF_HIFN=m
 # CONFIG_OCF_HIFNHIPP is not set
 # CONFIG_OCF_IXP4XX is not set
+# CONFIG_OCF_IXP4XX_SHA1_MD5 is not set
 CONFIG_OCF_OCF=y
-# CONFIG_OCF_OCFNULL is not set
+CONFIG_OCF_OCFNULL=m
 # CONFIG_OCF_RANDOMHARVEST is not set
-# CONFIG_OCF_SAFE is not set
+CONFIG_OCF_SAFE=m
 # CONFIG_OCF_TALITOS is not set
 CONFIG_OLD_BELKIN_DONGLE=m
 CONFIG_OMFS_FS=m
@@ -2390,6 +2392,6 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0
 # CONFIG_ZD1211RW is not set
 CONFIG_ZISOFS=y
-CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZLIB_DEFLATE=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=0
-- 
1.6.0.4