Fix error handling in RAND_DRBG_set

[openssl.git] / Configurations / 00-base-templates.conf

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index a1837ca291af8324b1a8f4049e09b7d2f3e9e478..dd0649d20338239cd860aef28541c4714c43e0b6 100644 (file)
--- 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",
@@ -109,6 +110,15 @@ my %targets=(
         inherit_from    => [ "BASE_common" ],
         template        => 1,
 
+        lib_defines      =>
+            sub {
+                my @defs = ();
+                unless ($disabled{"zlib-dynamic"}) {
+                    my $zlib = $withargs{zlib_lib} // "ZLIB1";
+                    push @defs, 'LIBZ=' . (quotify("perl", $zlib))[0];
+                }
+                return [ @defs ];
+            },
         ex_libs         =>
             sub {
                 unless ($disabled{zlib}) {
@@ -217,6 +227,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,
@@ -278,6 +289,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,
@@ -289,6 +301,7 @@ my %targets=(
        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",
        perlasm_scheme  => "void"
     },
     aarch64_asm => {
@@ -301,6 +314,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,
@@ -330,7 +344,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",
     },
 );