Jaunty config changes: Build in crypto aes, cbc, ecb

[Tim Gardner]

>From d12a921bed5093e0531095b47bd441a8b7750fbf Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner at canonical.com>
Date: Sat, 20 Dec 2008 19:36:12 -0700
Subject: [PATCH] UBUNTU: Build in Crypto modules AES, CBC, ECB

Ecryptfs depends on these 3 crypto modules for the support of encrypted
/home and Private directories.

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian/config/amd64/config        |   10 +++++-----
 debian/config/i386/config         |   10 +++++-----
 debian/d-i/modules/crypto-modules |    3 ---
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 395200f..3201fa1 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -455,21 +455,21 @@ CONFIG_CRC_T10DIF=m
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_AES_X86_64=m
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_X86_64=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
@@ -480,7 +480,7 @@ CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
-CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=m
diff --git a/debian/config/i386/config b/debian/config/i386/config
index c5c909f..0446a43 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -479,21 +479,21 @@ CONFIG_CRC_T10DIF=m
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_586=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
@@ -508,7 +508,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_PADLOCK=y
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=m
diff --git a/debian/d-i/modules/crypto-modules b/debian/d-i/modules/crypto-modules
index a31bf84..72d74fb 100644
--- a/debian/d-i/modules/crypto-modules
+++ b/debian/d-i/modules/crypto-modules
@@ -1,8 +1,5 @@
-aes_generic
 blowfish
 twofish
 serpent
 sha256_generic
-cbc
-ecb
 crc32c
-- 
1.5.6.3