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 edcc454fd2b5381bfd06dc2b394722d867cf1e01..9d694d299e14e1a6954cad5cd492cc40d0aa8729 100644 (file)
--- 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 5703302f6cc810426cc927bc718277d661636b56..ffc5fe5d33a89bfcbd53c03bc4a1f1e27a3b560a 100755 (executable)
--- 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 9dffec3f3ed0e69760a37fddd16366e503fd7f6f..368d26dd372d4afc2d3cc4cadb140f36f63a5690 100644 (file)
--- 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)