From: Andy Polyakov <appro@openssl.org>
Date: Sun, 22 Apr 2018 11:00:28 +0000 (+0200)
Subject: 00-base-templates.conf: wire keccak1600-armv8 module.
X-Git-Tag: OpenSSL_1_1_1-pre6~56
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eefc485bda4ab1ac7293b4c749c251b662d9fba8;p=oweals%2Fopenssl.git

00-base-templates.conf: wire keccak1600-armv8 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 532adee572..131c154160 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -312,6 +312,7 @@ my %targets=(
 	modes_asm_src   => "ghashv8-armx.S",
 	chacha_asm_src  => "chacha-armv8.S",
 	poly1305_asm_src=> "poly1305-armv8.S",
+	keccak1600_asm_src	=> "keccak1600-armv8.S",
     },
     parisc11_asm => {
 	template	=> 1,
diff --git a/crypto/sha/build.info b/crypto/sha/build.info
index 04df8063ce..c036f62aa6 100644
--- a/crypto/sha/build.info
+++ b/crypto/sha/build.info
@@ -63,6 +63,7 @@ GENERATE[sha256-armv8.S]=asm/sha512-armv8.pl $(PERLASM_SCHEME)
 INCLUDE[sha256-armv8.o]=..
 GENERATE[sha512-armv8.S]=asm/sha512-armv8.pl $(PERLASM_SCHEME)
 INCLUDE[sha512-armv8.o]=..
+GENERATE[keccak1600-armv8.S]=asm/keccak1600-armv8.pl $(PERLASM_SCHEME)
 
 GENERATE[sha1-s390x.S]=asm/sha1-s390x.pl $(PERLASM_SCHEME)
 INCLUDE[sha1-s390x.o]=..