Commit e4739e31 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Configure: add $target{keccak1600_asm_src}. 



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

Configurations/00-base-templates.conf

+1 −0
Original line number Diff line number Diff line
@@ -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	=> "",

Configure

+3 −0
Original line number Diff line number Diff line
@@ -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";

    }

crypto/sha/build.info

+1 −1
Original line number Diff line number Diff line 
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)