From: Alec Ari <alec@onelabs.com>
Date: Tue, 4 Oct 2016 22:34:30 +0000 (-0300)
Subject: crypto: api - Fix Kconfig dependencies for FIPS
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1f696097ad000b02e25a33442046eae339b8b3c3;p=linux-beck.git

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>
---

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