diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-12-02 22:23:22 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-12-02 22:23:22 +0000 |
commit | 9da189b6160422c8fe396181ff2d496fa68408b2 (patch) | |
tree | 4d911e6fe2fe7e304d340276c06729b33099013c /target/linux/generic/patches-4.4/260-crypto_test_dependencies.patch | |
parent | 51a736c6287eb29cc5150f06ce8fdf10b7441a1b (diff) | |
download | master-187ad058-9da189b6160422c8fe396181ff2d496fa68408b2.tar.gz master-187ad058-9da189b6160422c8fe396181ff2d496fa68408b2.tar.bz2 master-187ad058-9da189b6160422c8fe396181ff2d496fa68408b2.zip |
kernel: add linux 4.4 support
Based on 4.4-rc3. Runtime tested on MIPS.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47701 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.4/260-crypto_test_dependencies.patch')
-rw-r--r-- | target/linux/generic/patches-4.4/260-crypto_test_dependencies.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.4/260-crypto_test_dependencies.patch b/target/linux/generic/patches-4.4/260-crypto_test_dependencies.patch new file mode 100644 index 0000000000..c5606a0085 --- /dev/null +++ b/target/linux/generic/patches-4.4/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; + |