r4112 - in dists/trunk/linux-2.6/debian/arch: . alpha amd64 hppa i386 ia64 m68k powerpc s390 sparc

Andres Salomon dilinger at costa.debian.org
Thu Sep 1 06:10:51 UTC 2005


Author: dilinger
Date: 2005-09-01 06:10:47 +0000 (Thu, 01 Sep 2005)
New Revision: 4112

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/hppa/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/i386/config.386
   dists/trunk/linux-2.6/debian/arch/i386/config.686
   dists/trunk/linux-2.6/debian/arch/i386/config.686-smp
   dists/trunk/linux-2.6/debian/arch/i386/config.k7
   dists/trunk/linux-2.6/debian/arch/i386/config.k7-smp
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/m68k/config
   dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
   dists/trunk/linux-2.6/debian/arch/m68k/config.atari
   dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000
   dists/trunk/linux-2.6/debian/arch/m68k/config.hp
   dists/trunk/linux-2.6/debian/arch/m68k/config.mac
   dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147
   dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x
   dists/trunk/linux-2.6/debian/arch/m68k/config.q40
   dists/trunk/linux-2.6/debian/arch/m68k/config.sun3
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/s390/config
   dists/trunk/linux-2.6/debian/arch/sparc/config
Log:
Move all CONFIG_CRYPTO options out into global config; this unifies
CRYPTO_CONFIG modules for all archs except arm (which disables the crypto
stuff; i assume Vincent has a good reason for that..).  I left the md5
module compiled in statically, since most archs had it set that way; if
there's no reason for this, we can make it a module instead (I'm assuming
there's initrd-ish stuff that needs it?)


Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	2005-09-01 06:10:47 UTC (rev 4112)
@@ -1830,16 +1830,5 @@
 CONFIG_SECURITY_ROOTPLUG=m
 CONFIG_SECURITY_SECLVL=m
 # CONFIG_SECURITY_SELINUX is not set
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_TEST=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC32=m

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	2005-09-01 06:10:47 UTC (rev 4112)
@@ -1765,17 +1765,6 @@
 CONFIG_SECURITY_SELINUX_DEVELOP=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_TEST=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC32=y
 CONFIG_REED_SOLOMON=m

Modified: dists/trunk/linux-2.6/debian/arch/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/config	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/config	2005-09-01 06:10:47 UTC (rev 4112)
@@ -249,3 +249,16 @@
 CONFIG_USB_MON=y
 CONFIG_HWMON=y
 # CONFIG_DVB_USB_DEBUG is not set
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=y
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_AES=m

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config	2005-09-01 06:10:47 UTC (rev 4112)
@@ -1080,31 +1080,6 @@
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SECLVL=m
 # CONFIG_SECURITY_SELINUX is not set
-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 is not set
-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=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	2005-09-01 06:10:47 UTC (rev 4112)
@@ -2024,18 +2024,7 @@
 CONFIG_SECURITY_SELINUX_DEVELOP=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC32=y
 CONFIG_REED_SOLOMON=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.386
===================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.386	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.386	2005-09-01 06:10:47 UTC (rev 4112)
@@ -105,4 +105,3 @@
 CONFIG_EXT2_FS=y
 CONFIG_FS_MBCACHE=y
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CRYPTO_TEA=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.686
===================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.686	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.686	2005-09-01 06:10:47 UTC (rev 4112)
@@ -84,4 +84,3 @@
 CONFIG_FS_MBCACHE=m
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_CRYPTO_TEA=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.686-smp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.686-smp	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.686-smp	2005-09-01 06:10:47 UTC (rev 4112)
@@ -67,7 +67,6 @@
 CONFIG_FS_MBCACHE=m
 CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_CRYPTO_TEA=m
 CONFIG_X86_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.k7
===================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.k7	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.k7	2005-09-01 06:10:47 UTC (rev 4112)
@@ -85,4 +85,3 @@
 CONFIG_FS_MBCACHE=m
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_HIGHMEM is not set
-# CONFIG_CRYPTO_TEA is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.k7-smp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.k7-smp	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.k7-smp	2005-09-01 06:10:47 UTC (rev 4112)
@@ -68,7 +68,6 @@
 CONFIG_FS_MBCACHE=m
 CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_CRYPTO_TEA=m
 CONFIG_X86_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	2005-09-01 06:10:47 UTC (rev 4112)
