mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-17 20:54:10 +00:00
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "This fixes a Kconfig anomaly when lib/crypto is enabled without Crypto API" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: Kconfig - allow tests to be disabled when manager is disabled
This commit is contained in:
commit
64ae1342f8
1 changed files with 0 additions and 4 deletions
|
@ -136,8 +136,6 @@ config CRYPTO_USER
|
||||||
Userspace configuration for cryptographic instantiations such as
|
Userspace configuration for cryptographic instantiations such as
|
||||||
cbc(aes).
|
cbc(aes).
|
||||||
|
|
||||||
if CRYPTO_MANAGER2
|
|
||||||
|
|
||||||
config CRYPTO_MANAGER_DISABLE_TESTS
|
config CRYPTO_MANAGER_DISABLE_TESTS
|
||||||
bool "Disable run-time self tests"
|
bool "Disable run-time self tests"
|
||||||
default y
|
default y
|
||||||
|
@ -155,8 +153,6 @@ config CRYPTO_MANAGER_EXTRA_TESTS
|
||||||
This is intended for developer use only, as these tests take much
|
This is intended for developer use only, as these tests take much
|
||||||
longer to run than the normal self tests.
|
longer to run than the normal self tests.
|
||||||
|
|
||||||
endif # if CRYPTO_MANAGER2
|
|
||||||
|
|
||||||
config CRYPTO_GF128MUL
|
config CRYPTO_GF128MUL
|
||||||
tristate
|
tristate
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue