aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-12-05 01:20:04 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2018-12-13 05:24:58 -0500
commit7a507d62258afd514583fadf1482451079fa0e4d (patch)
treebff7778a6fcb50dc9f8030fe7710f011ce857ff2 /crypto
parent8b65f34c5821e7361488dc668d21195ea4c9f14d (diff)
crypto: x86/chacha - add XChaCha12 support
Now that the x86_64 SIMD implementations of ChaCha20 and XChaCha20 have been refactored to support varying the number of rounds, add support for XChaCha12. This is identical to XChaCha20 except for the number of rounds, which is 12 instead of 20. This can be used by Adiantum. Reviewed-by: Martin Willi <martin@strongswan.org> Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index dc3a0e3ea2ac..045af6eeb7e2 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1473,8 +1473,8 @@ config CRYPTO_CHACHA20_X86_64
1473 select CRYPTO_BLKCIPHER 1473 select CRYPTO_BLKCIPHER
1474 select CRYPTO_CHACHA20 1474 select CRYPTO_CHACHA20
1475 help 1475 help
1476 SSSE3, AVX2, and AVX-512VL optimized implementations of the ChaCha20 1476 SSSE3, AVX2, and AVX-512VL optimized implementations of the ChaCha20,
1477 and XChaCha20 stream ciphers. 1477 XChaCha20, and XChaCha12 stream ciphers.
1478 1478
1479config CRYPTO_SEED 1479config CRYPTO_SEED
1480 tristate "SEED cipher algorithm" 1480 tristate "SEED cipher algorithm"