X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Configurations%2F00-base-templates.conf;h=5fd995cb3392eb819c0bf0cb7f3bd2a02fb72d60;hb=b8caae27f19f29f3db927301fbd26fedc90c6b9b;hp=c074bd6e216eeadc1609dd480cfe0e300701a5b4;hpb=78a50c7524e86137e4db3d57d1a06eb573b26054;p=oweals%2Fopenssl.git

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index c074bd6e21..5fd995cb33 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -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	=> "",
@@ -44,7 +45,7 @@ my %targets=(
 	shared_extension	=> "",
 
 	#### Defaults for the benefit of the config targets who don't inherit
-	#### a BASE and assume Unixly defaults
+	#### a BASE and assume Unix defaults
 	#### THESE WILL DISAPPEAR IN OpenSSL 1.2
 	build_scheme	=> [ "unified", "unix" ],
 	build_file	=> "Makefile",
@@ -101,6 +102,8 @@ my %targets=(
                                      ? "ranlib" : "" },
         RC              => "windres",
 
+        shared_extension => ".so",
+
         build_scheme    => [ "unified", "unix" ],
         build_file      => "Makefile",
     },
@@ -114,7 +117,7 @@ my %targets=(
                 my @defs = ();
                 unless ($disabled{"zlib-dynamic"}) {
                     my $zlib = $withargs{zlib_lib} // "ZLIB1";
-                    push @defs, quotify("perl", 'LIBZ="' . $zlib . '"');
+                    push @defs, 'LIBZ=' . (quotify("perl", $zlib))[0];
                 }
                 return [ @defs ];
             },
@@ -141,6 +144,8 @@ my %targets=(
         mtinflag        => "-manifest ",
         mtoutflag       => "-outputresource:",
 
+        shared_extension => ".dll",
+
         build_file      => "makefile",
         build_scheme    => [ "unified", "windows" ],
     },
@@ -159,6 +164,8 @@ my %targets=(
                     return [ @incs ];
                 }),
 
+        shared_extension => ".exe",
+
         build_file       => "descrip.mms",
         build_scheme     => [ "unified", "VMS" ],
     },
@@ -226,6 +233,7 @@ my %targets=(
 	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,
@@ -287,6 +295,7 @@ my %targets=(
 	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,
@@ -297,7 +306,8 @@ my %targets=(
 	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",
-	poly1305_asm_src=> "poly1305-armv4.S", 
+	poly1305_asm_src=> "poly1305-armv4.S",
+	keccak1600_asm_src	=> "keccak1600-armv4.S",
 	perlasm_scheme	=> "void"
     },
     aarch64_asm => {
@@ -310,6 +320,7 @@ my %targets=(
 	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,
@@ -339,7 +350,7 @@ my %targets=(
     ppc64_asm => {
 	inherit_from	=> [ "ppc32_asm" ],
 	template	=> 1,
-	ec_asm_src	=> "ecp_nistz256.c ecp_nistz256-ppc64.s",
-
+	ec_asm_src	=> "ecp_nistz256.c ecp_nistz256-ppc64.s x25519-ppc64.s",
+	keccak1600_asm_src	=> "keccak1600-ppc64.s",
     },
 );