summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2018-04-22 13:09:49 +0200
committerAndy Polyakov <appro@openssl.org>2018-04-23 17:27:45 +0200
commitfe46035dbe173a42cbdfc7d31d17976300b22ccc (patch)
tree5114141233f18c0d11113698ee9e910e8b5df837
parenteefc485bda4ab1ac7293b4c749c251b662d9fba8 (diff)
00-base-templates.conf: wire keccak1600-s390x 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 131c154160..bae6a2dd91 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -289,6 +289,7 @@ my %targets=(
modes_asm_src => "ghash-s390x.S",
chacha_asm_src => "chacha-s390x.S",
poly1305_asm_src=> "poly1305-s390x.S",
+ keccak1600_asm_src => "keccak1600-s390x.S",
},
armv4_asm => {
template => 1,
diff --git a/crypto/sha/build.info b/crypto/sha/build.info
index c036f62aa6..84705fcc2b 100644
--- a/crypto/sha/build.info
+++ b/crypto/sha/build.info
@@ -71,6 +71,7 @@ GENERATE[sha256-s390x.S]=asm/sha512-s390x.pl $(PERLASM_SCHEME)
INCLUDE[sha256-s390x.o]=..
GENERATE[sha512-s390x.S]=asm/sha512-s390x.pl $(PERLASM_SCHEME)
INCLUDE[sha512-s390x.o]=..
+GENERATE[keccak1600-s390x.S]=asm/keccak1600-s390x.pl $(PERLASM_SCHEME)
BEGINRAW[Makefile(unix)]
##### SHA assembler implementations