@@ -1489,14 +1489,3 @@
 CONFIG_SECURITY_ROOTPLUG=m
 CONFIG_SECURITY_SECLVL=m
 # CONFIG_SECURITY_SELINUX is not set
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_TEST=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config	2005-09-01 06:10:47 UTC (rev 4112)
@@ -432,26 +432,6 @@
 # CONFIG_FRAME_POINTER is not set
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=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_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_TEST=m
 CONFIG_CRC_CCITT=m
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	2005-09-01 06:10:47 UTC (rev 4112)
@@ -215,9 +215,4 @@
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_AMIGA_PARTITION=y
 CONFIG_NLS_UTF8=m
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRC32=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.atari
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.atari	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.atari	2005-09-01 06:10:47 UTC (rev 4112)
@@ -120,9 +120,4 @@
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_ATARI_PARTITION=y
 CONFIG_NLS_UTF8=m
-CONFIG_CRYPTO_MD5=m
-# CONFIG_CRYPTO_WP512 is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRC32=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000	2005-09-01 06:10:47 UTC (rev 4112)
@@ -78,9 +78,4 @@
 CONFIG_NCPFS_OS2_NS=y
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_NLS_UTF8=m
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_WP512 is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRC32=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.hp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.hp	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.hp	2005-09-01 06:10:47 UTC (rev 4112)
@@ -69,9 +69,4 @@
 CONFIG_NCPFS_OS2_NS=y
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_NLS_UTF8=m
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_WP512 is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRC32=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mac
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mac	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mac	2005-09-01 06:10:47 UTC (rev 4112)
@@ -141,9 +141,4 @@
 CONFIG_SUN_PARTITION=y
 # CONFIG_EFI_PARTITION is not set
 CONFIG_NLS_UTF8=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRC32=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147	2005-09-01 06:10:47 UTC (rev 4112)
@@ -92,9 +92,4 @@
 # CONFIG_NCPFS_OS2_NS is not set
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_NLS_UTF8=m
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_TGR192 is not set
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRC32=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x	2005-09-01 06:10:47 UTC (rev 4112)
@@ -97,9 +97,4 @@
 # CONFIG_NCPFS_OS2_NS is not set
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_NLS_UTF8=m
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_WP512 is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRC32=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.q40
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.q40	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.q40	2005-09-01 06:10:47 UTC (rev 4112)
@@ -140,9 +140,4 @@
 # CONFIG_NCPFS_OS2_NS is not set
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_NLS_UTF8=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRC32=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.sun3
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.sun3	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.sun3	2005-09-01 06:10:47 UTC (rev 4112)
@@ -79,9 +79,4 @@
 # CONFIG_PARTITION_ADVANCED is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_NLS_UTF8=m
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_WP512 is not set
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRC32=y

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-09-01 06:10:47 UTC (rev 4112)
@@ -1449,14 +1449,3 @@
 CONFIG_SECURITY_SELINUX_DEVELOP=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_TEST=m

Modified: dists/trunk/linux-2.6/debian/arch/s390/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/config	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/s390/config	2005-09-01 06:10:47 UTC (rev 4112)
@@ -319,19 +319,8 @@
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_SECLVL is not set
 # CONFIG_SECURITY_SELINUX is not set
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA1_Z990=m
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_TGR192 is not set
-CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_DES_Z990=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_TEA=m
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_TEST is not set
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC32=m
 CONFIG_KEXEC=y

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config	2005-09-01 06:01:08 UTC (rev 4111)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config	2005-09-01 06:10:47 UTC (rev 4112)
@@ -516,17 +516,6 @@
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-# CONFIG_CRYPTO_TEST is not set
 CONFIG_CRC_CCITT=m
 CONFIG_CRC32=y
 CONFIG_IP_ROUTE_VERBOSE=y




More information about the Kernel-svn-changes mailing list