Skip to contentSkip to conversation

crypto: Kconfig - CRYPTO_MANAGER_EXTRA_TESTS requires the manager

PATCH In review Jason A. Donenfeld 2 participants 5 messages Nov 2, 2020 – Nov 13, 2020 Crypto API

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 crypto: Kconfig - CRYPTO_MANAGER_EXTRA_TESTS requires the manager

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")
---
 crypto/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/Kconfig +1 -1
index 094ef56ab7b4..37de7d006858 100644
@@ -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.
Signature · 1 line
2.29.1
maintainer
#1 lore raw
Quoted 11 lines · Jason A. Donenfeld

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")
---
 crypto/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
#2 lore raw

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.

maintainer
#3 lore raw
Quoted 3 lines · Jason A. Donenfeld

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,

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
#4 lore raw
Quoted 8 lines · Herbert Xu
Quoted 3 lines · Jason A. Donenfeld

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.