diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2019-11-08 13:22:14 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2019-11-17 09:02:40 +0800 |
| commit | b36d8c09e710c71f6a9690b6586fea2d1c9e1e27 (patch) | |
| tree | 28964932a4baebfbdb1f8bfc741fedfb371a41b7 /arch/arm/crypto/Makefile | |
| parent | 29621d099f9c642b22a69dc8e7e20c108473a392 (diff) | |
| download | linux-stable-b36d8c09e710c71f6a9690b6586fea2d1c9e1e27.tar.gz linux-stable-b36d8c09e710c71f6a9690b6586fea2d1c9e1e27.tar.bz2 linux-stable-b36d8c09e710c71f6a9690b6586fea2d1c9e1e27.zip | |
crypto: arm/chacha - remove dependency on generic ChaCha driver
Instead of falling back to the generic ChaCha skcipher driver for
non-SIMD cases, use a fast scalar implementation for ARM authored
by Eric Biggers. This removes the module dependency on chacha-generic
altogether, which also simplifies things when we expose the ChaCha
library interface from this module.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/arm/crypto/Makefile')
| -rw-r--r-- | arch/arm/crypto/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/crypto/Makefile b/arch/arm/crypto/Makefile index c0d36771a693..0e550badf8ed 100644 --- a/arch/arm/crypto/Makefile +++ b/arch/arm/crypto/Makefile @@ -33,7 +33,8 @@ aes-arm-ce-y := aes-ce-core.o aes-ce-glue.o ghash-arm-ce-y := ghash-ce-core.o ghash-ce-glue.o crct10dif-arm-ce-y := crct10dif-ce-core.o crct10dif-ce-glue.o crc32-arm-ce-y:= crc32-ce-core.o crc32-ce-glue.o -chacha-neon-y := chacha-neon-core.o chacha-neon-glue.o +chacha-neon-y := chacha-scalar-core.o chacha-glue.o +chacha-neon-$(CONFIG_KERNEL_MODE_NEON) += chacha-neon-core.o nhpoly1305-neon-y := nh-neon-core.o nhpoly1305-neon-glue.o ifdef REGENERATE_ARM_CRYPTO |