From: Maxim Uvarov Date: Fri, 16 Sep 2011 17:37:21 +0000 (-0700) Subject: Turn on CONFIG_CRYPTO_FIPS X-Git-Tag: v2.6.39-400.9.0~903 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=75f0284be9d85f211364f029b7ffd0cea3930ad1;p=users%2Fjedix%2Flinux-maple.git 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 --- diff --git a/uek-rpm/ol5/config-generic b/uek-rpm/ol5/config-generic index 6a7680adba939..d1fc63a07d7bb 100644 --- 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 6a7680adba939..d1fc63a07d7bb 100644 --- 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