summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorAlec Ari <alec@onelabs.com>2016-10-04 19:34:30 -0300
committerHerbert Xu <herbert@gondor.apana.org.au>2016-10-21 11:03:40 +0800
commit1f696097ad000b02e25a33442046eae339b8b3c3 (patch)
tree9f9248d16577a1bfadb539d59188bfa8575d872b /crypto
parentd52db5188a87dcdf8e5bf024f45543b362a1a85f (diff)
downloadlinux-1f696097ad000b02e25a33442046eae339b8b3c3.tar.gz
linux-1f696097ad000b02e25a33442046eae339b8b3c3.tar.bz2
linux-1f696097ad000b02e25a33442046eae339b8b3c3.zip
crypto: api - Fix Kconfig dependencies for FIPS
Currently FIPS depends on MODULE_SIG, even if MODULES is disabled. This change allows the enabling of FIPS without support for modules. If module loading support is enabled, only then does FIPS require MODULE_SIG. Signed-off-by: Alec Ari <neotheuser@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 84d71482bf08..fd288053b1c5 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -24,7 +24,7 @@ comment "Crypto core or helper"
config CRYPTO_FIPS
bool "FIPS 200 compliance"
depends on (CRYPTO_ANSI_CPRNG || CRYPTO_DRBG) && !CRYPTO_MANAGER_DISABLE_TESTS
- depends on MODULE_SIG
+ depends on (MODULE_SIG || !MODULES)
help
This options enables the fips boot option which is
required if you want to system to operate in a FIPS 200