diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-11 19:08:08 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-11 19:08:08 +0000 |
| commit | b5842aed82e0c9101e99ec4bcf5959b931e98989 (patch) | |
| tree | f9749eb8ce7d61f284cc4d91bac5aafd07de8344 /target/linux/generic/patches-4.3/260-crypto_test_dependencies.patch | |
| parent | 3d1a65adb41db2758827fe81f36d92ab61618ea3 (diff) | |
| download | master-31e0f0ae-b5842aed82e0c9101e99ec4bcf5959b931e98989.tar.gz master-31e0f0ae-b5842aed82e0c9101e99ec4bcf5959b931e98989.tar.bz2 master-31e0f0ae-b5842aed82e0c9101e99ec4bcf5959b931e98989.zip | |
kernel: generic: add kernel 4.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47182
Diffstat (limited to 'target/linux/generic/patches-4.3/260-crypto_test_dependencies.patch')
| -rw-r--r-- | target/linux/generic/patches-4.3/260-crypto_test_dependencies.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.3/260-crypto_test_dependencies.patch b/target/linux/generic/patches-4.3/260-crypto_test_dependencies.patch new file mode 100644 index 0000000000..c5606a0085 --- /dev/null +++ b/target/linux/generic/patches-4.3/260-crypto_test_dependencies.patch @@ -0,0 +1,38 @@ +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -119,11 +119,11 @@ 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_AKCIPHER2 ++ 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 ++ select CRYPTO_AKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS + + config CRYPTO_USER + tristate "Userspace cryptographic algorithm configuration" +--- a/crypto/algboss.c ++++ b/crypto/algboss.c +@@ -248,12 +248,16 @@ 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) == + CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize : + alg->cra_ablkcipher.ivsize)) + type |= CRYPTO_ALG_TESTED; ++#endif + + param->type = type; + |