diff options
| author | Rich Felker <dalias@libc.org> | 2016-03-29 21:53:03 +0000 |
|---|---|---|
| committer | Rich Felker <dalias@libc.org> | 2016-03-29 21:53:03 +0000 |
| commit | ed8b19a674c67e1007990991d4e02c02da07c952 (patch) | |
| tree | 230d118992bfd9ac76f80822d34c2f4ea9819a44 /crypto/Kconfig | |
| parent | 5da64d0814134dc3542fb314a66dcdf74e8553bd (diff) | |
| parent | f349a25c7c6b753176540d10e6c243047faefa3a (diff) | |
| download | linux-crypto-ed8b19a674c67e1007990991d4e02c02da07c952.tar.gz linux-crypto-ed8b19a674c67e1007990991d4e02c02da07c952.zip | |
Merge tag 'v4.6-rc1'
Linux 4.6-rc1
Diffstat (limited to 'crypto/Kconfig')
| -rw-r--r-- | crypto/Kconfig | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 3be07ad1..93a1fdc1 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -84,15 +84,6 @@ config CRYPTO_RNG_DEFAULT tristate select CRYPTO_DRBG_MENU -config CRYPTO_PCOMP - tristate - select CRYPTO_PCOMP2 - select CRYPTO_ALGAPI - -config CRYPTO_PCOMP2 - tristate - select CRYPTO_ALGAPI2 - config CRYPTO_AKCIPHER2 tristate select CRYPTO_ALGAPI2 @@ -122,7 +113,6 @@ config CRYPTO_MANAGER2 select CRYPTO_AEAD2 select CRYPTO_HASH2 select CRYPTO_BLKCIPHER2 - select CRYPTO_PCOMP2 select CRYPTO_AKCIPHER2 config CRYPTO_USER @@ -227,6 +217,9 @@ config CRYPTO_GLUE_HELPER_X86 depends on X86 select CRYPTO_ALGAPI +config CRYPTO_ENGINE + tristate + comment "Authenticated Encryption with Associated Data" config CRYPTO_CCM @@ -1506,15 +1499,6 @@ config CRYPTO_DEFLATE You will most probably want this if using IPSec. -config CRYPTO_ZLIB - tristate "Zlib compression algorithm" - select CRYPTO_PCOMP - select ZLIB_INFLATE - select ZLIB_DEFLATE - select NLATTR - help - This is the zlib algorithm. - config CRYPTO_LZO tristate "LZO compression algorithm" select CRYPTO_ALGAPI @@ -1595,6 +1579,7 @@ endif # if CRYPTO_DRBG_MENU config CRYPTO_JITTERENTROPY tristate "Jitterentropy Non-Deterministic Random Number Generator" + select CRYPTO_RNG help The Jitterentropy RNG is a noise that is intended to provide seed to another RNG. The RNG does not |