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 | 61f953cbaae26f930b8d937366270547e08c1290 (patch) | |
| tree | 44cefef0fdd172ce4fe2083ed7695d86b76ed257 /crypto/Kconfig | |
| parent | a44a553f827f28d46130c9818dbcb95f4262b96c (diff) | |
| parent | 50b6e71ae83714be509b80727dbf90fa8b1c0717 (diff) | |
| download | op-kernel-dev-61f953cbaae26f930b8d937366270547e08c1290.zip op-kernel-dev-61f953cbaae26f930b8d937366270547e08c1290.tar.gz | |
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 1cd497d..e573077 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)" |
