X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Configurations%2F00-base-templates.conf;h=821a211cc873b824e066f4d92f1a07f90914c0b0;hb=5cff2df8cedd7b8185756df216f16a213fb22637;hp=6e6e14ea1041bbb0b18f197c25ea5a417ab9a36c;hpb=2ffea443223a943efff0f642c37824b63b7e3e30;p=oweals%2Fopenssl.git

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 6e6e14ea10..821a211cc8 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -14,15 +14,6 @@ my %targets=(
 	thread_scheme	=> "(unknown)", # Assume we don't know
 	thread_defines	=> [],
 
-	rc5_asm_src	=> "rc5_enc.c",
-	wp_asm_src	=> "wp_block.c",
-	cmll_asm_src	=> "camellia.c cmll_misc.c cmll_cbc.c",
-	modes_asm_src	=> "",
-	padlock_asm_src	=> "",
-	chacha_asm_src	=> "chacha_enc.c",
-	poly1305_asm_src	=> "",
-	keccak1600_asm_src	=> "keccak1600.c",
-
 	unistd		=> "<unistd.h>",
 	shared_target	=> "",
 	shared_cflag	=> "",
@@ -56,7 +47,7 @@ my %targets=(
 
 	defines		=>
 	    sub {
-                my @defs = ();
+                my @defs = ( 'OPENSSL_BUILDING_OPENSSL' );
                 push @defs, "ZLIB" unless $disabled{zlib};
                 push @defs, "ZLIB_SHARED" unless $disabled{"zlib-dynamic"};
                 return [ @defs ];
@@ -155,96 +146,4 @@ my %targets=(
 
         perl_platform    => 'VMS',
     },
-
-    x86_asm => {
-	template	=> 1,
-	rc5_asm_src	=> "rc5-586.s",
-	wp_asm_src	=> "wp_block.c wp-mmx.s",
-	cmll_asm_src	=> "cmll-x86.s",
-	modes_asm_src	=> "ghash-x86.s",
-	padlock_asm_src	=> "e_padlock-x86.s",
-	chacha_asm_src	=> "chacha-x86.s",
-	poly1305_asm_src=> "poly1305-x86.s",
-    },
-    x86_elf_asm => {
-	template	=> 1,
-	inherit_from	=> [ "x86_asm" ],
-    },
-    x86_64_asm => {
-	template	=> 1,
-	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",
-	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,
-	modes_asm_src   => "ghash-ia64.s",
-	chacha_asm_src  => "chacha-ia64.S",
-	poly1305_asm_src=> "asm/poly1305-ia64.S",
-    },
-    sparcv9_asm => {
-	template	=> 1,
-	cmll_asm_src    => "camellia.c cmll_misc.c cmll_cbc.c cmllt4-sparcv9.S",
-	modes_asm_src   => "ghash-sparcv9.S",
-	poly1305_asm_src=> "poly1305-sparcv9.S",
-    },
-    sparcv8_asm => {
-	template	=> 1,
-    },
-    alpha_asm => {
-	template	=> 1,
-	modes_asm_src   => "ghash-alpha.S",
-    },
-    mips32_asm => {
-	template	=> 1,
-    },
-    mips64_asm => {
-	inherit_from	=> [ "mips32_asm" ],
-	template	=> 1,
-	poly1305_asm_src=> "poly1305-mips.S",
-    },
-    s390x_asm => {
-	template	=> 1,
-	modes_asm_src   => "ghash-s390x.S",
-	chacha_asm_src  => "chacha-s390x.S",
-	poly1305_asm_src=> "poly1305-s390x.S",
-	keccak1600_asm_src	=> "keccak1600-s390x.S",
-    },
-    armv4_asm => {
-	template	=> 1,
-	modes_asm_src   => "ghash-armv4.S ghashv8-armx.S",
-	chacha_asm_src  => "chacha-armv4.S",
-	poly1305_asm_src=> "poly1305-armv4.S",
-	keccak1600_asm_src	=> "keccak1600-armv4.S",
-    },
-    aarch64_asm => {
-	template	=> 1,
-	modes_asm_src   => "ghashv8-armx.S",
-	chacha_asm_src  => "chacha-armv8.S",
-	poly1305_asm_src=> "poly1305-armv8.S",
-	keccak1600_asm_src	=> "keccak1600-armv8.S",
-    },
-    parisc11_asm => {
-	template	=> 1,
-	modes_asm_src   => "ghash-parisc.s",
-    },
-    parisc20_64_asm => {
-	template	=> 1,
-	inherit_from	=> [ "parisc11_asm" ],
-    },
-    ppc32_asm => {
-	template	=> 1,
-	modes_asm_src   => "ghashp8-ppc.s",
-	chacha_asm_src	=> "chacha-ppc.s",
-	poly1305_asm_src=> "poly1305-ppc.s poly1305-ppcfp.s",
-    },
-    ppc64_asm => {
-	inherit_from	=> [ "ppc32_asm" ],
-	template	=> 1,
-	keccak1600_asm_src	=> "keccak1600-ppc64.s",
-    },
 );