diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-08-22 17:09:18 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-08-22 17:09:18 +0000 |
| commit | 31ce3e2546b650528d797d146eac9fc21aa9b8d1 (patch) | |
| tree | 93c53366a17acf71a6df1f95f9c8216ade49e140 /target/linux/generic/patches-2.6.35/260-crypto_optional_tests.patch | |
| parent | 3515a89f708d53519beb5be4a78d61d44b5e315e (diff) | |
| download | upstream-31ce3e2546b650528d797d146eac9fc21aa9b8d1.tar.gz upstream-31ce3e2546b650528d797d146eac9fc21aa9b8d1.tar.bz2 upstream-31ce3e2546b650528d797d146eac9fc21aa9b8d1.zip | |
refresh 2.6.35 patches
SVN-Revision: 22772
Diffstat (limited to 'target/linux/generic/patches-2.6.35/260-crypto_optional_tests.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.35/260-crypto_optional_tests.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/target/linux/generic/patches-2.6.35/260-crypto_optional_tests.patch b/target/linux/generic/patches-2.6.35/260-crypto_optional_tests.patch index 1b1b89586a..9273a0f554 100644 --- a/target/linux/generic/patches-2.6.35/260-crypto_optional_tests.patch +++ b/target/linux/generic/patches-2.6.35/260-crypto_optional_tests.patch @@ -1,8 +1,8 @@ --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -96,6 +96,10 @@ config CRYPTO_MANAGER2 - select CRYPTO_BLKCIPHER2 - select CRYPTO_PCOMP +@@ -104,6 +104,10 @@ config CRYPTO_MANAGER_TESTS + Run cryptomanager's tests for the new crypto algorithms being + registered. +config CRYPTO_MANAGER_NO_TESTS + bool "Disable internal testsuite to save space" @@ -13,7 +13,7 @@ depends on EXPERIMENTAL --- a/crypto/testmgr.c +++ b/crypto/testmgr.c -@@ -47,6 +47,8 @@ +@@ -58,6 +58,8 @@ int alg_test(const char *driver, const c #define ENCRYPT 1 #define DECRYPT 0 @@ -22,7 +22,7 @@ struct tcrypt_result { struct completion completion; int err; -@@ -2473,8 +2475,11 @@ static int alg_find_test(const char *alg +@@ -2484,8 +2486,11 @@ static int alg_find_test(const char *alg return -1; } @@ -34,7 +34,7 @@ int i; int j; int rc; -@@ -2529,5 +2534,8 @@ notest: +@@ -2540,6 +2545,9 @@ notest: return 0; non_fips_alg: return -EINVAL; @@ -42,7 +42,8 @@ + return 0; +#endif /* CONFIG_CRYPTO_MANAGER_NO_TESTS */ } - EXPORT_SYMBOL_GPL(alg_test); + + #endif /* CONFIG_CRYPTO_MANAGER_TESTS */ --- a/crypto/testmgr.h +++ b/crypto/testmgr.h @@ -20,6 +20,8 @@ |