aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-04-06 18:08:48 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-04-06 18:08:48 +0000
commitcdf292ac64b4997bc694188f9ea2339b3dc369fb (patch)
tree61040b17778ea09eb3e230f1941a1122ece981fe
parentcb70a62be333c183db137102fffae8b0d4bd95b2 (diff)
downloadupstream-cdf292ac64b4997bc694188f9ea2339b3dc369fb.tar.gz
upstream-cdf292ac64b4997bc694188f9ea2339b3dc369fb.tar.bz2
upstream-cdf292ac64b4997bc694188f9ea2339b3dc369fb.zip
2.6.28: add Kconfig prompt for the old crypto symbols
SVN-Revision: 15122
-rw-r--r--target/linux/generic-2.6/config-2.6.285
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/979-crypto_add_kconfig_prompts.patch47
2 files changed, 50 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/config-2.6.28 b/target/linux/generic-2.6/config-2.6.28
index c5e2a19263..262bec2998 100644
--- a/target/linux/generic-2.6/config-2.6.28
+++ b/target/linux/generic-2.6/config-2.6.28
@@ -263,7 +263,7 @@ CONFIG_CRC32=y
# CONFIG_CRC_T10DIF is not set
CONFIG_CROSSCOMPILE=y
CONFIG_CRYPTO=y
-# CONFIG_CRYPTO_AEAD is not set
+CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=m
CONFIG_CRYPTO_AES=m
CONFIG_CRYPTO_ALGAPI=m
@@ -292,7 +292,7 @@ CONFIG_CRYPTO_ECB=m
# CONFIG_CRYPTO_FIPS is not set
# CONFIG_CRYPTO_GCM is not set
# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_HASH is not set
+CONFIG_CRYPTO_HASH=m
CONFIG_CRYPTO_HASH2=m
# CONFIG_CRYPTO_HMAC is not set
# CONFIG_CRYPTO_HW is not set
@@ -311,6 +311,7 @@ CONFIG_CRYPTO_MANAGER2=m
# CONFIG_CRYPTO_RMD160 is not set
# CONFIG_CRYPTO_RMD256 is not set
# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_RNG=m
CONFIG_CRYPTO_RNG2=m
# CONFIG_CRYPTO_SALSA20 is not set
# CONFIG_CRYPTO_SEED is not set
diff --git a/target/linux/generic-2.6/patches-2.6.28/979-crypto_add_kconfig_prompts.patch b/target/linux/generic-2.6/patches-2.6.28/979-crypto_add_kconfig_prompts.patch
new file mode 100644
index 0000000000..df7837dbab
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.28/979-crypto_add_kconfig_prompts.patch
@@ -0,0 +1,47 @@
+--- a/crypto/Kconfig
++++ b/crypto/Kconfig
+@@ -30,7 +30,7 @@ config CRYPTO_FIPS
+ this is.
+
+ config CRYPTO_ALGAPI
+- tristate
++ tristate "ALGAPI"
+ select CRYPTO_ALGAPI2
+ help
+ This option provides the API for cryptographic algorithms.
+@@ -39,7 +39,7 @@ config CRYPTO_ALGAPI2
+ tristate
+
+ config CRYPTO_AEAD
+- tristate
++ tristate "AEAD"
+ select CRYPTO_AEAD2
+ select CRYPTO_ALGAPI
+
+@@ -48,7 +48,7 @@ config CRYPTO_AEAD2
+ select CRYPTO_ALGAPI2
+
+ config CRYPTO_BLKCIPHER
+- tristate
++ tristate "BLKCIPHER"
+ select CRYPTO_BLKCIPHER2
+ select CRYPTO_ALGAPI
+
+@@ -58,7 +58,7 @@ config CRYPTO_BLKCIPHER2
+ select CRYPTO_RNG2
+
+ config CRYPTO_HASH
+- tristate
++ tristate "HASH"
+ select CRYPTO_HASH2
+ select CRYPTO_ALGAPI
+
+@@ -67,7 +67,7 @@ config CRYPTO_HASH2
+ select CRYPTO_ALGAPI2
+
+ config CRYPTO_RNG
+- tristate
++ tristate "RNG"
+ select CRYPTO_RNG2
+ select CRYPTO_ALGAPI
+