projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check if num is 0 before trying to malloc memory. Otherwise for client hellos without...
[oweals/openssl.git]
/
Configurations
/
00-base-templates.conf
diff --git
a/Configurations/00-base-templates.conf
b/Configurations/00-base-templates.conf
index e24baf1f53e6ce5a81bce6819c086b1db3f8ddc6..5fd995cb3392eb819c0bf0cb7f3bd2a02fb72d60 100644
(file)
--- a/
Configurations/00-base-templates.conf
+++ b/
Configurations/00-base-templates.conf
@@
-7,10
+7,15
@@
my %targets=(
cppflags => "",
lflags => "",
defines => [],
cppflags => "",
lflags => "",
defines => [],
+ includes => [],
+ lib_cflags => "",
+ lib_cppflags => "",
+ lib_defines => [],
thread_scheme => "(unknown)", # Assume we don't know
thread_defines => [],
apps_aux_src => "",
thread_scheme => "(unknown)", # Assume we don't know
thread_defines => [],
apps_aux_src => "",
+ apps_init_src => "",
cpuid_asm_src => "mem_clr.c",
uplink_aux_src => "",
bn_asm_src => "bn_asm.c",
cpuid_asm_src => "mem_clr.c",
uplink_aux_src => "",
bn_asm_src => "bn_asm.c",
@@
-29,6
+34,7
@@
my %targets=(
padlock_asm_src => "",
chacha_asm_src => "chacha_enc.c",
poly1305_asm_src => "",
padlock_asm_src => "",
chacha_asm_src => "chacha_enc.c",
poly1305_asm_src => "",
+ keccak1600_asm_src => "keccak1600.c",
unistd => "<unistd.h>",
shared_target => "",
unistd => "<unistd.h>",
shared_target => "",
@@
-38,10
+44,22
@@
my %targets=(
shared_rcflag => "",
shared_extension => "",
shared_rcflag => "",
shared_extension => "",
- hashbangperl => "PERL", # Only Unix actually cares
+ #### Defaults for the benefit of the config targets who don't inherit
+ #### a BASE and assume Unix defaults
+ #### THESE WILL DISAPPEAR IN OpenSSL 1.2
+ build_scheme => [ "unified", "unix" ],
+ build_file => "Makefile",
- build_scheme => [ "unified", "unix" ],
- build_file => "Makefile",
+ AR => "ar",
+ ARFLAGS => "r",
+ CC => "cc",
+ HASHBANGPERL => "/usr/bin/env perl",
+ RANLIB => sub { which("$config{cross_compile_prefix}ranlib")
+ ? "ranlib" : "" },
+ RC => "windres",
+
+ #### THESE WILL BE ENABLED IN OpenSSL 1.2
+ #HASHBANGPERL => "PERL", # Only Unix actually cares
},
BASE_common => {
},
BASE_common => {
@@
-57,25
+75,34
@@
my %targets=(
push @defs, "ZLIB_SHARED" unless $disabled{"zlib-dynamic"};
return [ @defs ];
},
push @defs, "ZLIB_SHARED" unless $disabled{"zlib-dynamic"};
return [ @defs ];
},
+ includes =>
+ sub {
+ my @incs = ();
+ push @incs, $withargs{zlib_include}
+ if !$disabled{zlib} && $withargs{zlib_include};
+ return [ @incs ];
+ },
},
BASE_unix => {
inherit_from => [ "BASE_common" ],
template => 1,
},
BASE_unix => {
inherit_from => [ "BASE_common" ],
template => 1,
-
ar
=> "ar",
-
arflags
=> "r",
-
cc
=> "cc",
+
AR
=> "ar",
+
ARFLAGS
=> "r",
+
CC
=> "cc",
lflags =>
sub { $withargs{zlib_lib} ? "-L".$withargs{zlib_lib} : () },
ex_libs =>
sub { !defined($disabled{zlib})
&& defined($disabled{"zlib-dynamic"})
? "-lz" : () },
lflags =>
sub { $withargs{zlib_lib} ? "-L".$withargs{zlib_lib} : () },
ex_libs =>
sub { !defined($disabled{zlib})
&& defined($disabled{"zlib-dynamic"})
? "-lz" : () },
- hashbangperl => "/usr/bin/env perl", # Only Unix actually cares
- ranlib => sub { which("$config{cross_compile_prefix}ranlib") ?
- "\$(CROSS_COMPILE)ranlib" : "true"; },
- rc => "windres",
+ HASHBANGPERL => "/usr/bin/env perl", # Only Unix actually cares
+ RANLIB => sub { which("$config{cross_compile_prefix}ranlib")
+ ? "ranlib" : "" },
+ RC => "windres",
+
+ shared_extension => ".so",
build_scheme => [ "unified", "unix" ],
build_file => "Makefile",
build_scheme => [ "unified", "unix" ],
build_file => "Makefile",
@@
-85,6
+112,15
@@
my %targets=(
inherit_from => [ "BASE_common" ],
template => 1,
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}) {
ex_libs =>
sub {
unless ($disabled{zlib}) {
@@
-95,19
+131,21
@@
my %targets=(
return ();
},
return ();
},
-
ld
=> "link",
-
lflags
=> "/nologo",
- l
outflag
=> "/out:",
-
ar
=> "lib",
-
arflags
=> "/nologo",
+
LD
=> "link",
+
LDFLAGS
=> "/nologo",
+ l
doutflag
=> "/out:",
+
AR
=> "lib",
+
ARFLAGS
=> "/nologo",
aroutflag => "/out:",
aroutflag => "/out:",
-
rc
=> "rc",
+
RC
=> "rc",
rcoutflag => "/fo",
rcoutflag => "/fo",
-
mt
=> "mt",
-
mtflags
=> "-nologo",
+
MT
=> "mt",
+
MTFLAGS
=> "-nologo",
mtinflag => "-manifest ",
mtoutflag => "-outputresource:",
mtinflag => "-manifest ",
mtoutflag => "-outputresource:",
+ shared_extension => ".dll",
+
build_file => "makefile",
build_scheme => [ "unified", "windows" ],
},
build_file => "makefile",
build_scheme => [ "unified", "windows" ],
},
@@
-116,13
+154,25
@@
my %targets=(
inherit_from => [ "BASE_common" ],
template => 1,
inherit_from => [ "BASE_common" ],
template => 1,
+ includes =>
+ add(sub {
+ my @incs = ();
+ # GNV$ZLIB_INCLUDE is the standard logical name for later
+ # zlib incarnations.
+ push @incs, 'GNV$ZLIB_INCLUDE:'
+ if !$disabled{zlib} && !$withargs{zlib_include};
+ return [ @incs ];
+ }),
+
+ shared_extension => ".exe",
+
build_file => "descrip.mms",
build_scheme => [ "unified", "VMS" ],
},
uplink_common => {
template => 1,
build_file => "descrip.mms",
build_scheme => [ "unified", "VMS" ],
},
uplink_common => {
template => 1,
- apps_
aux_src
=> add("../ms/applink.c"),
+ apps_
init_src
=> add("../ms/applink.c"),
uplink_aux_src => add("../ms/uplink.c"),
defines => add("OPENSSL_USE_APPLINK"),
},
uplink_aux_src => add("../ms/uplink.c"),
defines => add("OPENSSL_USE_APPLINK"),
},
@@
-172,7
+222,7
@@
my %targets=(
template => 1,
cpuid_asm_src => "x86_64cpuid.s",
bn_asm_src => "asm/x86_64-gcc.c x86_64-mont.s x86_64-mont5.s x86_64-gf2m.s rsaz_exp.c rsaz-x86_64.s rsaz-avx2.s",
template => 1,
cpuid_asm_src => "x86_64cpuid.s",
bn_asm_src => "asm/x86_64-gcc.c x86_64-mont.s x86_64-mont5.s x86_64-gf2m.s rsaz_exp.c rsaz-x86_64.s rsaz-avx2.s",
- ec_asm_src => "ecp_nistz256.c ecp_nistz256-x86_64.s",
+ ec_asm_src => "ecp_nistz256.c ecp_nistz256-x86_64.s
x25519-x86_64.s
",
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",
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",
@@
-183,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",
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,
},
ia64_asm => {
template => 1,
@@
-244,6
+295,7
@@
my %targets=(
modes_asm_src => "ghash-s390x.S",
chacha_asm_src => "chacha-s390x.S",
poly1305_asm_src=> "poly1305-s390x.S",
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,
},
armv4_asm => {
template => 1,
@@
-254,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",
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 => {
perlasm_scheme => "void"
},
aarch64_asm => {
@@
-267,6
+320,7
@@
my %targets=(
modes_asm_src => "ghashv8-armx.S",
chacha_asm_src => "chacha-armv8.S",
poly1305_asm_src=> "poly1305-armv8.S",
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,
},
parisc11_asm => {
template => 1,
@@
-296,7
+350,7
@@
my %targets=(
ppc64_asm => {
inherit_from => [ "ppc32_asm" ],
template => 1,
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",
},
);
},
);