From 08825b907d933e80bba6077a545831978fa950f4 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 8 Nov 2018 17:08:22 +0100 Subject: chacha20,poly1305: switch to perlasm originals on mips and arm We also separate out Eric Biggers' Cortex A7 implementation into its own file. --- src/crypto/Kbuild.include | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/crypto/Kbuild.include') diff --git a/src/crypto/Kbuild.include b/src/crypto/Kbuild.include index ab5ecea..5fb9445 100644 --- a/src/crypto/Kbuild.include +++ b/src/crypto/Kbuild.include @@ -16,7 +16,7 @@ endif zinc-y += chacha20/chacha20.o zinc-$(CONFIG_ZINC_ARCH_X86_64) += chacha20/chacha20-x86_64.o -zinc-$(CONFIG_ZINC_ARCH_ARM) += chacha20/chacha20-arm.o +zinc-$(CONFIG_ZINC_ARCH_ARM) += chacha20/chacha20-arm.o chacha20/chacha20-unrolled-arm.o zinc-$(CONFIG_ZINC_ARCH_ARM64) += chacha20/chacha20-arm64.o zinc-$(CONFIG_ZINC_ARCH_MIPS) += chacha20/chacha20-mips.o AFLAGS_chacha20-mips.o += -O2 # This is required to fill the branch delay slots @@ -37,6 +37,12 @@ zinc-$(CONFIG_ZINC_ARCH_X86_64) += blake2s/blake2s-x86_64.o zinc-y += curve25519/curve25519.o zinc-$(CONFIG_ZINC_ARCH_ARM) += curve25519/curve25519-arm.o +quiet_cmd_perlasm = PERLASM $@ + cmd_perlasm = $(PERL) $< > $@ +%.S: %.pl + $(call cmd,perlasm) +targets += $(patsubst %.o,crypto/zinc/%.S,$(zinc-y)) + wireguard-y += $(addprefix crypto/zinc/,$(zinc-y)) ccflags-y += -I$(src)/crypto/include ccflags-$(CONFIG_ZINC_ARCH_X86_64) += -DCONFIG_ZINC_ARCH_X86_64 -- cgit v1.2.3-59-g8ed1b