From 445b33663a2236400a890d0b2fc5f6fbc060c903 Mon Sep 17 00:00:00 2001
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Thu, 8 Dec 2016 14:28:59 +0000
Subject: UPSTREAM: crypto: arm/chacha20 - implement NEON version based on SSE3
 code

This is a straight port to ARM/NEON of the x86 SSE3 implementation
of the ChaCha20 stream cipher.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 8096667273477e735b0072b11a6d617ccee45e5f,
 fixed merge conflicts in Kconfig and Makefile)
Change-Id: Id5d32a41a3ec036b9cffe0b739321eede4c92d0a
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 crypto/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'crypto')

diff --git a/crypto/Kconfig b/crypto/Kconfig
index c450c70e6..c9c72b8e8 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1136,6 +1136,12 @@ config CRYPTO_CHACHA20
 	  See also:
 	  <http://cr.yp.to/chacha/chacha-20080128.pdf>
 
+config CRYPTO_CHACHA20_NEON
+	tristate "NEON accelerated ChaCha20 symmetric cipher"
+	depends on ARM && KERNEL_MODE_NEON
+	select CRYPTO_BLKCIPHER
+	select CRYPTO_CHACHA20
+
 config CRYPTO_SEED
 	tristate "SEED cipher algorithm"
 	select CRYPTO_ALGAPI
-- 
cgit v1.2.3