From 94e553f489eeaef0b2f0d3b01c1bcd9a70ae1a4c Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 24 Feb 2011 01:11:11 +0000 Subject: [PATCH] kernel: the patch to disable the crypto tests is no longer necessary since 2.6.36, remove it git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25689 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/config-2.6.36 | 1 - target/linux/generic/config-2.6.37 | 1 - target/linux/generic/config-2.6.38 | 1 - .../260-crypto_optional_tests.patch | 64 ------------------- .../260-crypto_optional_tests.patch | 64 ------------------- .../260-crypto_optional_tests.patch | 64 ------------------- 6 files changed, 195 deletions(-) delete mode 100644 target/linux/generic/patches-2.6.36/260-crypto_optional_tests.patch delete mode 100644 target/linux/generic/patches-2.6.37/260-crypto_optional_tests.patch delete mode 100644 target/linux/generic/patches-2.6.38/260-crypto_optional_tests.patch diff --git a/target/linux/generic/config-2.6.36 b/target/linux/generic/config-2.6.36 index 4fd91338a..0eb7c40e1 100644 --- a/target/linux/generic/config-2.6.36 +++ b/target/linux/generic/config-2.6.36 @@ -417,7 +417,6 @@ CONFIG_CRYPTO_ALGAPI2=y # CONFIG_CRYPTO_MANAGER is not set # CONFIG_CRYPTO_MANAGER2 is not set CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -CONFIG_CRYPTO_MANAGER_NO_TESTS=y # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set diff --git a/target/linux/generic/config-2.6.37 b/target/linux/generic/config-2.6.37 index a68eb7678..05ec12ae5 100644 --- a/target/linux/generic/config-2.6.37 +++ b/target/linux/generic/config-2.6.37 @@ -428,7 +428,6 @@ CONFIG_CRYPTO_ALGAPI2=y # CONFIG_CRYPTO_MANAGER is not set # CONFIG_CRYPTO_MANAGER2 is not set CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -CONFIG_CRYPTO_MANAGER_NO_TESTS=y # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set diff --git a/target/linux/generic/config-2.6.38 b/target/linux/generic/config-2.6.38 index 0d0de9d32..c1b6cd6b3 100644 --- a/target/linux/generic/config-2.6.38 +++ b/target/linux/generic/config-2.6.38 @@ -427,7 +427,6 @@ CONFIG_CRYPTO_ALGAPI2=y # CONFIG_CRYPTO_MANAGER is not set # CONFIG_CRYPTO_MANAGER2 is not set CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -CONFIG_CRYPTO_MANAGER_NO_TESTS=y # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set diff --git a/target/linux/generic/patches-2.6.36/260-crypto_optional_tests.patch b/target/linux/generic/patches-2.6.36/260-crypto_optional_tests.patch deleted file mode 100644 index 38113dfa7..000000000 --- a/target/linux/generic/patches-2.6.36/260-crypto_optional_tests.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/crypto/Kconfig -+++ b/crypto/Kconfig -@@ -109,6 +109,10 @@ config CRYPTO_MANAGER_DISABLE_TESTS - Disable run-time self tests that normally take place at - algorithm registration. - -+config CRYPTO_MANAGER_NO_TESTS -+ bool "Disable internal testsuite to save space" -+ depends on CRYPTO_MANAGER -+ - config CRYPTO_GF128MUL - tristate "GF(2^128) multiplication functions (EXPERIMENTAL)" - depends on EXPERIMENTAL ---- a/crypto/testmgr.c -+++ b/crypto/testmgr.c -@@ -58,6 +58,8 @@ int alg_test(const char *driver, const c - #define ENCRYPT 1 - #define DECRYPT 0 - -+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS -+ - struct tcrypt_result { - struct completion completion; - int err; -@@ -2484,8 +2486,11 @@ static int alg_find_test(const char *alg - return -1; - } - -+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ -+ - int alg_test(const char *driver, const char *alg, u32 type, u32 mask) - { -+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS - int i; - int j; - int rc; -@@ -2540,6 +2545,9 @@ notest: - return 0; - non_fips_alg: - return -EINVAL; -+#else /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ -+ return 0; -+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ - } - - #endif /* CONFIG_CRYPTO_MANAGER_DISABLE_TESTS */ ---- a/crypto/testmgr.h -+++ b/crypto/testmgr.h -@@ -20,6 +20,8 @@ - - #include - -+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS -+ - #define MAX_DIGEST_SIZE 64 - #define MAX_TAP 8 - -@@ -9608,4 +9610,6 @@ static struct hash_testvec crc32c_tv_tem - }, - }; - -+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ -+ - #endif /* _CRYPTO_TESTMGR_H */ diff --git a/target/linux/generic/patches-2.6.37/260-crypto_optional_tests.patch b/target/linux/generic/patches-2.6.37/260-crypto_optional_tests.patch deleted file mode 100644 index 28352ed4a..000000000 --- a/target/linux/generic/patches-2.6.37/260-crypto_optional_tests.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/crypto/Kconfig -+++ b/crypto/Kconfig -@@ -108,6 +108,10 @@ config CRYPTO_MANAGER_DISABLE_TESTS - Disable run-time self tests that normally take place at - algorithm registration. - -+config CRYPTO_MANAGER_NO_TESTS -+ bool "Disable internal testsuite to save space" -+ depends on CRYPTO_MANAGER -+ - config CRYPTO_GF128MUL - tristate "GF(2^128) multiplication functions (EXPERIMENTAL)" - depends on EXPERIMENTAL ---- a/crypto/testmgr.c -+++ b/crypto/testmgr.c -@@ -58,6 +58,8 @@ int alg_test(const char *driver, const c - #define ENCRYPT 1 - #define DECRYPT 0 - -+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS -+ - struct tcrypt_result { - struct completion completion; - int err; -@@ -2484,8 +2486,11 @@ static int alg_find_test(const char *alg - return -1; - } - -+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ -+ - int alg_test(const char *driver, const char *alg, u32 type, u32 mask) - { -+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS - int i; - int j; - int rc; -@@ -2540,6 +2545,9 @@ notest: - return 0; - non_fips_alg: - return -EINVAL; -+#else /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ -+ return 0; -+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ - } - - #endif /* CONFIG_CRYPTO_MANAGER_DISABLE_TESTS */ ---- a/crypto/testmgr.h -+++ b/crypto/testmgr.h -@@ -20,6 +20,8 @@ - - #include - -+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS -+ - #define MAX_DIGEST_SIZE 64 - #define MAX_TAP 8 - -@@ -9608,4 +9610,6 @@ static struct hash_testvec crc32c_tv_tem - }, - }; - -+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ -+ - #endif /* _CRYPTO_TESTMGR_H */ diff --git a/target/linux/generic/patches-2.6.38/260-crypto_optional_tests.patch b/target/linux/generic/patches-2.6.38/260-crypto_optional_tests.patch deleted file mode 100644 index e1a1588fe..000000000 --- a/target/linux/generic/patches-2.6.38/260-crypto_optional_tests.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/crypto/Kconfig -+++ b/crypto/Kconfig -@@ -108,6 +108,10 @@ config CRYPTO_MANAGER_DISABLE_TESTS - Disable run-time self tests that normally take place at - algorithm registration. - -+config CRYPTO_MANAGER_NO_TESTS -+ bool "Disable internal testsuite to save space" -+ depends on CRYPTO_MANAGER -+ - config CRYPTO_GF128MUL - tristate "GF(2^128) multiplication functions (EXPERIMENTAL)" - help ---- a/crypto/testmgr.c -+++ b/crypto/testmgr.c -@@ -65,6 +65,8 @@ int alg_test(const char *driver, const c - #define ENCRYPT 1 - #define DECRYPT 0 - -+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS -+ - struct tcrypt_result { - struct completion completion; - int err; -@@ -2508,8 +2510,11 @@ static int alg_find_test(const char *alg - return -1; - } - -+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ -+ - int alg_test(const char *driver, const char *alg, u32 type, u32 mask) - { -+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS - int i; - int j; - int rc; -@@ -2564,6 +2569,9 @@ notest: - return 0; - non_fips_alg: - return -EINVAL; -+#else /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ -+ return 0; -+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ - } - - #endif /* CONFIG_CRYPTO_MANAGER_DISABLE_TESTS */ ---- a/crypto/testmgr.h -+++ b/crypto/testmgr.h -@@ -29,6 +29,8 @@ - - #include - -+#ifndef CONFIG_CRYPTO_MANAGER_NO_TESTS -+ - #define MAX_DIGEST_SIZE 64 - #define MAX_TAP 8 - -@@ -9969,4 +9971,6 @@ static struct hash_testvec crc32c_tv_tem - }, - }; - -+#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ -+ - #endif /* _CRYPTO_TESTMGR_H */