diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2014-03-07 11:27:00 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2014-03-07 11:27:00 +0000 |
| commit | 2b43bb49dec4546cdca7e627b06e7682ae742591 (patch) | |
| tree | 0d58c3ccdefbe53983cda5399612b4727f0ee81d /target/linux/generic/patches-3.14/260-crypto_test_dependencies.patch | |
| parent | 3be7023c9be4e1381699ce393638ad63565c9ac5 (diff) | |
| download | master-187ad058-2b43bb49dec4546cdca7e627b06e7682ae742591.tar.gz master-187ad058-2b43bb49dec4546cdca7e627b06e7682ae742591.tar.bz2 master-187ad058-2b43bb49dec4546cdca7e627b06e7682ae742591.zip | |
add preliminary 3.14 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/260-crypto_test_dependencies.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/260-crypto_test_dependencies.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/260-crypto_test_dependencies.patch b/target/linux/generic/patches-3.14/260-crypto_test_dependencies.patch new file mode 100644 index 0000000000..a28f69308c --- /dev/null +++ b/target/linux/generic/patches-3.14/260-crypto_test_dependencies.patch @@ -0,0 +1,37 @@ +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -95,10 +95,10 @@ config CRYPTO_MANAGER + + config CRYPTO_MANAGER2 + def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y) +- select CRYPTO_AEAD2 +- select CRYPTO_HASH2 +- select CRYPTO_BLKCIPHER2 +- select CRYPTO_PCOMP2 ++ select CRYPTO_AEAD2 if !CRYPTO_MANAGER_DISABLE_TESTS ++ select CRYPTO_HASH2 if !CRYPTO_MANAGER_DISABLE_TESTS ++ select CRYPTO_BLKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS ++ select CRYPTO_PCOMP2 if !CRYPTO_MANAGER_DISABLE_TESTS + + config CRYPTO_USER + tristate "Userspace cryptographic algorithm configuration" +--- a/crypto/algboss.c ++++ b/crypto/algboss.c +@@ -248,6 +248,9 @@ static int cryptomgr_schedule_test(struc + type = alg->cra_flags; + + /* This piece of crap needs to disappear into per-type test hooks. */ ++#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS ++ type |= CRYPTO_ALG_TESTED; ++#else + if ((!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) & + CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) && + ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) == +@@ -256,6 +259,7 @@ static int cryptomgr_schedule_test(struc + (!((type ^ CRYPTO_ALG_TYPE_AEAD) & CRYPTO_ALG_TYPE_MASK) && + alg->cra_type == &crypto_nivaead_type && alg->cra_aead.ivsize)) + type |= CRYPTO_ALG_TESTED; ++#endif + + param->type = type; + |