Fix PEM certificate loading that sometimes fails

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

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 14b7608ca53eb77be4dc9a7a607c49b4294fead4..821a211cc873b824e066f4d92f1a07f90914c0b0 100644 (file)
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -14,8 +14,6 @@ my %targets=(
        thread_scheme   => "(unknown)", # Assume we don't know
        thread_defines  => [],
 
-       padlock_asm_src => "",
-
        unistd          => "<unistd.h>",
        shared_target   => "",
        shared_cflag    => "",
@@ -49,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 ];
@@ -148,59 +146,4 @@ my %targets=(
 
         perl_platform    => 'VMS',
     },
-
-    x86_asm => {
-       template        => 1,
-       padlock_asm_src => "e_padlock-x86.s",
-    },
-    x86_elf_asm => {
-       template        => 1,
-       inherit_from    => [ "x86_asm" ],
-    },
-    x86_64_asm => {
-       template        => 1,
-       padlock_asm_src => "e_padlock-x86_64.s",
-    },
-    ia64_asm => {
-       template        => 1,
-    },
-    sparcv9_asm => {
-       template        => 1,
-    },
-    sparcv8_asm => {
-       template        => 1,
-    },
-    alpha_asm => {
-       template        => 1,
-    },
-    mips32_asm => {
-       template        => 1,
-    },
-    mips64_asm => {
-       inherit_from    => [ "mips32_asm" ],
-       template        => 1,
-    },
-    s390x_asm => {
-       template        => 1,
-    },
-    armv4_asm => {
-       template        => 1,
-    },
-    aarch64_asm => {
-       template        => 1,
-    },
-    parisc11_asm => {
-       template        => 1,
-    },
-    parisc20_64_asm => {
-       template        => 1,
-       inherit_from    => [ "parisc11_asm" ],
-    },
-    ppc32_asm => {
-       template        => 1,
-    },
-    ppc64_asm => {
-       inherit_from    => [ "ppc32_asm" ],
-       template        => 1,
-    },
 );