| Message ID | 1453740644-1980309-1-git-send-email-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] crypto: jitterentropy - always select CRYPTO_RNG | expand |
On Tuesday 26 January 2016 18:30:18 Herbert Xu wrote: > On Mon, Jan 25, 2016 at 05:50:34PM +0100, Arnd Bergmann wrote: > > When building the jitterentropy driver by itself, we get a link error > > when CRYPTO_RNG is not enabled as well: > > > > crypto/built-in.o: In function `jent_mod_init': > > jitterentropy-kcapi.c:(.init.text+0x98): undefined reference to `crypto_register_rng' > > crypto/built-in.o: In function `jent_mod_exit': > > jitterentropy-kcapi.c:(.exit.text+0x60): undefined reference to `crypto_unregister_rng' > > > > This moves the 'select CRYPTO_RNG' from CRYPTO_DRBG to CRYPTO_JITTERENTROPY > > to ensure the API is always there when it's used, not just when DRBG is > > also enabled. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > crypto/Kconfig | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/crypto/Kconfig b/crypto/Kconfig > > index 7240821137fd..99109b93604a 100644 > > --- a/crypto/Kconfig > > +++ b/crypto/Kconfig > > @@ -1586,13 +1586,13 @@ config CRYPTO_DRBG_CTR > > config CRYPTO_DRBG > > tristate > > default CRYPTO_DRBG_MENU > > - select CRYPTO_RNG > > I think we should leave this there as DRBG itself is an RNG and > it just uses JITTERENTROPY which happens to be an RNG. Good idea. Should I resend a modified version or do you want to just adapt it yourself? Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/crypto/Kconfig b/crypto/Kconfig index 7240821137fd..99109b93604a 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -1586,13 +1586,13 @@ config CRYPTO_DRBG_CTR config CRYPTO_DRBG tristate default CRYPTO_DRBG_MENU - select CRYPTO_RNG select CRYPTO_JITTERENTROPY endif # if CRYPTO_DRBG_MENU config CRYPTO_JITTERENTROPY tristate "Jitterentropy Non-Deterministic Random Number Generator" + select CRYPTO_RNG help The Jitterentropy RNG is a noise that is intended to provide seed to another RNG. The RNG does not
When building the jitterentropy driver by itself, we get a link error when CRYPTO_RNG is not enabled as well: crypto/built-in.o: In function `jent_mod_init': jitterentropy-kcapi.c:(.init.text+0x98): undefined reference to `crypto_register_rng' crypto/built-in.o: In function `jent_mod_exit': jitterentropy-kcapi.c:(.exit.text+0x60): undefined reference to `crypto_unregister_rng' This moves the 'select CRYPTO_RNG' from CRYPTO_DRBG to CRYPTO_JITTERENTROPY to ensure the API is always there when it's used, not just when DRBG is also enabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- crypto/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.0 -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html