tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

crypto: cryptomgr - Select algorithm types only when CRYPTO_SELFTESTS

Enabling any template selects CRYPTO_MANAGER, which causes
CRYPTO_MANAGER2 to enable itself, which selects every algorithm type
option. However, pulling in all algorithm types is needed only when the
self-tests are enabled. So condition the selections accordingly.

To make this possible, also add the missing selections to various
symbols that were relying on transitive selections via CRYPTO_MANAGER.

Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Eric Biggers and committed by
Herbert Xu cdadc143 51d0f502

+23 -8
+19 -8
crypto/Kconfig
··· 153 153 154 154 config CRYPTO_MANAGER2 155 155 def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y) 156 - select CRYPTO_ACOMP2 157 - select CRYPTO_AEAD2 158 - select CRYPTO_AKCIPHER2 159 - select CRYPTO_SIG2 160 - select CRYPTO_HASH2 161 - select CRYPTO_KPP2 162 - select CRYPTO_RNG2 163 - select CRYPTO_SKCIPHER2 156 + select CRYPTO_ACOMP2 if CRYPTO_SELFTESTS 157 + select CRYPTO_AEAD2 if CRYPTO_SELFTESTS 158 + select CRYPTO_AKCIPHER2 if CRYPTO_SELFTESTS 159 + select CRYPTO_SIG2 if CRYPTO_SELFTESTS 160 + select CRYPTO_HASH2 if CRYPTO_SELFTESTS 161 + select CRYPTO_KPP2 if CRYPTO_SELFTESTS 162 + select CRYPTO_RNG2 if CRYPTO_SELFTESTS 163 + select CRYPTO_SKCIPHER2 if CRYPTO_SELFTESTS 164 164 165 165 config CRYPTO_USER 166 166 tristate "Userspace cryptographic algorithm configuration" 167 167 depends on NET 168 168 select CRYPTO_MANAGER 169 + select CRYPTO_RNG 169 170 help 170 171 Userspace configuration for cryptographic instantiations such as 171 172 cbc(aes). ··· 221 220 222 221 config CRYPTO_CRYPTD 223 222 tristate "Software async crypto daemon" 223 + select CRYPTO_AEAD 224 224 select CRYPTO_SKCIPHER 225 225 select CRYPTO_HASH 226 226 select CRYPTO_MANAGER ··· 255 253 config CRYPTO_BENCHMARK 256 254 tristate "Crypto benchmarking module" 257 255 depends on m || EXPERT 256 + select CRYPTO_AEAD 257 + select CRYPTO_HASH 258 258 select CRYPTO_MANAGER 259 + select CRYPTO_SKCIPHER 259 260 help 260 261 Quick & dirty crypto benchmarking module. 261 262 ··· 268 263 269 264 config CRYPTO_SIMD 270 265 tristate 266 + select CRYPTO_AEAD 271 267 select CRYPTO_CRYPTD 272 268 273 269 config CRYPTO_ENGINE 274 270 tristate 271 + select CRYPTO_AEAD 272 + select CRYPTO_AKCIPHER 273 + select CRYPTO_HASH 274 + select CRYPTO_KPP 275 + select CRYPTO_SKCIPHER 275 276 276 277 endmenu 277 278
+1
drivers/crypto/Kconfig
··· 301 301 select CRYPTO_CCM 302 302 select CRYPTO_CTR 303 303 select CRYPTO_GCM 304 + select CRYPTO_RNG 304 305 select CRYPTO_SKCIPHER 305 306 help 306 307 This option allows you to have support for AMCC crypto acceleration.
+2
drivers/crypto/allwinner/Kconfig
··· 14 14 select CRYPTO_SHA1 15 15 select CRYPTO_AES 16 16 select CRYPTO_LIB_DES 17 + select CRYPTO_RNG 17 18 select CRYPTO_SKCIPHER 18 19 help 19 20 Some Allwinner SoC have a crypto accelerator named ··· 50 49 select CRYPTO_CBC 51 50 select CRYPTO_AES 52 51 select CRYPTO_DES 52 + select CRYPTO_RNG 53 53 depends on CRYPTO_DEV_ALLWINNER 54 54 depends on PM 55 55 help
+1
drivers/crypto/intel/qat/Kconfig
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 2 config CRYPTO_DEV_QAT 3 3 tristate 4 + select CRYPTO_ACOMP 4 5 select CRYPTO_AEAD 5 6 select CRYPTO_AUTHENC 6 7 select CRYPTO_SKCIPHER