From 32a11397f881b5aad5db1e62ee5a8bdf07164dda Mon Sep 17 00:00:00 2001 From: Chuck Ebbert Date: Fri, 3 Sep 2010 19:17:49 +0800 Subject: [PATCH] --- yaml --- r: 215533 b: refs/heads/master c: e84c5480b782c4009ef65b0248be7f0864573d7e h: refs/heads/master i: 215531: f47dfd20ccb2df256b230b3322d0da2bcdac5c76 v: v3 --- [refs] | 2 +- trunk/crypto/Kconfig | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c41ce6fd64e7..559d5e085c62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 537559a5b3ef854772bd89fbb43aa77d0bbfb721 +refs/heads/master: e84c5480b782c4009ef65b0248be7f0864573d7e diff --git a/trunk/crypto/Kconfig b/trunk/crypto/Kconfig index e573077f1672..866a1d751aa4 100644 --- a/trunk/crypto/Kconfig +++ b/trunk/crypto/Kconfig @@ -23,13 +23,12 @@ comment "Crypto core or helper" config CRYPTO_FIPS bool "FIPS 200 compliance" - depends on CRYPTO_ANSI_CPRNG + depends on CRYPTO_ANSI_CPRNG && !CRYPTO_MANAGER_DISABLE_TESTS help This options enables the fips boot option which is required if you want to system to operate in a FIPS 200 certification. You should say no unless you know what - this is. Note that CRYPTO_ANSI_CPRNG is required if this - option is selected + this is. config CRYPTO_ALGAPI tristate