Commit 401e4238 authored by Herbert Xu's avatar Herbert Xu

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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 3491244c
...@@ -78,6 +78,10 @@ config CRYPTO_RNG2 ...@@ -78,6 +78,10 @@ config CRYPTO_RNG2
tristate tristate
select CRYPTO_ALGAPI2 select CRYPTO_ALGAPI2
config CRYPTO_RNG_DEFAULT
tristate
select CRYPTO_DRBG_MENU
config CRYPTO_PCOMP config CRYPTO_PCOMP
tristate tristate
select CRYPTO_PCOMP2 select CRYPTO_PCOMP2
...@@ -234,7 +238,7 @@ config CRYPTO_SEQIV ...@@ -234,7 +238,7 @@ config CRYPTO_SEQIV
select CRYPTO_AEAD select CRYPTO_AEAD
select CRYPTO_BLKCIPHER select CRYPTO_BLKCIPHER
select CRYPTO_NULL select CRYPTO_NULL
select CRYPTO_RNG select CRYPTO_RNG_DEFAULT
help help
This IV generator generates an IV based on a sequence number by This IV generator generates an IV based on a sequence number by
xoring it with a salt. This algorithm is mainly useful for CTR xoring it with a salt. This algorithm is mainly useful for CTR
...@@ -243,7 +247,7 @@ config CRYPTO_ECHAINIV ...@@ -243,7 +247,7 @@ config CRYPTO_ECHAINIV
tristate "Encrypted Chain IV Generator" tristate "Encrypted Chain IV Generator"
select CRYPTO_AEAD select CRYPTO_AEAD
select CRYPTO_NULL select CRYPTO_NULL
select CRYPTO_RNG select CRYPTO_RNG_DEFAULT
default m default m
help help
This IV generator generates an IV based on the encryption of This IV generator generates an IV based on the encryption of
...@@ -1484,7 +1488,6 @@ comment "Random Number Generation" ...@@ -1484,7 +1488,6 @@ comment "Random Number Generation"
config CRYPTO_ANSI_CPRNG config CRYPTO_ANSI_CPRNG
tristate "Pseudo Random Number Generation for Cryptographic modules" tristate "Pseudo Random Number Generation for Cryptographic modules"
default m
select CRYPTO_AES select CRYPTO_AES
select CRYPTO_RNG select CRYPTO_RNG
help help
...@@ -1502,11 +1505,9 @@ menuconfig CRYPTO_DRBG_MENU ...@@ -1502,11 +1505,9 @@ menuconfig CRYPTO_DRBG_MENU
if CRYPTO_DRBG_MENU if CRYPTO_DRBG_MENU
config CRYPTO_DRBG_HMAC config CRYPTO_DRBG_HMAC
bool "Enable HMAC DRBG" bool
default y default y
select CRYPTO_HMAC select CRYPTO_HMAC
help
Enable the HMAC DRBG variant as defined in NIST SP800-90A.
config CRYPTO_DRBG_HASH config CRYPTO_DRBG_HASH
bool "Enable Hash DRBG" bool "Enable Hash DRBG"
...@@ -1522,7 +1523,7 @@ config CRYPTO_DRBG_CTR ...@@ -1522,7 +1523,7 @@ config CRYPTO_DRBG_CTR
config CRYPTO_DRBG config CRYPTO_DRBG
tristate tristate
default CRYPTO_DRBG_MENU if (CRYPTO_DRBG_HMAC || CRYPTO_DRBG_HASH || CRYPTO_DRBG_CTR) default CRYPTO_DRBG_MENU
select CRYPTO_RNG select CRYPTO_RNG
select CRYPTO_JITTERENTROPY select CRYPTO_JITTERENTROPY
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment