diff options
author | Richard Levitte <levitte@openssl.org> | 2019-06-16 21:03:07 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:52 +0200 |
commit | cd42b9e9c275ab88515259da4eb3802ecda7fa7b (patch) | |
tree | b15cc5d87a954169e4f39ed69bc2b82d1b2a7403 /Configurations | |
parent | d67d04f37833b0b2e60367f01f994252bf2e259c (diff) |
Move aes_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 | 11 | ||||
-rw-r--r-- | Configurations/10-main.conf | 1 | ||||
-rw-r--r-- | Configurations/README | 3 |
3 files changed, 0 insertions, 15 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index d088363d84..0c7334ee4d 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 => [], - aes_asm_src => "aes_core.c aes_cbc.c", bf_asm_src => "bf_enc.c", md5_asm_src => "", cast_asm_src => "c_enc.c", @@ -164,7 +163,6 @@ my %targets=( x86_asm => { template => 1, - aes_asm_src => "aes-586.s vpaes-x86.s aesni-x86.s", bf_asm_src => "bf-586.s", md5_asm_src => "md5-586.s", cast_asm_src => "cast-586.s", @@ -185,7 +183,6 @@ my %targets=( }, x86_64_asm => { template => 1, - aes_asm_src => "aes-x86_64.s vpaes-x86_64.s bsaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s", md5_asm_src => "md5-x86_64.s", sha1_asm_src => "sha1-x86_64.s sha256-x86_64.s sha512-x86_64.s sha1-mb-x86_64.s sha256-mb-x86_64.s", rc4_asm_src => "rc4-x86_64.s rc4-md5-x86_64.s", @@ -199,7 +196,6 @@ my %targets=( }, ia64_asm => { template => 1, - aes_asm_src => "aes_core.c aes_cbc.c aes-ia64.s", sha1_asm_src => "sha1-ia64.s sha256-ia64.s sha512-ia64.s", modes_asm_src => "ghash-ia64.s", chacha_asm_src => "chacha-ia64.S", @@ -207,7 +203,6 @@ my %targets=( }, sparcv9_asm => { template => 1, - aes_asm_src => "aes_core.c aes_cbc.c aes-sparcv9.S aest4-sparcv9.S aesfx-sparcv9.S", md5_asm_src => "md5-sparcv9.S", sha1_asm_src => "sha1-sparcv9.S sha256-sparcv9.S sha512-sparcv9.S", cmll_asm_src => "camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.S", @@ -224,7 +219,6 @@ my %targets=( }, mips32_asm => { template => 1, - aes_asm_src => "aes_cbc.c aes-mips.S", sha1_asm_src => "sha1-mips.S sha256-mips.S", }, mips64_asm => { @@ -235,7 +229,6 @@ my %targets=( }, s390x_asm => { template => 1, - aes_asm_src => "aes-s390x.S aes-ctr.fake aes-xts.fake", sha1_asm_src => "sha1-s390x.S sha256-s390x.S sha512-s390x.S", rc4_asm_src => "rc4-s390x.s", modes_asm_src => "ghash-s390x.S", @@ -245,7 +238,6 @@ my %targets=( }, armv4_asm => { template => 1, - aes_asm_src => "aes_cbc.c aes-armv4.S bsaes-armv7.S aesv8-armx.S", sha1_asm_src => "sha1-armv4-large.S sha256-armv4.S sha512-armv4.S", modes_asm_src => "ghash-armv4.S ghashv8-armx.S", chacha_asm_src => "chacha-armv4.S", @@ -254,7 +246,6 @@ my %targets=( }, aarch64_asm => { template => 1, - aes_asm_src => "aes_core.c aes_cbc.c aesv8-armx.S vpaes-armv8.S", sha1_asm_src => "sha1-armv8.S sha256-armv8.S sha512-armv8.S", modes_asm_src => "ghashv8-armx.S", chacha_asm_src => "chacha-armv8.S", @@ -263,7 +254,6 @@ my %targets=( }, parisc11_asm => { template => 1, - aes_asm_src => "aes_core.c aes_cbc.c aes-parisc.s", sha1_asm_src => "sha1-parisc.s sha256-parisc.s sha512-parisc.s", rc4_asm_src => "rc4-parisc.s", modes_asm_src => "ghash-parisc.s", @@ -274,7 +264,6 @@ my %targets=( }, ppc32_asm => { template => 1, - aes_asm_src => "aes_core.c aes_cbc.c aes-ppc.s vpaes-ppc.s aesp8-ppc.s", sha1_asm_src => "sha1-ppc.s sha256-ppc.s sha512-ppc.s sha256p8-ppc.s sha512p8-ppc.s", modes_asm_src => "ghashp8-ppc.s", chacha_asm_src => "chacha-ppc.s", diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 26cbbf9f0f..51caa30f9d 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", - aes_asm_src => "aes-c64xplus.s aes_cbc.c aes-ctr.fake", sha1_asm_src => "sha1-c64xplus.s sha256-c64xplus.s sha512-c64xplus.s", rc4_asm_src => "rc4-c64xplus.s", modes_asm_src => "ghash-c64xplus.s", diff --git a/Configurations/README b/Configurations/README index 2cdd3511d2..36e71eedda 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. - aes_asm_src => Assembler implementation of core AES - functions. - Defaults to 'aes_core.c aes_cbc.c' bf_asm_src => Assembler implementation of core BlowFish functions. Defaults to 'bf_enc.c' |