diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-01-27 14:32:10 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-02-04 20:28:14 +0100 |
| commit | f791fb4af45032a653ba7c850f4564923871cb16 (patch) | |
| tree | c1fc4e564c8e27faad582e5b55a9ce91816a241c /target/linux/generic/patches-4.9/260-crypto_test_dependencies.patch | |
| parent | 7d00cfe9bb693e376ac9d035e13f8ce8a5ff572c (diff) | |
| download | mtk-20170518-f791fb4af45032a653ba7c850f4564923871cb16.zip mtk-20170518-f791fb4af45032a653ba7c850f4564923871cb16.tar.gz mtk-20170518-f791fb4af45032a653ba7c850f4564923871cb16.tar.bz2 | |
kernel: add linux 4.9 support
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Tim Harvey <tharvey@gateworks.com> [fixes]
Diffstat (limited to 'target/linux/generic/patches-4.9/260-crypto_test_dependencies.patch')
| -rw-r--r-- | target/linux/generic/patches-4.9/260-crypto_test_dependencies.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.9/260-crypto_test_dependencies.patch b/target/linux/generic/patches-4.9/260-crypto_test_dependencies.patch new file mode 100644 index 0000000..948a5c5 --- /dev/null +++ b/target/linux/generic/patches-4.9/260-crypto_test_dependencies.patch @@ -0,0 +1,48 @@ +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -132,12 +132,12 @@ config CRYPTO_MANAGER + cbc(aes). + + config CRYPTO_MANAGER2 +- def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y) +- select CRYPTO_AEAD2 +- select CRYPTO_HASH2 +- select CRYPTO_BLKCIPHER2 +- select CRYPTO_AKCIPHER2 +- select CRYPTO_KPP2 ++ def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y && !CRYPTO_MANAGER_DISABLE_TESTS) ++ 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_AKCIPHER2 if !CRYPTO_MANAGER_DISABLE_TESTS ++ select CRYPTO_KPP2 if !CRYPTO_MANAGER_DISABLE_TESTS + + config CRYPTO_USER + tristate "Userspace cryptographic algorithm configuration" +@@ -150,7 +150,6 @@ config CRYPTO_USER + config CRYPTO_MANAGER_DISABLE_TESTS + bool "Disable run-time self tests" + default y +- depends on CRYPTO_MANAGER2 + help + Disable run-time self tests that normally take place at + algorithm registration. +--- 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; + |