diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-12-08 14:28:59 +0000 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-12-14 15:00:50 +0100 |
| commit | 445b33663a2236400a890d0b2fc5f6fbc060c903 (patch) | |
| tree | 48fe93f4dd64f3ad2e65fbdfcc15c83ed519672c /arch/arm/crypto/Makefile | |
| parent | 2a2d779b92b6684e41279a8cbc65d6ef6ec2ec39 (diff) | |
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>
Diffstat (limited to 'arch/arm/crypto/Makefile')
| -rw-r--r-- | arch/arm/crypto/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/crypto/Makefile b/arch/arm/crypto/Makefile index 90b41c269..ecbaf375d 100644 --- a/arch/arm/crypto/Makefile +++ b/arch/arm/crypto/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o obj-$(CONFIG_CRYPTO_SHA1_ARM_NEON) += sha1-arm-neon.o obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o obj-$(CONFIG_CRYPTO_SHA512_ARM_NEON) += sha512-arm-neon.o +obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha20-neon.o ifdef CONFIG_CRYPTO_AES_ARM32_CE @@ -23,6 +24,7 @@ sha1-arm-neon-y := sha1-armv7-neon.o sha1_neon_glue.o sha256-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha256_neon_glue.o sha256-arm-y := sha256-core.o sha256_glue.o $(sha256-arm-neon-y) sha512-arm-neon-y := sha512-armv7-neon.o sha512_neon_glue.o +chacha20-neon-y := chacha20-neon-core.o chacha20-neon-glue.o quiet_cmd_perl = PERL $@ cmd_perl = $(PERL) $(<) > $(@) |