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

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
   3 Date: Mon, 2 Nov 2020 14:48:15 +0100
   4 Subject: [PATCH] crypto: Kconfig - CRYPTO_MANAGER_EXTRA_TESTS requires the
   5  manager
   6
   7 commit 6569e3097f1c4a490bdf2b23d326855e04942dfd upstream.
   8
   9 The extra tests in the manager actually require the manager to be
  10 selected too. Otherwise the linker gives errors like:
  11
  12 ld: arch/x86/crypto/chacha_glue.o: in function `chacha_simd_stream_xor':
  13 chacha_glue.c:(.text+0x422): undefined reference to `crypto_simd_disabled_for_test'
  14
  15 Fixes: 2343d1529aff ("crypto: Kconfig - allow tests to be disabled when manager is disabled")
  16 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  17 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  18 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  19 ---
  20  crypto/Kconfig | 2 +-
  21  1 file changed, 1 insertion(+), 1 deletion(-)
  22
  23 --- a/crypto/Kconfig
  24 +++ b/crypto/Kconfig
  25 @@ -145,7 +145,7 @@ config CRYPTO_MANAGER_DISABLE_TESTS
  26
  27  config CRYPTO_MANAGER_EXTRA_TESTS
  28         bool "Enable extra run-time crypto self tests"
  29 -       depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS
  30 +       depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS && CRYPTO_MANAGER
  31         help
  32           Enable extra run-time self tests of registered crypto algorithms,
  33           including randomized fuzz tests.