summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2015-06-03 08:49:31 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2015-06-04 09:05:02 +0200
commit401e4238f35c7a21d32bc27370d4d045f7019c20 (patch)
tree6d39a2c949f97ffad6d35b06b7b4534328557a20 /crypto
parentcrypto: echainiv - Set Kconfig default to m (diff)
downloadlinux-401e4238f35c7a21d32bc27370d4d045f7019c20.tar.xz
linux-401e4238f35c7a21d32bc27370d4d045f7019c20.zip
crypto: rng - Make DRBG the default RNG
This patch creates a new invisible Kconfig option CRYPTO_RNG_DEFAULT that simply selects the DRBG. This new option is then selected by the IV generators. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/Kconfig15
1 files changed, 8 insertions, 7 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 91018d9ec56e..cb7806f31c37 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -78,6 +78,10 @@ config CRYPTO_RNG2
tristate
select CRYPTO_ALGAPI2
+config CRYPTO_RNG_DEFAULT
+ tristate
+ select CRYPTO_DRBG_MENU
+
config CRYPTO_PCOMP
tristate
select CRYPTO_PCOMP2
@@ -234,7 +238,7 @@ config CRYPTO_SEQIV
select CRYPTO_AEAD
select CRYPTO_BLKCIPHER
select CRYPTO_NULL
- select CRYPTO_RNG
+ select CRYPTO_RNG_DEFAULT
help
This IV generator generates an IV based on a sequence number by
xoring it with a salt. This algorithm is mainly useful for CTR
@@ -243,7 +247,7 @@ config CRYPTO_ECHAINIV
tristate "Encrypted Chain IV Generator"
select CRYPTO_AEAD
select CRYPTO_NULL
- select CRYPTO_RNG
+ select CRYPTO_RNG_DEFAULT
default m
help
This IV generator generates an IV based on the encryption of
@@ -1484,7 +1488,6 @@ comment "Random Number Generation"
config CRYPTO_ANSI_CPRNG
tristate "Pseudo Random Number Generation for Cryptographic modules"
- default m
select CRYPTO_AES
select CRYPTO_RNG
help
@@ -1502,11 +1505,9 @@ menuconfig CRYPTO_DRBG_MENU
if CRYPTO_DRBG_MENU
config CRYPTO_DRBG_HMAC
- bool "Enable HMAC DRBG"
+ bool
default y
select CRYPTO_HMAC
- help
- Enable the HMAC DRBG variant as defined in NIST SP800-90A.
config CRYPTO_DRBG_HASH
bool "Enable Hash DRBG"
@@ -1522,7 +1523,7 @@ config CRYPTO_DRBG_CTR
config CRYPTO_DRBG
tristate
- default CRYPTO_DRBG_MENU if (CRYPTO_DRBG_HMAC || CRYPTO_DRBG_HASH || CRYPTO_DRBG_CTR)
+ default CRYPTO_DRBG_MENU
select CRYPTO_RNG
select CRYPTO_JITTERENTROPY