diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-06-16 22:21:50 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:53 +0200 |
| commit | bcb7afe18a46462bb4fdb12c0ff2b4435b08cf78 (patch) | |
| tree | 37eeaae563485fc8f785efd75553bf29ddbbe901 /Configurations | |
| parent | a9bb7e9270d26416cc387bc0777c18f9690e2302 (diff) | |
Move chacha_asm_src file information to build.info files
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9166)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/00-base-templates.conf | 8 | ||||
| -rw-r--r-- | Configurations/10-main.conf | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 5c73ce35ad..5427af8a4b 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -15,7 +15,6 @@ my %targets=( thread_defines => [], padlock_asm_src => "", - chacha_asm_src => "chacha_enc.c", poly1305_asm_src => "", keccak1600_asm_src => "keccak1600.c", @@ -155,7 +154,6 @@ my %targets=( x86_asm => { template => 1, padlock_asm_src => "e_padlock-x86.s", - chacha_asm_src => "chacha-x86.s", poly1305_asm_src=> "poly1305-x86.s", }, x86_elf_asm => { @@ -165,13 +163,11 @@ my %targets=( x86_64_asm => { template => 1, padlock_asm_src => "e_padlock-x86_64.s", - chacha_asm_src => "chacha-x86_64.s", poly1305_asm_src=> "poly1305-x86_64.s", keccak1600_asm_src => "keccak1600-x86_64.s", }, ia64_asm => { template => 1, - chacha_asm_src => "chacha-ia64.S", poly1305_asm_src=> "asm/poly1305-ia64.S", }, sparcv9_asm => { @@ -194,19 +190,16 @@ my %targets=( }, s390x_asm => { template => 1, - chacha_asm_src => "chacha-s390x.S", poly1305_asm_src=> "poly1305-s390x.S", keccak1600_asm_src => "keccak1600-s390x.S", }, armv4_asm => { template => 1, - chacha_asm_src => "chacha-armv4.S", poly1305_asm_src=> "poly1305-armv4.S", keccak1600_asm_src => "keccak1600-armv4.S", }, aarch64_asm => { template => 1, - chacha_asm_src => "chacha-armv8.S", poly1305_asm_src=> "poly1305-armv8.S", keccak1600_asm_src => "keccak1600-armv8.S", }, @@ -219,7 +212,6 @@ my %targets=( }, ppc32_asm => { template => 1, - chacha_asm_src => "chacha-ppc.s", poly1305_asm_src=> "poly1305-ppc.s poly1305-ppcfp.s", }, ppc64_asm => { diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 450fe0dcb8..69a3710f3c 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", - chacha_asm_src => "chacha-c64xplus.s", poly1305_asm_src => "poly1305-c64xplus.s", thread_scheme => "pthreads", asm_arch => 'c64xplus', |