"ssl3-method" => [ "ssl3" ],
"zlib" => [ "zlib-dynamic" ],
"des" => [ "mdc2" ],
- "ec" => [ "ecdsa", "ecdh" ],
-
+ "ec" => [ "ecdsa", "ecdh", "sm2" ],
+ sub { $disabled{"ec"} && $disabled{"dh"} }
+ => [ "tls1_3" ],
"dgram" => [ "dtls", "sctp" ],
"sock" => [ "dgram" ],
"dtls" => [ @dtls ],
"apps" => [ "tests" ],
"tests" => [ "external-tests" ],
"comp" => [ "zlib" ],
- "ec" => [ "tls1_3", "sm2" ],
"sm3" => [ "sm2" ],
sub { !$disabled{"unit-test"} } => [ "heartbeats" ],
delete $disabled{$feature};
}
}
+
+# If uplink_arch isn't defined, disable uplink
+$disabled{uplink} = 'no uplink_arch' unless (defined $target{uplink_arch});
+# If asm_arch isn't defined, disable asm
+$disabled{asm} = 'no asm_arch' unless (defined $target{asm_arch});
+
disable(); # Run a cascade now
$target{CXXFLAGS}//=$target{CFLAGS} if $target{CXX};
}
unless ($disabled{asm}) {
- $target{cpuid_asm_src}=$table{DEFAULTS}->{cpuid_asm_src} if ($config{processor} eq "386");
- if ($target{cpuid_asm_src} ne "mem_clr.c") {
- push @{$config{lib_defines}}, "OPENSSL_CPUID_OBJ";
- push @{$config{module_defines}}, "OPENSSL_CPUID_OBJ";
- }
-
- $target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m}));
-
- # bn-586 is the only one implementing bn_*_part_words
- if ($target{bn_asm_src} =~ /bn-586/) {
- push @{$config{lib_defines}}, "OPENSSL_BN_ASM_PART_WORDS";
- push @{$config{module_defines}}, "OPENSSL_BN_ASM_PART_WORDS";
- }
- if (!$disabled{sse2} && $target{bn_asm_src} =~ /86/) {
- push @{$config{lib_defines}}, "OPENSSL_IA32_SSE2";
- push @{$config{module_defines}}, "OPENSSL_IA32_SSE2";
- }
-
- if ($target{bn_asm_src} =~ /-mont/) {
- push @{$config{lib_defines}}, "OPENSSL_BN_ASM_MONT";
- push @{$config{module_defines}}, "OPENSSL_BN_ASM_MONT";
- }
- if ($target{bn_asm_src} =~ /-mont5/) {
- push @{$config{lib_defines}}, "OPENSSL_BN_ASM_MONT5";
- push @{$config{module_defines}}, "OPENSSL_BN_ASM_MONT5";
- }
- if ($target{bn_asm_src} =~ /-gf2m/) {
- push @{$config{lib_defines}}, "OPENSSL_BN_ASM_GF2m";
- push @{$config{module_defines}}, "OPENSSL_BN_ASM_GF2m";
- }
- if ($target{bn_asm_src} =~ /-div3w/) {
- push @{$config{lib_defines}}, "BN_DIV3W";
- push @{$config{module_defines}}, "BN_DIV3W";
- }
-
- if ($target{sha1_asm_src}) {
- push @{$config{lib_defines}}, "SHA1_ASM" if ($target{sha1_asm_src} =~ /sx86/ || $target{sha1_asm_src} =~ /sha1/);
- push @{$config{lib_defines}}, "SHA256_ASM" if ($target{sha1_asm_src} =~ /sha256/);
- push @{$config{lib_defines}}, "SHA512_ASM" if ($target{sha1_asm_src} =~ /sha512/);
- }
- if ($target{keccak1600_asm_src} ne $table{DEFAULTS}->{keccak1600_asm_src}) {
- push @{$config{lib_defines}}, "KECCAK1600_ASM";
- }
- if ($target{rc4_asm_src} ne $table{DEFAULTS}->{rc4_asm_src}) {
- push @{$config{lib_defines}}, "RC4_ASM";
- }
- if ($target{md5_asm_src}) {
- push @{$config{lib_defines}}, "MD5_ASM";
- }
- $target{cast_asm_src}=$table{DEFAULTS}->{cast_asm_src} unless $disabled{pic}; # CAST assembler is not PIC
- if ($target{rmd160_asm_src}) {
- push @{$config{lib_defines}}, "RMD160_ASM";
- }
- if ($target{aes_asm_src}) {
- if ($target{aes_asm_src} =~ m/\baes-/) {
- push @{$config{lib_defines}}, "AES_ASM";
- push @{$config{module_defines}}, "AES_ASM";
- }
- # aes-ctr.fake is not a real file, only indication that assembler
- # module implements AES_ctr32_encrypt...
- if ($target{aes_asm_src} =~ s/\s*aes-ctr\.fake//) {
- push @{$config{lib_defines}}, "AES_CTR_ASM";
- push @{$config{module_defines}}, "AES_CTR_ASM";
- }
- # aes-xts.fake indicates presence of AES_xts_[en|de]crypt...
- if ($target{aes_asm_src} =~ s/\s*aes-xts\.fake//) {
- push @{$config{lib_defines}}, "AES_XTS_ASM";
- push @{$config{module_defines}}, "AES_XTS_ASM";
- }
- $target{aes_asm_src} =~ s/\s*(vpaes|aesni)-x86\.s//g if ($disabled{sse2});
- if ($target{aes_asm_src} =~ m/vpaes/) {
- push @{$config{lib_defines}}, "VPAES_ASM";
- push @{$config{module_defines}}, "VPAES_ASM";
- }
- if ($target{aes_asm_src} =~ m/bsaes/) {
- push @{$config{lib_defines}}, "BSAES_ASM";
- push @{$config{module_defines}}, "BSAES_ASM";
- }
- }
- if ($target{wp_asm_src} =~ /mmx/) {
- if ($config{processor} eq "386") {
- $target{wp_asm_src}=$table{DEFAULTS}->{wp_asm_src};
- } elsif (!$disabled{"whirlpool"}) {
- push @{$config{lib_defines}}, "WHIRLPOOL_ASM";
- }
- }
- if ($target{modes_asm_src} =~ /ghash-/) {
- push @{$config{lib_defines}}, "GHASH_ASM";
- }
- if ($target{ec_asm_src} =~ /ecp_nistz256/) {
- push @{$config{lib_defines}}, "ECP_NISTZ256_ASM";
- }
- if ($target{ec_asm_src} =~ /x25519/) {
- push @{$config{lib_defines}}, "X25519_ASM";
- }
- if ($target{padlock_asm_src} ne $table{DEFAULTS}->{padlock_asm_src}) {
- push @{$config{dso_defines}}, "PADLOCK_ASM";
- }
- if ($target{poly1305_asm_src} ne "") {
- push @{$config{lib_defines}}, "POLY1305_ASM";
- }
}
my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
# Deal with bn_ops ###################################################
$config{bn_ll} =0;
-$config{export_var_as_fn} =0;
my $def_int="unsigned int";
$config{rc4_int} =$def_int;
($config{b64l},$config{b64},$config{b32})=(0,0,1);
my $count = 0;
foreach (sort split(/\s+/,$target{bn_ops})) {
$count++ if /SIXTY_FOUR_BIT|SIXTY_FOUR_BIT_LONG|THIRTY_TWO_BIT/;
- $config{export_var_as_fn}=1 if $_ eq 'EXPORT_VAR_AS_FN';
$config{bn_ll}=1 if $_ eq 'BN_LLONG';
$config{rc4_int}="unsigned char" if $_ eq 'RC4_CHAR';
($config{b64l},$config{b64},$config{b32})
my %depends = ();
my %generate = ();
+ # Support for $variablename in build.info files.
+ # Embedded perl code is the ultimate master, still. If its output
+ # contains a dollar sign, it had better be escaped, or it will be
+ # taken for a variable name prefix.
+ my %variables = ();
+ my $variable_re = qr/\$([[:alpha:]][[:alnum:]_]*)/;
+ my $expand_variables = sub {
+ my $value = '';
+ my $value_rest = shift;
+
+ while ($value_rest =~ /(?<!\\)${variable_re}/) {
+ $value .= $`;
+ $value .= $variables{$1};
+ $value_rest = $';
+ }
+ return $value . $value_rest;
+ };
+
# We want to detect configdata.pm in the source tree, so we
# don't use it if the build tree is different.
my $src_configdata = cleanfile($srcdir, "configdata.pm", $blddir);
qr/^\s*IF\[((?:\\.|[^\\\]])*)\]\s*$/
=> sub {
if (! @skip || $skip[$#skip] > 0) {
- push @skip, !! $1;
+ push @skip, !! $expand_variables->($1);
} else {
push @skip, -1;
}
=> sub { die "ELSIF out of scope" if ! @skip;
die "ELSIF following ELSE" if abs($skip[$#skip]) == 2;
$skip[$#skip] = -1 if $skip[$#skip] != 0;
- $skip[$#skip] = !! $1
+ $skip[$#skip] = !! $expand_variables->($1)
if $skip[$#skip] == 0; },
qr/^\s*ELSE\s*$/
=> sub { die "ELSE out of scope" if ! @skip;
qr/^\s*ENDIF\s*$/
=> sub { die "ENDIF out of scope" if ! @skip;
pop @skip; },
+ qr/^\s*${variable_re}\s*=\s*(.*?)\s*$/
+ => sub {
+ if (!@skip || $skip[$#skip] > 0) {
+ my $n = $1;
+ my $v = $2;
+ $variables{$n} = $expand_variables->($v);
+ }
+ },
qr/^\s*SUBDIRS\s*=\s*(.*)\s*$/
=> sub {
if (!@skip || $skip[$#skip] > 0) {
- foreach (tokenize($1)) {
+ foreach (tokenize($expand_variables->($1))) {
push @build_dirs, [ @curd, splitdir($_, 1) ];
}
}
=> sub {
if (!@skip || $skip[$#skip] > 0) {
my @a = tokenize($1, qr|\s*,\s*|);
- my @p = tokenize($2);
+ my @p = tokenize($expand_variables->($2));
push @programs, @p;
foreach my $a (@a) {
my $ak = $a;
=> sub {
if (!@skip || $skip[$#skip] > 0) {
my @a = tokenize($1, qr|\s*,\s*|);
- my @l = tokenize($2);
+ my @l = tokenize($expand_variables->($2));
push @libraries, @l;
foreach my $a (@a) {
my $ak = $a;
=> sub {
if (!@skip || $skip[$#skip] > 0) {
my @a = tokenize($1, qr|\s*,\s*|);
- my @m = tokenize($2);
+ my @m = tokenize($expand_variables->($2));
push @modules, @m;
foreach my $a (@a) {
my $ak = $a;
=> sub {
if (!@skip || $skip[$#skip] > 0) {
my @a = tokenize($1, qr|\s*,\s*|);
- my @s = tokenize($2);
+ my @s = tokenize($expand_variables->($2));
push @scripts, @s;
foreach my $a (@a) {
my $ak = $a;
},
qr/^\s*ORDINALS\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/,
- => sub { push @{$ordinals{$1}}, tokenize($2)
+ => sub { push @{$ordinals{$1}}, tokenize($expand_variables->($2))
if !@skip || $skip[$#skip] > 0 },
qr/^\s*SOURCE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
- => sub { push @{$sources{$1}}, tokenize($2)
+ => sub { push @{$sources{$1}}, tokenize($expand_variables->($2))
if !@skip || $skip[$#skip] > 0 },
qr/^\s*SHARED_SOURCE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
- => sub { push @{$shared_sources{$1}}, tokenize($2)
+ => sub { push @{$shared_sources{$1}},
+ tokenize($expand_variables->($2))
if !@skip || $skip[$#skip] > 0 },
qr/^\s*INCLUDE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
- => sub { push @{$includes{$1}}, tokenize($2)
+ => sub { push @{$includes{$1}}, tokenize($expand_variables->($2))
if !@skip || $skip[$#skip] > 0 },
qr/^\s*DEFINE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
- => sub { push @{$defines{$1}}, tokenize($2)
+ => sub { push @{$defines{$1}}, tokenize($expand_variables->($2))
if !@skip || $skip[$#skip] > 0 },
qr/^\s*DEPEND\[((?:\\.|[^\\\]])*)\]\s*=\s*(.*)\s*$/
- => sub { push @{$depends{$1}}, tokenize($2)
+ => sub { push @{$depends{$1}}, tokenize($expand_variables->($2))
if !@skip || $skip[$#skip] > 0 },
qr/^\s*GENERATE\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/
=> sub { push @{$generate{$1}}, $2
# Thus, whenever there's mention of a returned value, it's about that
# intended value.
-# Helper function to implement conditional inheritance depending on the
-# value of $disabled{asm}. Used in inherit_from values as follows:
-#
-# inherit_from => [ "template", asm("asm_tmpl") ]
-#
-sub asm {
- my @x = @_;
- sub {
- $disabled{asm} ? () : @x;
- }
-}
-
# Helper function to implement conditional value variants, with a default
# plus additional values based on the value of $config{build_type}.
# Arguments are given in hash table form:
"includes",
"cc",
"cflags",
- "unistd",
"ld",
"lflags",
"loutflag",
"ex_libs",
"bn_ops",
- "apps_aux_src",
- "cpuid_asm_src",
- "uplink_aux_src",
- "bn_asm_src",
- "ec_asm_src",
- "des_asm_src",
- "aes_asm_src",
- "bf_asm_src",
- "md5_asm_src",
- "cast_asm_src",
- "sha1_asm_src",
- "rc4_asm_src",
- "rmd160_asm_src",
- "rc5_asm_src",
- "wp_asm_src",
- "cmll_asm_src",
- "modes_asm_src",
- "padlock_asm_src",
- "chacha_asm_src",
"poly1035_asm_src",
"thread_scheme",
"perlasm_scheme",
projects / openssl.git / blobdiff