git.openwrt.org Git - openwrt/staging/pepe2k.git/blob

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
   3 Date: Fri, 17 Jan 2020 12:01:36 +0100
   4 Subject: [PATCH] crypto: Kconfig - allow tests to be disabled when manager is
   5  disabled
   6
   7 commit 2343d1529aff8b552589f622c23932035ed7a05d upstream.
   8
   9 The library code uses CRYPTO_MANAGER_DISABLE_TESTS to conditionalize its
  10 tests, but the library code can also exist without CRYPTO_MANAGER. That
  11 means on minimal configs, the test code winds up being built with no way
  12 to disable it.
  13
  14 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  15 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  16 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  17 ---
  18  crypto/Kconfig | 4 ----
  19  1 file changed, 4 deletions(-)
  20
  21 --- a/crypto/Kconfig
  22 +++ b/crypto/Kconfig
  23 @@ -136,8 +136,6 @@ config CRYPTO_USER
  24           Userspace configuration for cryptographic instantiations such as
  25           cbc(aes).
  26
  27 -if CRYPTO_MANAGER2
  28 -
  29  config CRYPTO_MANAGER_DISABLE_TESTS
  30         bool "Disable run-time self tests"
  31         default y
  32 @@ -155,8 +153,6 @@ config CRYPTO_MANAGER_EXTRA_TESTS
  33           This is intended for developer use only, as these tests take much
  34           longer to run than the normal self tests.
  35
  36 -endif  # if CRYPTO_MANAGER2
  37 -
  38  config CRYPTO_GF128MUL
  39         tristate
  40