summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2018-04-22 12:56:31 +0200
committerAndy Polyakov <appro@openssl.org>2018-04-23 17:27:36 +0200
commit1018a7251e1f8721fc7aebbe5737680544f71698 (patch)
tree85b3a316de2af9ffd6baa992733adc8b518e4c61
parent0fe72aaaa9bb01b440e6a285bffc1ffc2ea174ac (diff)
00-base-templates.conf: wire keccak1600-x86_64 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.info1
2 files changed, 2 insertions, 0 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 9d694d299e..532adee572 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -227,6 +227,7 @@ my %targets=(
padlock_asm_src => "e_padlock-x86_64.s",
chacha_asm_src => "chacha-x86_64.s",
poly1305_asm_src=> "poly1305-x86_64.s",
+ keccak1600_asm_src => "keccak1600-x86_64.s",
},
ia64_asm => {
template => 1,
diff --git a/crypto/sha/build.info b/crypto/sha/build.info
index 368d26dd37..04df8063ce 100644
--- a/crypto/sha/build.info
+++ b/crypto/sha/build.info
@@ -24,6 +24,7 @@ GENERATE[sha1-mb-x86_64.s]=asm/sha1-mb-x86_64.pl $(PERLASM_SCHEME)
GENERATE[sha256-x86_64.s]=asm/sha512-x86_64.pl $(PERLASM_SCHEME)
GENERATE[sha256-mb-x86_64.s]=asm/sha256-mb-x86_64.pl $(PERLASM_SCHEME)
GENERATE[sha512-x86_64.s]=asm/sha512-x86_64.pl $(PERLASM_SCHEME)
+GENERATE[keccak1600-x86_64.s]=asm/keccak1600-x86_64.pl $(PERLASM_SCHEME)
GENERATE[sha1-sparcv9.S]=asm/sha1-sparcv9.pl $(PERLASM_SCHEME)
INCLUDE[sha1-sparcv9.o]=..