summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2018-04-22 14:08:28 +0200
committerAndy Polyakov <appro@openssl.org>2018-04-23 17:27:58 +0200
commit40ab6b856754a11050174b222c7abb10b6dcb822 (patch)
treef0cb129afd36ff02f8d428d5753083b7b2329f2c
parente9afe7a143a27e4e488e3d027439157fb0fc550b (diff)
00-base-templates.conf: wire keccak1600-armv4 module.
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6042)
-rw-r--r--Configurations/00-base-templates.conf1
-rw-r--r--crypto/sha/build.info2
2 files changed, 3 insertions, 0 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index f66bb853a7..4a1645fdee 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -301,6 +301,7 @@ my %targets=(
modes_asm_src => "ghash-armv4.S ghashv8-armx.S",
chacha_asm_src => "chacha-armv4.S",
poly1305_asm_src=> "poly1305-armv4.S",
+ keccak1600_asm_src => "keccak1600-armv4.S",
perlasm_scheme => "void"
},
aarch64_asm => {
diff --git a/crypto/sha/build.info b/crypto/sha/build.info
index 6bdc760530..5dd5a9941d 100644
--- a/crypto/sha/build.info
+++ b/crypto/sha/build.info
@@ -57,6 +57,8 @@ GENERATE[sha256-armv4.S]=asm/sha256-armv4.pl $(PERLASM_SCHEME)
INCLUDE[sha256-armv4.o]=..
GENERATE[sha512-armv4.S]=asm/sha512-armv4.pl $(PERLASM_SCHEME)
INCLUDE[sha512-armv4.o]=..
+GENERATE[keccak1600-armv4.S]=asm/keccak1600-armv4.pl $(PERLASM_SCHEME)
+INCLUDE[keccak1600-armv4.o]=..
GENERATE[sha1-armv8.S]=asm/sha1-armv8.pl $(PERLASM_SCHEME)
INCLUDE[sha1-armv8.o]=..