diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-25 13:21:06 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-25 13:21:06 +0100 |
| commit | 81cf65ff6fa1af7199001a61ce126e57b64ce98a (patch) | |
| tree | 71cce1dd8b8fd1e68ff8786dafd58fd2bec0b804 /crypto/Kconfig | |
| parent | 02352a56e21d0f215000c4cbb474c2cac5309661 (diff) | |
| download | kernel_samsung_smdk4412-81cf65ff6fa1af7199001a61ce126e57b64ce98a.zip kernel_samsung_smdk4412-81cf65ff6fa1af7199001a61ce126e57b64ce98a.tar.gz kernel_samsung_smdk4412-81cf65ff6fa1af7199001a61ce126e57b64ce98a.tar.bz2 | |
crypto merged
Diffstat (limited to 'crypto/Kconfig')
| -rw-r--r-- | crypto/Kconfig | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 3a6933c..87b22ca 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -23,22 +23,12 @@ comment "Crypto core or helper" config CRYPTO_FIPS bool "FIPS 200 compliance" - depends on CRYPTO_ANSI_CPRNG + depends on CRYPTO_ANSI_CPRNG && !CRYPTO_MANAGER_DISABLE_TESTS 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. 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. + this is. config CRYPTO_ALGAPI tristate @@ -110,13 +100,13 @@ config CRYPTO_MANAGER2 select CRYPTO_BLKCIPHER2 select CRYPTO_PCOMP2 -config CRYPTO_MANAGER_TESTS - bool "Run algolithms' self-tests" +config CRYPTO_MANAGER_DISABLE_TESTS + bool "Disable run-time self tests" default y depends on CRYPTO_MANAGER2 help - Run cryptomanager's tests for the new crypto algorithms being - registered. + Disable run-time self tests that normally take place at + algorithm registration. config CRYPTO_GF128MUL tristate "GF(2^128) multiplication functions (EXPERIMENTAL)" @@ -171,6 +161,7 @@ config CRYPTO_AUTHENC config CRYPTO_TEST tristate "Testing module" + depends on m select CRYPTO_MANAGER help Quick & dirty crypto test module. |