diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-02-23 22:59:53 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-02-23 22:59:53 +0000 |
| commit | 1c063070cf6bc2b81674f60b6ad6ae0ee9b4152f (patch) | |
| tree | 0a83cfa5ea98e519ade4fa7f4e8a859e26bd737c /target/linux/generic/patches-4.0/260-crypto_test_dependencies.patch | |
| parent | ad077832bfb03106a02b7be02b560c13e77d0436 (diff) | |
| download | mtk-20170518-1c063070cf6bc2b81674f60b6ad6ae0ee9b4152f.zip mtk-20170518-1c063070cf6bc2b81674f60b6ad6ae0ee9b4152f.tar.gz mtk-20170518-1c063070cf6bc2b81674f60b6ad6ae0ee9b4152f.tar.bz2 | |
generic: early (incomplete!) 4.0 support
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 44511
Diffstat (limited to 'target/linux/generic/patches-4.0/260-crypto_test_dependencies.patch')
| -rw-r--r-- | target/linux/generic/patches-4.0/260-crypto_test_dependencies.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.0/260-crypto_test_dependencies.patch b/target/linux/generic/patches-4.0/260-crypto_test_dependencies.patch new file mode 100644 index 0000000..8a96fd9 --- /dev/null +++ b/target/linux/generic/patches-4.0/260-crypto_test_dependencies.patch @@ -0,0 +1,37 @@ +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -96,10 +96,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; + |