From: Andy Polyakov <appro@openssl.org>
Date: Sun, 22 Apr 2018 08:42:59 +0000 (+0200)
Subject: Configure: add $target{keccak1600_asm_src}.
X-Git-Tag: OpenSSL_1_1_1-pre6~59
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e4739e31ee7430046e80b88132c2ccbc7ca501d9;p=oweals%2Fopenssl.git

Configure: add $target{keccak1600_asm_src}.

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 edcc454fd2..9d694d299e 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -34,6 +34,7 @@ my %targets=(
 	padlock_asm_src	=> "",
 	chacha_asm_src	=> "chacha_enc.c",
 	poly1305_asm_src	=> "",
+	keccak1600_asm_src	=> "keccak1600.c",
 
 	unistd		=> "<unistd.h>",
 	shared_target	=> "",
diff --git a/Configure b/Configure
index 5703302f6c..ffc5fe5d33 100755
--- a/Configure
+++ b/Configure
@@ -1359,6 +1359,9 @@ unless ($disabled{asm}) {
 	push @{$config{lib_defines}}, "SHA256_ASM" if ($target{sha1_asm_src} =~ /sha256/);
 	push @{$config{lib_defines}}, "SHA512_ASM" if ($target{sha1_asm_src} =~ /sha512/);
     }
+    if ($target{keccak1600_asm_src} ne $table{DEFAULTS}->{keccak1600_asm_src}) {
+	push @{$config{lib_defines}}, "KECCAK1600_ASM";
+    }
     if ($target{rc4_asm_src} ne $table{DEFAULTS}->{rc4_asm_src}) {
 	push @{$config{lib_defines}}, "RC4_ASM";
     }
diff --git a/crypto/sha/build.info b/crypto/sha/build.info
index 9dffec3f3e..368d26dd37 100644
--- a/crypto/sha/build.info
+++ b/crypto/sha/build.info
@@ -1,7 +1,7 @@
 LIBS=../../libcrypto
 SOURCE[../../libcrypto]=\
         sha1dgst.c sha1_one.c sha256.c sha512.c {- $target{sha1_asm_src} -} \
-        keccak1600.c
+        {- $target{keccak1600_asm_src} -}
 
 GENERATE[sha1-586.s]=asm/sha1-586.pl \
         $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR)