generic: mtd: backport SPI_NOR_HAS_LOCK

[openwrt/openwrt.git] / target / linux / generic / patches-4.4 / 260-crypto_test_dependencies.patch

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
index c5606a0085f9da525a841af7591b1e7c4bdd5ff2..54b8730a93f5705466fda39a73714aba66367b67 100644 (file)
--- a/target/linux/generic/patches-4.4/260-crypto_test_dependencies.patch
+++ b/target/linux/generic/patches-4.4/260-crypto_test_dependencies.patch
@@ -1,14 +1,16 @@
 --- a/crypto/Kconfig
 +++ b/crypto/Kconfig
-@@ -119,11 +119,11 @@ config CRYPTO_MANAGER
+@@ -118,12 +118,12 @@ config CRYPTO_MANAGER
+         cbc(aes).
  
  config CRYPTO_MANAGER2
-       def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
+-      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
++      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
@@ -17,6 +19,14 @@
  
  config CRYPTO_USER
        tristate "Userspace cryptographic algorithm configuration"
+@@ -136,7 +136,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