Turn on CONFIG_CRYPTO_FIPS

Oraclebug: 12989580
CRYPTO_FIPS depends on CRYPTO_ANSI_CPRNG && !CRYPTO_MANAGER_DISABLE_TESTS.
Turn it on in kernel config.

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>

diff --git a/uek-rpm/ol5/config-generic b/uek-rpm/ol5/config-generic
index 6a7680adba93991ffb625dafca9b59353ad0d682..d1fc63a07d7bbb2fb13709c98dc533e75be941a6 100644 (file)
--- a/uek-rpm/ol5/config-generic
+++ b/uek-rpm/ol5/config-generic
@@ -4766,6 +4766,7 @@ CONFIG_CRYPTO=y
 #
 # Crypto core or helper
 #
+CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=m
@@ -4780,7 +4781,7 @@ CONFIG_CRYPTO_PCOMP=m
 CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
 # CONFIG_CRYPTO_PCRYPT is not set

diff --git a/uek-rpm/ol6/config-generic b/uek-rpm/ol6/config-generic
index 6a7680adba93991ffb625dafca9b59353ad0d682..d1fc63a07d7bbb2fb13709c98dc533e75be941a6 100644 (file)
--- a/uek-rpm/ol6/config-generic
+++ b/uek-rpm/ol6/config-generic
@@ -4766,6 +4766,7 @@ CONFIG_CRYPTO=y
 #
 # Crypto core or helper
 #
+CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=m
@@ -4780,7 +4781,7 @@ CONFIG_CRYPTO_PCOMP=m
 CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
 # CONFIG_CRYPTO_PCRYPT is not set