aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/Kconfig')
-rw-r--r--crypto/Kconfig23
1 files changed, 16 insertions, 7 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 87b22ca..3a6933c 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -23,12 +23,22 @@ comment "Crypto core or helper"
config CRYPTO_FIPS
bool "FIPS 200 compliance"
- depends on CRYPTO_ANSI_CPRNG && !CRYPTO_MANAGER_DISABLE_TESTS
+ depends on CRYPTO_ANSI_CPRNG
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.
+ this is. Note that CRYPTO_ANSI_CPRNG is required if this
+ option is selected
+
+config CRYPTO_FIPS_INTEG_OFFSET
+ hex "FIPS integrity check zImage offset"
+ default 0x20000000
+ help
+ This options sets the offset from stext address where
+ zImage will be copied for integrity check if you want
+ to system to operate in FIPS mode, which enables
+ kernel crypto module.
config CRYPTO_ALGAPI
tristate
@@ -100,13 +110,13 @@ config CRYPTO_MANAGER2
select CRYPTO_BLKCIPHER2
select CRYPTO_PCOMP2
-config CRYPTO_MANAGER_DISABLE_TESTS
- bool "Disable run-time self tests"
+config CRYPTO_MANAGER_TESTS
+ bool "Run algolithms' self-tests"
default y
depends on CRYPTO_MANAGER2
help
- Disable run-time self tests that normally take place at
- algorithm registration.
+ Run cryptomanager's tests for the new crypto algorithms being
+ registered.
config CRYPTO_GF128MUL
tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
@@ -161,7 +171,6 @@ config CRYPTO_AUTHENC
config CRYPTO_TEST
tristate "Testing module"
- depends on m
select CRYPTO_MANAGER
help
Quick & dirty crypto test module.