diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 14:35:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 14:35:16 -0700 |
commit | 33963b38a729558a86237f0cb3dc1f3497582c77 (patch) | |
tree | 0460284ed98305c679aaf95ff8ef7c9b79fb27d6 /crypto/Kconfig | |
parent | 7f111f62221a8721d63a97476abd855464b61d4b (diff) | |
parent | ee2047159f936940e33ba7c3a81e95484b162c9a (diff) | |
download | linux-crypto-33963b38a729558a86237f0cb3dc1f3497582c77.tar.gz linux-crypto-33963b38a729558a86237f0cb3dc1f3497582c77.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
Revert "hwrng: n2-drv - remove casts from void*"
crypto: testmgr - Default to no tests
crypto: testmgr - Fix test disabling option
crypto: hash - Fix handling of small unaligned buffers
Diffstat (limited to 'crypto/Kconfig')
-rw-r--r-- | crypto/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 1cd497d7..e573077f 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -101,13 +101,13 @@ config CRYPTO_MANAGER2 select CRYPTO_BLKCIPHER2 select CRYPTO_PCOMP2 -config CRYPTO_MANAGER_TESTS - bool "Run algolithms' self-tests" +config CRYPTO_MANAGER_DISABLE_TESTS + bool "Disable run-time self tests" default y depends on CRYPTO_MANAGER2 help - Run cryptomanager's tests for the new crypto algorithms being - registered. + Disable run-time self tests that normally take place at + algorithm registration. config CRYPTO_GF128MUL tristate "GF(2^128) multiplication functions (EXPERIMENTAL)" |