| Message ID | 20201102134815.512866-1-Jason@zx2c4.com |
|---|---|
| State | New |
| Headers | show |
| Series | [crypto] crypto: Kconfig - CRYPTO_MANAGER_EXTRA_TESTS requires the manager | expand |
On Mon, Nov 02, 2020 at 02:48:15PM +0100, Jason A. Donenfeld wrote: > The extra tests in the manager actually require the manager to be > selected too. Otherwise the linker gives errors like: > > ld: arch/x86/crypto/chacha_glue.o: in function `chacha_simd_stream_xor': > chacha_glue.c:(.text+0x422): undefined reference to `crypto_simd_disabled_for_test' > > Fixes: 2343d1529aff ("crypto: Kconfig - allow tests to be disabled when manager is disabled") > Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> > --- > crypto/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Patch applied. Thanks. -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Thanks. FYI, I intended this for crypto-2.6.git rather than cryptodev-2.6.git, since it fixes a build failure and is a trivial fix.
On Fri, Nov 13, 2020 at 03:34:36PM +0100, Jason A. Donenfeld wrote: > Thanks. FYI, I intended this for crypto-2.6.git rather than > cryptodev-2.6.git, since it fixes a build failure and is a trivial > fix. Well this has been broken since January so I don't see the urgency in it going in right away. It'll be backported eventually. Cheers, -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
On Fri, Nov 13, 2020 at 8:58 PM Herbert Xu <herbert@gondor.apana.org.au> wrote: > > On Fri, Nov 13, 2020 at 03:34:36PM +0100, Jason A. Donenfeld wrote: > > Thanks. FYI, I intended this for crypto-2.6.git rather than > > cryptodev-2.6.git, since it fixes a build failure and is a trivial > > fix. > > Well this has been broken since January so I don't see the urgency > in it going in right away. It'll be backported eventually. Okay, no problem.
diff --git a/crypto/Kconfig b/crypto/Kconfig index 094ef56ab7b4..37de7d006858 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -145,7 +145,7 @@ config CRYPTO_MANAGER_DISABLE_TESTS config CRYPTO_MANAGER_EXTRA_TESTS bool "Enable extra run-time crypto self tests" - depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS + depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS && CRYPTO_MANAGER help Enable extra run-time self tests of registered crypto algorithms, including randomized fuzz tests.
The extra tests in the manager actually require the manager to be selected too. Otherwise the linker gives errors like: ld: arch/x86/crypto/chacha_glue.o: in function `chacha_simd_stream_xor': chacha_glue.c:(.text+0x422): undefined reference to `crypto_simd_disabled_for_test' Fixes: 2343d1529aff ("crypto: Kconfig - allow tests to be disabled when manager is disabled") Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> --- crypto/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)