From 716ca530e1c4515d8683c9d5be3d56b301758b66 Mon Sep 17 00:00:00 2001
From: James <>
Date: Wed, 4 Nov 2015 11:49:21 +0000
Subject: trunk-47381

---
 .../patches-4.3/260-crypto_test_dependencies.patch | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 target/linux/generic/patches-4.3/260-crypto_test_dependencies.patch

(limited to 'target/linux/generic/patches-4.3/260-crypto_test_dependencies.patch')

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 0000000..c5606a0
--- /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;
+ 
-- 
cgit v1.2.3