diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-03-07 13:57:24 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-03-07 13:57:24 +0100 |
| commit | 249b6bae56fc18f4512fe5bc085f71cc235c0735 (patch) | |
| tree | 89cf28b0e13c85f0a04d216121cbdafdf9668ba0 /crypto/Kconfig | |
| parent | 59d9ddb192bc424cc53e52180478001af4fb99a4 (diff) | |
| parent | c7ee969dff58a7f5e447e27fe064e2d1ce81d574 (diff) | |
| download | linux-crypto-249b6bae56fc18f4512fe5bc085f71cc235c0735.tar.gz linux-crypto-249b6bae56fc18f4512fe5bc085f71cc235c0735.zip | |
Merge tag 'v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 4.16-rc4
Diffstat (limited to 'crypto/Kconfig')
| -rw-r--r-- | crypto/Kconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index f7911963..b75264b0 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -106,6 +106,7 @@ config CRYPTO_KPP config CRYPTO_ACOMP2 tristate select CRYPTO_ALGAPI2 + select SGL_ALLOC config CRYPTO_ACOMP tristate @@ -130,7 +131,7 @@ config CRYPTO_DH config CRYPTO_ECDH tristate "ECDH algorithm" - select CRYTPO_KPP + select CRYPTO_KPP select CRYPTO_RNG_DEFAULT help Generic implementation of the ECDH algorithm @@ -1339,6 +1340,7 @@ config CRYPTO_SALSA20_586 tristate "Salsa20 stream cipher algorithm (i586)" depends on (X86 || UML_X86) && !64BIT select CRYPTO_BLKCIPHER + select CRYPTO_SALSA20 help Salsa20 stream cipher algorithm. @@ -1352,6 +1354,7 @@ config CRYPTO_SALSA20_X86_64 tristate "Salsa20 stream cipher algorithm (x86_64)" depends on (X86 || UML_X86) && 64BIT select CRYPTO_BLKCIPHER + select CRYPTO_SALSA20 help Salsa20 stream cipher algorithm. |