From 2a05d8cbba5480e0f2ad9da7adec463a934c7bd8 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Thu, 21 Aug 2008 13:30:59 +0000 Subject: [PATCH] set reasonable generic CRYPTO_ config entries for 2.6.26 SVN-Revision: 12362 --- target/linux/adm5120/router_be/config-2.6.26 | 3 --- target/linux/adm5120/router_le/config-2.6.26 | 3 --- target/linux/ar71xx/config-2.6.26 | 3 --- target/linux/atheros/config-2.6.26 | 3 --- target/linux/generic-2.6/config-2.6.26 | 25 ++++++++++---------- target/linux/magicbox/config-default | 3 --- target/linux/orion/config-default | 3 --- target/linux/ppc40x/config-default | 3 --- target/linux/uml/config/i386 | 3 --- 9 files changed, 13 insertions(+), 36 deletions(-) diff --git a/target/linux/adm5120/router_be/config-2.6.26 b/target/linux/adm5120/router_be/config-2.6.26 index 2b9f9df7ea..0c05b3de20 100644 --- a/target/linux/adm5120/router_be/config-2.6.26 +++ b/target/linux/adm5120/router_be/config-2.6.26 @@ -62,9 +62,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y # CONFIG_CPU_TX39XX is not set # CONFIG_CPU_TX49XX is not set # CONFIG_CPU_VR41XX is not set -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_GF128MUL=m CONFIG_CSRC_R4K=y CONFIG_DEVPORT=y # CONFIG_DM9000 is not set diff --git a/target/linux/adm5120/router_le/config-2.6.26 b/target/linux/adm5120/router_le/config-2.6.26 index 4792f6445e..483b8b6b74 100644 --- a/target/linux/adm5120/router_le/config-2.6.26 +++ b/target/linux/adm5120/router_le/config-2.6.26 @@ -83,9 +83,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y # CONFIG_CPU_TX39XX is not set # CONFIG_CPU_TX49XX is not set # CONFIG_CPU_VR41XX is not set -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_GF128MUL=m CONFIG_CSRC_R4K=y CONFIG_DEVPORT=y # CONFIG_DM9000 is not set diff --git a/target/linux/ar71xx/config-2.6.26 b/target/linux/ar71xx/config-2.6.26 index 2dc2af7924..579ba2f427 100644 --- a/target/linux/ar71xx/config-2.6.26 +++ b/target/linux/ar71xx/config-2.6.26 @@ -51,9 +51,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y # CONFIG_CPU_TX39XX is not set # CONFIG_CPU_TX49XX is not set # CONFIG_CPU_VR41XX is not set -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_GF128MUL=m CONFIG_CSRC_R4K=y CONFIG_DEVPORT=y # CONFIG_DM9000 is not set diff --git a/target/linux/atheros/config-2.6.26 b/target/linux/atheros/config-2.6.26 index 0747fe96ae..d2560550dc 100644 --- a/target/linux/atheros/config-2.6.26 +++ b/target/linux/atheros/config-2.6.26 @@ -50,9 +50,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y # CONFIG_CPU_TX39XX is not set # CONFIG_CPU_TX49XX is not set # CONFIG_CPU_VR41XX is not set -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_GF128MUL=m CONFIG_CSRC_R4K=y CONFIG_DEVPORT=y # CONFIG_DM9000 is not set diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26 index ee5a659378..a5f3921822 100644 --- a/target/linux/generic-2.6/config-2.6.26 +++ b/target/linux/generic-2.6/config-2.6.26 @@ -240,49 +240,50 @@ CONFIG_CRC_CCITT=m CONFIG_CRC_ITU_T=m CONFIG_CROSSCOMPILE=y CONFIG_CRYPTO=y +CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_ALGAPI=m CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_ARC4=m -# CONFIG_CRYPTO_AUTHENC is not set +CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CCM=m +# CONFIG_CRYPTO_CCM is not set CONFIG_CRYPTO_CRC32C=m # CONFIG_CRYPTO_CRYPTD is not set -CONFIG_CRYPTO_CTR=m +# CONFIG_CRYPTO_CTR is not set # CONFIG_CRYPTO_CTS is not set CONFIG_CRYPTO_DEFLATE=m CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEV_HIFN_795X is not set CONFIG_CRYPTO_ECB=m # CONFIG_CRYPTO_FCRYPT is not set -CONFIG_CRYPTO_GCM=m +# CONFIG_CRYPTO_GCM is not set # CONFIG_CRYPTO_GF128MUL is not set CONFIG_CRYPTO_HASH=m CONFIG_CRYPTO_HMAC=m # CONFIG_CRYPTO_HW is not set CONFIG_CRYPTO_KHAZAD=m # CONFIG_CRYPTO_LRW is not set -CONFIG_CRYPTO_LZO=m +# CONFIG_CRYPTO_LZO is not set CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_NULL=m # CONFIG_CRYPTO_PCBC is not set -CONFIG_CRYPTO_PRNG=m -CONFIG_CRYPTO_RMD128=m -CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_RMD256=m -CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SALSA20=m +# CONFIG_CRYPTO_PRNG is not set +# 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_SALSA20 is not set # CONFIG_CRYPTO_SEED is not set -CONFIG_CRYPTO_SEQIV=m +# CONFIG_CRYPTO_SEQIV is not set CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SHA256=m diff --git a/target/linux/magicbox/config-default b/target/linux/magicbox/config-default index 5456b9ba8e..186e259ce1 100644 --- a/target/linux/magicbox/config-default +++ b/target/linux/magicbox/config-default @@ -31,9 +31,6 @@ CONFIG_CONSISTENT_SIZE=0x00200000 CONFIG_CONSISTENT_START=0xff100000 # CONFIG_CPCI405 is not set # CONFIG_CPU_FREQ is not set -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_GF128MUL=m # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_DEVPORT=y # CONFIG_DMADEVICES is not set diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default index 514efc592c..1b4ab8077b 100644 --- a/target/linux/orion/config-default +++ b/target/linux/orion/config-default @@ -83,9 +83,6 @@ CONFIG_CPU_PABRT_NOIFAR=y CONFIG_CPU_TLB_V4WBI=y CONFIG_CRC16=y # CONFIG_CRC_CCITT is not set -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_GF128MUL=m # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_USER is not set CONFIG_DEFAULT_TCP_CONG="westwood" diff --git a/target/linux/ppc40x/config-default b/target/linux/ppc40x/config-default index 537a6807f5..baf8551c99 100644 --- a/target/linux/ppc40x/config-default +++ b/target/linux/ppc40x/config-default @@ -27,9 +27,6 @@ CONFIG_CMDLINE_BOOL=y CONFIG_CONSISTENT_SIZE=0x00200000 CONFIG_CONSISTENT_START=0xff100000 # CONFIG_CPU_FREQ is not set -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_GF128MUL=m # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEFAULT_UIMAGE is not set CONFIG_DEVPORT=y diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386 index 64fd5326f5..bc55df4dcd 100644 --- a/target/linux/uml/config/i386 +++ b/target/linux/uml/config/i386 @@ -15,10 +15,7 @@ CONFIG_CLASSIC_RCU=y CONFIG_CON_CHAN="xterm" CONFIG_CON_ZERO_CHAN="fd:0,fd:1" CONFIG_CRAMFS=y -CONFIG_CRYPTO_AEAD=m # CONFIG_CRYPTO_AES_586 is not set -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_GF128MUL=m # CONFIG_CRYPTO_SALSA20_586 is not set # CONFIG_CRYPTO_TWOFISH_586 is not set CONFIG_DEBUG_BUGVERBOSE=y