00-base-templates.conf: wire keccak1600-s390x module.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6042)

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 131c1541607960a1dc603dc887d0ea9c922cc279..bae6a2dd91b5c8b92d111c6cf30aff2bea5cfd94 100644 (file)
--- 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 c036f62aa62c3186b9152cf343ef77422befa053..84705fcc2ba311370e3149bb528874191a538521 100644 (file)
--- 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