summaryrefslogtreecommitdiff
path: root/crypto/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 18:57:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 18:57:38 -0700
commit1f6aed0491f135be944e25b88f11e0ce6e777899 (patch)
tree6eea7717a9f6a392f1b1066604618446187dc9f4 /crypto/Kconfig
parenta1b1d30209fc27a8cfa2264804298779e5919219 (diff)
parent0f4918a48efbb743bb3b6dd3dacd7609fdd43327 (diff)
downloadlinux-crypto-1f6aed0491f135be944e25b88f11e0ce6e777899.tar.gz
linux-crypto-1f6aed0491f135be944e25b88f11e0ce6e777899.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 crypto: prng - Deterministic CPRNG
Diffstat (limited to 'crypto/Kconfig')
-rw-r--r--crypto/Kconfig9
1 files changed, 0 insertions, 9 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index ea503572..d8318591 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -666,15 +666,6 @@ config CRYPTO_LZO
help
This is the LZO algorithm.
-comment "Random Number Generation"
-
-config CRYPTO_PRNG
- tristate "Pseudo Random Number Generation for Cryptographic modules"
- help
- This option enables the generic pseudo random number generator
- for cryptographic modules. Uses the Algorithm specified in
- ANSI X9.31 A.2.4
-
source "drivers/crypto/Kconfig"
endif # if CRYPTO