From bf29342baff5d48e7c20e03d3dbb8901d369bbef Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 21 Feb 2006 09:56:35 +0000 Subject: [PATCH] debian/arch: Unify cryptographic options. svn path=/dists/trunk/linux-2.6/; revision=5942 --- debian/arch/arm/config.footbridge | 25 ----------------------- debian/arch/arm/config.ixp4xx | 25 ----------------------- debian/arch/arm/config.nslu2 | 25 ----------------------- debian/arch/arm/config.rpc | 25 ----------------------- debian/arch/arm/config.s3c2410 | 25 ----------------------- debian/arch/armeb/config.nslu2 | 25 ----------------------- debian/arch/config | 2 +- debian/arch/hppa/config | 1 - debian/arch/powerpc/config.powerpc-miboot | 1 - debian/arch/sparc/config.sparc32 | 25 ----------------------- 10 files changed, 1 insertion(+), 178 deletions(-) diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index 9dfc67d1d..67591100d 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -1544,31 +1544,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # # Cryptographic options # -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_TEST=m # # Hardware crypto devices diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index d72f4cfdd..aa0d3db85 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -1375,31 +1375,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # # Cryptographic options # -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_TEST=m # # Hardware crypto devices diff --git a/debian/arch/arm/config.nslu2 b/debian/arch/arm/config.nslu2 index 9531dbb12..945aaca89 100644 --- a/debian/arch/arm/config.nslu2 +++ b/debian/arch/arm/config.nslu2 @@ -1605,31 +1605,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # # Cryptographic options # -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_TEST=m # # Hardware crypto devices diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index 929de7b6f..862e13f54 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -1017,31 +1017,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # # Cryptographic options # -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_TEST=m # # Hardware crypto devices diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410 index f0c9861eb..8591ab4eb 100644 --- a/debian/arch/arm/config.s3c2410 +++ b/debian/arch/arm/config.s3c2410 @@ -1095,31 +1095,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # # Cryptographic options # -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_TEST=m # # Hardware crypto devices diff --git a/debian/arch/armeb/config.nslu2 b/debian/arch/armeb/config.nslu2 index 4ef37d109..2a6c48d8d 100644 --- a/debian/arch/armeb/config.nslu2 +++ b/debian/arch/armeb/config.nslu2 @@ -1605,31 +1605,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # # Cryptographic options # -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_TEST=m # # Hardware crypto devices diff --git a/debian/arch/config b/debian/arch/config index c1b1f1575..ef061eff8 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -94,7 +94,6 @@ CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m @@ -819,3 +818,4 @@ CONFIG_CLEAN_COMPILE=y # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_USB_ET61X251=m # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_CRYPTO_TWOFISH=m diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index 9f38cb19a..780242aba 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -956,7 +956,6 @@ CONFIG_ZLIB_DEFLATE=m CONFIG_SND_HWDEP=m CONFIG_NFS_ACL_SUPPORT=y # CONFIG_HWMON_VID is not set -CONFIG_CRYPTO_DES=y # CONFIG_HZ_100 is not set CONFIG_HZ_250=y # CONFIG_HZ_1000 is not set diff --git a/debian/arch/powerpc/config.powerpc-miboot b/debian/arch/powerpc/config.powerpc-miboot index c2a61dba0..e2d049ece 100644 --- a/debian/arch/powerpc/config.powerpc-miboot +++ b/debian/arch/powerpc/config.powerpc-miboot @@ -68,7 +68,6 @@ CONFIG_PCMCIA_XIRTULIP=m # CONFIG_IRPORT_SIR is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set # CONFIG_PMAC_BACKLIGHT is not set -CONFIG_CRYPTO_MD5=y # CONFIG_SOFTWARE_SUSPEND is not set CONFIG_DEFAULT_DEADLINE=y CONFIG_FLATMEM_MANUAL=y diff --git a/debian/arch/sparc/config.sparc32 b/debian/arch/sparc/config.sparc32 index e6e10dca0..a103b22db 100644 --- a/debian/arch/sparc/config.sparc32 +++ b/debian/arch/sparc/config.sparc32 @@ -1304,31 +1304,6 @@ CONFIG_DEBUG_BUGVERBOSE=y # # Cryptographic options # -CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_DES=y -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m -# CONFIG_CRYPTO_TEST is not set # # Hardware crypto devices