diff options
author | Richard Levitte <levitte@openssl.org> | 2019-06-16 21:50:39 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:52 +0200 |
commit | 6b90902faf5c8ec6d8b5801d91bc1e87a179e3b7 (patch) | |
tree | 515238195961407d98060ac7400fc5ca44999747 | |
parent | e698cfe4450ddafe9199468692ce5ffd74124df3 (diff) |
Move rc4_asm_src file information to build.info files
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9166)
-rw-r--r-- | Configurations/00-base-templates.conf | 5 | ||||
-rw-r--r-- | Configurations/10-main.conf | 1 | ||||
-rw-r--r-- | Configurations/README | 3 | ||||
-rwxr-xr-x | Configure | 4 | ||||
-rw-r--r-- | crypto/rc4/build.info | 21 |
5 files changed, 19 insertions, 15 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index f67fbc21cd..337ee223db 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -14,7 +14,6 @@ my %targets=( thread_scheme => "(unknown)", # Assume we don't know thread_defines => [], - rc4_asm_src => "rc4_enc.c rc4_skey.c", rmd160_asm_src => "", rc5_asm_src => "rc5_enc.c", wp_asm_src => "wp_block.c", @@ -160,7 +159,6 @@ my %targets=( x86_asm => { template => 1, - rc4_asm_src => "rc4-586.s", rmd160_asm_src => "rmd-586.s", rc5_asm_src => "rc5-586.s", wp_asm_src => "wp_block.c wp-mmx.s", @@ -176,7 +174,6 @@ my %targets=( }, x86_64_asm => { template => 1, - rc4_asm_src => "rc4-x86_64.s rc4-md5-x86_64.s", wp_asm_src => "wp-x86_64.s", cmll_asm_src => "cmll-x86_64.s cmll_misc.c", modes_asm_src => "ghash-x86_64.s aesni-gcm-x86_64.s", @@ -214,7 +211,6 @@ my %targets=( }, s390x_asm => { template => 1, - rc4_asm_src => "rc4-s390x.s", modes_asm_src => "ghash-s390x.S", chacha_asm_src => "chacha-s390x.S", poly1305_asm_src=> "poly1305-s390x.S", @@ -236,7 +232,6 @@ my %targets=( }, parisc11_asm => { template => 1, - rc4_asm_src => "rc4-parisc.s", modes_asm_src => "ghash-parisc.s", }, parisc20_64_asm => { diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 9e16bcbf88..2895eef4fe 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -949,7 +949,6 @@ my %targets = ( cppflags => combine("-DOPENSSL_SMALL_FOOTPRINT", threads("-D_REENTRANT")), bn_ops => "BN_LLONG", - rc4_asm_src => "rc4-c64xplus.s", modes_asm_src => "ghash-c64xplus.s", chacha_asm_src => "chacha-c64xplus.s", poly1305_asm_src => "poly1305-c64xplus.s", diff --git a/Configurations/README b/Configurations/README index 773235efb4..b19e852ec5 100644 --- a/Configurations/README +++ b/Configurations/README @@ -240,9 +240,6 @@ In each table entry, the following keys are significant: export vars as accessor functions. - rc4_asm_src => Assembler implementation of core RC4 - functions. - Defaults to 'rc4_enc.c rc4_skey.c' rmd160_asm_src => Assembler implementation of core RMD160 functions. rc5_asm_src => Assembler implementation of core RC5 @@ -1407,9 +1407,6 @@ unless ($disabled{asm}) { 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"; - } if ($target{rmd160_asm_src}) { push @{$config{lib_defines}}, "RMD160_ASM"; } @@ -3357,7 +3354,6 @@ sub print_table_entry "loutflag", "ex_libs", "bn_ops", - "rc4_asm_src", "rmd160_asm_src", "rc5_asm_src", "wp_asm_src", diff --git a/crypto/rc4/build.info b/crypto/rc4/build.info index 8d272e4ff6..30e36bac10 100644 --- a/crypto/rc4/build.info +++ b/crypto/rc4/build.info @@ -1,6 +1,23 @@ LIBS=../../libcrypto -SOURCE[../../libcrypto]=\ - {- $target{rc4_asm_src} -} + +$RC4ASM=rc4_enc.c rc4_skey.c +IF[{- !$disabled{asm} -}] + $RC4ASM_x86=rc4-586.s + $RC4ASM_x86_64=rc4-x86_64.s rc4-md5-x86_64.s + $RC4ASM_s390x=rc4-s390x.s + $RC4ASM_parisc11=rc4-parisc.s + $RC4ASM_parisc20_64=$RC4ASM_parisc11 + $RC4ASM_c64xplus=rc4-c64xplus.s + + # Now that we have defined all the arch specific variables, use the + # appropriate one, and define the appropriate macros + IF[$RC4ASM_{- $target{asm_arch} -}] + $RC4ASM=$RC4ASM_{- $target{asm_arch} -} + $RC4DEF=RC4_ASM + ENDIF +ENDIF + +SOURCE[../../libcrypto]=$RC4ASM GENERATE[rc4-586.s]=asm/rc4-586.pl \ $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR) |