X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Configure;h=96f88b253de343d2ca500880c767a41aa4800b51;hp=3a5bd8e9de9edb7eee77a51aab23f95d97e52474;hb=88087414def54cd55dfebc172f17f79ed7d3034a;hpb=3e45d39347dc901fa2f8c9bded8d2b3940c103f0 diff --git a/Configure b/Configure index 3a5bd8e9de..96f88b253d 100755 --- a/Configure +++ b/Configure @@ -4,7 +4,7 @@ ## ## Configure -- OpenSSL source tree configuration script ## If editing this file, run this command before committing -## make -f Makefile.org TABLE +## make -f Makefile.in TABLE ## require 5.000; @@ -14,25 +14,27 @@ use File::Spec::Functions; # see INSTALL for instructions. -my $usage="Usage: Configure [no- ...] [enable- ...] [experimental- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] [--config=FILE] os/compiler[:flags]\n"; +my $usage="Usage: Configure [no- ...] [enable- ...] [experimental- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-egd] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags]\n"; # Options: # # --config add the given configuration file, which will be read after # any "Configurations*" files that are found in the same # directory as this script. -# --openssldir install OpenSSL in OPENSSLDIR (Default: DIR/ssl if the -# --prefix option is given; /usr/local/ssl otherwise) -# --prefix prefix for the OpenSSL include, lib and bin directories -# (Default: the OPENSSLDIR directory) +# --prefix prefix for the OpenSSL installation, which includes the +# directories bin, lib, include, share/man, share/doc/openssl +# This becomes the value of INSTALLTOP in Makefile +# (Default: /usr/local) +# --openssldir OpenSSL data area, such as openssl.cnf, certificates and keys. +# If it's a relative directory, it will be added on the directory +# given with --prefix. +# This becomes the value of OPENSSLDIR in Makefile and in C. +# (Default: PREFIX/ssl) # # --install_prefix Additional prefix for package builders (empty by # default). This needn't be set in advance, you can # just as well use "make INSTALL_PREFIX=/whatever install". # -# --test-sanity Make a number of sanity checks on the data in this file. -# This is a debugging tool for OpenSSL developers. -# # --cross-compile-prefix Add specified prefix to binutils components. # # --api One of 0.9.8, 1.0.0 or 1.1.0. Do not compile support for @@ -50,6 +52,7 @@ my $usage="Usage: Configure [no- ...] [enable- ...] [experimenta # no-asm do not use assembler # no-dso do not compile in any native shared-library methods. This # will ensure that all methods just return NULL. +# no-egd do not compile support for the entropy-gathering daemon APIs # [no-]zlib [don't] compile support for zlib compression. # zlib-dynamic Like "zlib", but the zlib library is expected to be a shared # library and will be loaded in run-time by the OpenSSL library. @@ -100,7 +103,7 @@ my $usage="Usage: Configure [no- ...] [enable- ...] [experimenta # Minimum warning options... any contributions to OpenSSL should at least get # past these. -my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Wtype-limits -Werror -DCRYPTO_MDEBUG -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DDEBUG_UNUSED"; +my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Wtype-limits -Werror -DREF_CHECK -DDEBUG_UNUSED"; # These are used in addition to $gcc_devteam_warn when the compiler is clang. # TODO(openssl-team): fix problems and investigate if (at least) the @@ -126,11 +129,6 @@ my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL"; # MD2_CHAR slags pentium pros my $x86_gcc_opts="RC4_INDEX MD2_INT"; -#$bits1="SIXTEEN_BIT "; -#$bits2="THIRTY_TWO_BIT "; -my $bits1="THIRTY_TWO_BIT "; -my $bits2="SIXTY_FOUR_BIT "; - # As for $BSDthreads. Idea is to maintain "collective" set of flags, # which would cover all BSD flavors. -pthread applies to them all, # but is treated differently. OpenBSD expands is as -D_POSIX_THREAD @@ -150,620 +148,23 @@ my $apitable = { "0.9.8" => "0x00908000L", }; -# table of known configurations, read in from files -# -# The content of each entry can take one of two forms: -# -# - old style config-string, colon seperated fields with exactly the -# following structure.: -# -# $cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $ec_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $wp_obj : $cmll_obj : $modes_obj : $engines_obj : $perlasm_scheme : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags : $multilib -# -# We use the stringtohash function - defined below - to combine with the -# fields and form a proper hash table from the string. -# -# - direct transfer of old style config string to hash table, using the names -# of the fields as keys: -# -# { -# cc => $cc, -# cflags => $cflags, -# unistd => $unistd, -# thread_cflag => $thread_cflag, -# sys_id => $sys_id, -# lflags => $lflags, -# bn_ops => $bn_ops, -# cpuid_obj => $cpuid_obj, -# bn_obj => $bn_obj, -# ec_obj => $ec_obj, -# des_obj => $des_obj, -# aes_obj => $aes_obj, -# bf_obj => $bf_obj, -# md5_obj => $md5_obj, -# sha1_obj => $sha1_obj, -# cast_obj => $cast_obj, -# rc4_obj => $rc4_obj, -# rmd160_obj => $rmd160_obj, -# rc5_obj => $rc5_obj, -# wp_obj => $wp_obj, -# cmll_obj => $cmll_obj, -# modes_obj => $modes_obj, -# engines_obj => $engines_obj, -# perlasm_scheme => $perlasm_scheme, -# dso_scheme => $dso_scheme, -# shared_target => $shared_target, -# shared_cflag => $shared_cflag, -# shared_ldflag => $shared_ldflag, -# shared_extension => $shared_extension, -# ranlib => $ranlib, -# arflags => $arflags, -# multilib => $multilib -# } -# -# - new style config hash table, which has additional attributes for debug -# and non-debug flags to be added to the common flags, for cflags and lflags: -# -# { -# cc => $cc, -# cflags => $cflags, -# debug_cflags => $debug_cflags, -# release_cflags => $release_cflags, -# unistd => $unistd, -# thread_cflag => $thread_cflag, -# sys_id => $sys_id, -# lflags => $lflags, -# debug_lflags => $debug_lflags, -# release_lflags => $release_lflags, -# bn_ops => $bn_ops, -# cpuid_obj => $cpuid_obj, -# bn_obj => $bn_obj, -# ec_obj => $ec_obj, -# des_obj => $des_obj, -# aes_obj => $aes_obj, -# bf_obj => $bf_obj, -# md5_obj => $md5_obj, -# sha1_obj => $sha1_obj, -# cast_obj => $cast_obj, -# rc4_obj => $rc4_obj, -# rmd160_obj => $rmd160_obj, -# rc5_obj => $rc5_obj, -# wp_obj => $wp_obj, -# cmll_obj => $cmll_obj, -# modes_obj => $modes_obj, -# engines_obj => $engines_obj, -# chacha_obj => $wp_obj, -# poly1305_obj => $cmll_obj, -# dso_scheme => $dso_scheme, -# shared_target => $shared_target, -# shared_cflag => $shared_cflag, -# shared_ldflag => $shared_ldflag, -# shared_extension => $shared_extension, -# ranlib => $ranlib, -# arflags => $arflags, -# multilib => $multilib -# } -# -# The configuration reader will do what it can to translate everything into -# new style config hash tables, including merging $target and debug-$target -# if they are similar enough. -# -# The configuration hashes can refer to templates in two different manners: -# -# - as part of the hash, one can have a key called 'inherit_from' that -# indicate what other configuration hashes to inherit data from. -# These are resolved recursively. -# -# Inheritance works as a set of default values that can be overriden -# by corresponding attribute values in the inheriting configuration. -# -# If several configurations are given in the 'inherit_from' array, the -# values of same attribute are concatenated with space separation. -# With this, it's possible to have several smaller templates for -# different configuration aspects that can be combined into a complete -# configuration. -# -# Example: -# -# "foo" => { -# template => 1, -# haha => "haha", -# hoho => "ho" -# }, -# "bar" => { -# template => 1, -# hoho => "ho", -# hehe => "hehe" -# }, -# "laughter" => { -# inherit_from => [ "foo", "bar" ], -# } -# -# The entry for "foo" will become as follows after processing: -# -# "laughter" => { -# haha => "haha", -# hoho => "ho ho", -# hehe => "hehe" -# } -# -# Note 1: any entry from the table can be used as a template. -# Note 2: pure templates have the attribute 'template => 1' and cannot -# be used as targets. -# -# - instead of a string, one can have a code block of the form -# 'sub { /* your code here */ }', where the arguments are the list of -# inherited values for that key. In fact, the concatenation of strings -# is really done by using 'sub { join(" ",@_) }' on the list of inherited -# values. -# -# Example: -# -# "foo" => { -# template => 1, -# haha => "ha ha", -# hoho => "ho", -# ignored => "This should not appear in the end result", -# }, -# "bar" => { -# template => 1, -# haha => "ah", -# hoho => "haho", -# hehe => "hehe" -# }, -# "laughter" => { -# inherit_from => [ "foo", "bar" ], -# hehe => sub { join(" ",(@_,"!!!")) }, -# ignored => "", -# } -# -# The entry for "foo" will become as follows after processing: -# -# "laughter" => { -# haha => "ha ha ah", -# hoho => "ho haho", -# hehe => "hehe !!!", -# ignored => "" -# } -# - -my %table=( - - # All these templates are merely a translation of the corresponding - # variables further up. - # - # Note: as long as someone might use old style configuration strings, - # or we bother supporting that, those variables need to stay - - x86_asm => { - template => 1, - cpuid_obj => "x86cpuid.o", - bn_obj => "bn-586.o co-586.o x86-mont.o x86-gf2m.o", - ec_obj => "ecp_nistz256.o ecp_nistz256-x86.o", - des_obj => "des-586.o crypt586.o", - aes_obj => "aes-586.o vpaes-x86.o aesni-x86.o", - bf_obj => "bf-586.o", - md5_obj => "md5-586.o", - sha1_obj => "sha1-586.o sha256-586.o sha512-586.o", - rc4_obj => "rc4-586.o", - rmd160_obj => "rmd-586.o", - rc5_obj => "rc5-586.o", - wp_obj => "wp_block.o wp-mmx.o", - cmll_obj => "cmll-x86.o", - modes_obj => "ghash-x86.o", - engines_obj => "e_padlock-x86.o" - }, - x86_elf_asm => { - template => 1, - inherit_from => [ "x86_asm" ], - perlasm_scheme => "elf" - }, - x86_64_asm => { - template => 1, - cpuid_obj => "x86_64cpuid.o", - bn_obj => "x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o rsaz_exp.o rsaz-x86_64.o rsaz-avx2.o", - ec_obj => "ecp_nistz256.o ecp_nistz256-x86_64.o", - aes_obj => "aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o aesni-sha256-x86_64.o aesni-mb-x86_64.o", - md5_obj => "md5-x86_64.o", - sha1_obj => "sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o sha1-mb-x86_64.o sha256-mb-x86_64.o", - rc4_obj => "rc4-x86_64.o rc4-md5-x86_64.o", - wp_obj => "wp-x86_64.o", - cmll_obj => "cmll-x86_64.o cmll_misc.o", - modes_obj => "ghash-x86_64.o aesni-gcm-x86_64.o", - engines_obj => "e_padlock-x86_64.o" - }, - ia64_asm => { - template => 1, - cpuid_obj => "ia64cpuid.o", - bn_obj => "bn-ia64.o ia64-mont.o", - aes_obj => "aes_core.o aes_cbc.o aes-ia64.o", - md5_obj => "md5-ia64.o", - sha1_obj => "sha1-ia64.o sha256-ia64.o sha512-ia64.o", - rc4_obj => "rc4-ia64.o rc4_skey.o", - modes_obj => "ghash-ia64.o", - perlasm_scheme => "void" - }, - sparcv9_asm => { - template => 1, - cpuid_obj => "sparcv9cap.o sparccpuid.o", - bn_obj => "bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.o", - ec_obj => "ecp_nistz256.o ecp_nistz256-sparcv9.o", - des_obj => "des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o", - aes_obj => "aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o", - md5_obj => "md5-sparcv9.o", - sha1_obj => "sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o", - cmll_obj => "camellia.o cmll_misc.o cmll_cbc.o cmllt4-sparcv9.o", - modes_obj => "ghash-sparcv9.o", - perlasm_scheme => "void" - }, - sparcv8_asm => { - template => 1, - cpuid_obj => "", - bn_obj => "sparcv8.o", - des_obj => "des_enc-sparc.o fcrypt_b.o", - perlasm_scheme => "void" - }, - alpha_asm => { - template => 1, - cpuid_obj => "alphacpuid.o", - bn_obj => "bn_asm.o alpha-mont.o", - sha1_obj => "sha1-alpha.o", - modes_obj => "ghash-alpha.o", - perlasm_scheme => "void" - }, - mips32_asm => { - template => 1, - bn_obj => "bn-mips.o mips-mont.o", - aes_obj => "aes_cbc.o aes-mips.o", - sha1_obj => "sha1-mips.o sha256-mips.o", - }, - mips64_asm => { - inherit_from => [ "mips32_asm" ], - template => 1, - sha1_obj => sub { join(" ", @_, "sha512-mips.o") } - }, - s390x_asm => { - template => 1, - cpuid_obj => "s390xcap.o s390xcpuid.o", - bn_obj => "bn-s390x.o s390x-mont.o s390x-gf2m.o", - aes_obj => "aes-s390x.o aes-ctr.o aes-xts.o", - sha1_obj => "sha1-s390x.o sha256-s390x.o sha512-s390x.o", - rc4_obj => "rc4-s390x.o", - modes_obj => "ghash-s390x.o", - }, - armv4_asm => { - template => 1, - cpuid_obj => "armcap.o armv4cpuid.o", - bn_obj => "bn_asm.o armv4-mont.o armv4-gf2m.o", - ec_obj => "ecp_nistz256.o ecp_nistz256-armv4.o", - aes_obj => "aes_cbc.o aes-armv4.o bsaes-armv7.o aesv8-armx.o", - sha1_obj => "sha1-armv4-large.o sha256-armv4.o sha512-armv4.o", - modes_obj => "ghash-armv4.o ghashv8-armx.o", - perlasm_scheme => "void" - }, - aarch64_asm => { - template => 1, - cpuid_obj => "armcap.o arm64cpuid.o mem_clr.o", - ec_obj => "ecp_nistz256.o ecp_nistz256-armv8.o", - bn_obj => "bn_asm.o armv8-mont.o", - aes_obj => "aes_core.o aes_cbc.o aesv8-armx.o vpaes-armv8.o", - sha1_obj => "sha1-armv8.o sha256-armv8.o sha512-armv8.o", - modes_obj => "ghashv8-armx.o", - }, - parisc11_asm => { - template => 1, - cpuid_obj => "pariscid.o", - bn_obj => "bn_asm.o parisc-mont.o", - aes_obj => "aes_core.o aes_cbc.o aes-parisc.o", - sha1_obj => "sha1-parisc.o sha256-parisc.o sha512-parisc.o", - rc4_obj => "rc4-parisc.o", - modes_obj => "ghash-parisc.o", - perlasm_scheme => "32" - }, - parisc20_64_asm => { - template => 1, - inherit_from => [ "parisc11_asm" ], - bn_obj => sub { my $r=join(" ",@_); $r=~s/bn_asm/pa-risc2W/; $r; }, - perlasm_scheme => "64", - }, - ppc64_asm => { - template => 1, - cpuid_obj => "ppccpuid.o ppccap.o", - bn_obj => "bn-ppc.o ppc-mont.o ppc64-mont.o", - aes_obj => "aes_core.o aes_cbc.o aes-ppc.o vpaes-ppc.o aesp8-ppc.o", - sha1_obj => "sha1-ppc.o sha256-ppc.o sha512-ppc.o sha256p8-ppc.o sha512p8-ppc.o", - modes_obj => "ghashp8-ppc.o", - }, - ppc32_asm => { - inherit_from => [ "ppc64_asm" ], - template => 1 - }, -); +my $base_target = "BASE"; # The template that all other inherit from +our %table = (); -{ my $no_asm_templates=0; - foreach (@ARGV) { $no_asm_templates=1 if (/^\-?no\-asm$/); } - sub asm { $no_asm_templates?():@_; } -} +# Forward declarations ############################################### +# read_config(filename) +# +# Reads a configuration file and populates %table with the contents +# (which the configuration file places in %targets). +sub read_config; -sub stringtohash { - my $in = shift @_; - if (ref($in) eq "HASH") { - return $in; - } - my @stringsequence = ( - "cc", - "cflags", - "unistd", - "thread_cflag", - "sys_id", - "lflags", - "bn_ops", - "cpuid_obj", - "bn_obj", - "ec_obj", - "des_obj", - "aes_obj", - "bf_obj", - "md5_obj", - "sha1_obj", - "cast_obj", - "rc4_obj", - "rmd160_obj", - "rc5_obj", - "wp_obj", - "cmll_obj", - "modes_obj", - "engines_obj", - "perlasm_scheme", - "dso_scheme", - "shared_target", - "shared_cflag", - "shared_ldflag", - "shared_extension", - "ranlib", - "arflags", - "multilib", - ); - - # return a ref to a hash, that's what the outer braces are for. - return { map { shift @stringsequence => $_ } split /:/, $in }; -}; - -# Read configuration target stanzas from a file, so that people can have -# local files with their own definitions -sub read_config { - my $fname = shift; - open(CONFFILE, "< $fname") - or die "Can't open configuration file '$fname'!\n"; - my $x = $/; - undef $/; - my $content = ; - $/ = $x; - close(CONFFILE); - my %targets = (); - eval $content; - - # Make sure we have debug- targets first - my @keys = - sort { - my $a_nd = $a =~ m/^debug-/ ? $' :$a; - my $b_nd = $b =~ m/^debug-/ ? $' :$b; - my $res = 0; - - if (($a_nd == $a) == ($b_nd == $b)) { - # they are both debug- or not, compare them as they are - $res = $a cmp $b; - } elsif ($a_nd != $a) { - # $a is debug-, make it lesser - $res = -1; - } else { - # $b is debug-, make $a greater - $res = 1; - } - $res; - } keys %targets; - - foreach (@keys) { - if (ref($targets{$_}) ne "HASH") { - # Value is assumed to be a string. Split it up to - # become a hash table of parameters. Also, try to - # merge debug- variants with the non-debug target. - - # Start with converting the value from a string to a - # standardised hash of fields. Using $tohash is safe, - # if the input is already a hash ref, it's just returned - # back. - $targets{$_} = stringtohash($targets{$_}); - - # If the current target is a debug target, there might - # be a corresponding non-debug target that we can merge - # with. If it isn't a debug- target, we've already done - # as much merging as we can and do not need to bother - # with that any more. - if ($_ =~ m/^debug-/) { - my $debugkey = $_; - my $nondebugkey = $'; - my $debug = $targets{$debugkey}; - my $nondebug; - - if ($targets{$nondebugkey}) { - $nondebug = stringtohash($targets{$nondebugkey}); - } - - if ($nondebug) { - # There's both a debug and non-debug variant of - # this target, so we should try to merge them - # together. - - # First, check that the non-debug variant isn't - # already built up with all it should have. - if ($nondebug->{debug_cflags} - || $nondebug->{release_cflags} - || $nondebug->{debug_lflags} - || $nondebug->{release_lflags}) { - warn "there's a debug target $debugkey to be merged with a target $nondebugkey, but the latter seems to already have both nodebug and debug information. This requires human intervention. Skipping $debugkey..."; - next; - } - - # Now, check similarity. - # For keys they have in common, support that - # cflags and lflags can differ, otherwise they - # must have exactly the same values for them - # to be merged into one. - my $similarenough = 1; - for (keys %{$debug}) { - if ($nondebug->{$_} ne $debug->{$_} - && $_ !~ m/^[cl]flags$/) { - $similarenough = 0; - last; - } - } - - if ($similarenough) { - # Here's where the magic happens, split the - # options in the debug and non-debug variants - # cflags and ldflags into three strings each, - # one with common flags, one with extra debug - # flags and one with extra non-debug flags. - - # The result ends up in %h_nondebug, which - # becomes the merged variant when we're done. - # for each of cflags and lflags, they are - # replaced with cflags, debug_cflags, - # release_cflags and similar for lflags. - # - # The purpose is that 'cflags' should be - # used together with 'debug_cflags' or - # 'release_cflags' depending on what the - # user asks for. - foreach (("cflags", "lflags")) { - my @list_d = split /\s+/, $debug->{$_}; - my @list_nd = split /\s+/, $nondebug->{$_}; - my %presence = (); # bitmap - # 1: present in @list_d - # 2: present in @list_nd - # 3: present in both - map { $presence{$_} += 1; } @list_d; - map { $presence{$_} += 2; } @list_nd; - - delete $nondebug->{$_}; - # Note: we build from the original lists to - # preserve order, it might be important - $nondebug->{"debug-".$_} = - join(" ", - grep { $presence{$_} == 1 } @list_d); - $nondebug->{"nodebug-".$_} = - join(" ", - grep { $presence{$_} == 2 } @list_nd); - $nondebug->{$_} = - join(" ", - grep { $presence{$_} == 3 } @list_d); - } - - $targets{$nondebugkey} = $nondebug; - delete $targets{$debugkey}; - } - } - } - } - } - - %table = (%table, %targets); - - # Local function to resolve inheritance - my $resolve_inheritance; - $resolve_inheritance = - sub { - my $target = shift; - my @breadcrumbs = @_; - - if (grep { $_ eq $target } @breadcrumbs) { - die "inherit_from loop! target backtrace:\n " - ,$target,"\n ",join("\n ", @breadcrumbs),"\n"; - } - - # Recurse through all inheritances. They will be resolved on - # the fly, so when this operation is done, they will all just - # be a bunch of attributes with string values. - # What we get here, though, are keys with references to lists - # of the combined values of them all. We will deal with lists - # after this stage is done. - my %combined_inheritance = (); - if ($table{$target}->{inherit_from}) { - foreach (@{$table{$target}->{inherit_from}}) { - my %inherited_config = - $resolve_inheritance->($_, $target, @breadcrumbs); - - # 'template' is a marker that's considered private to - # the config that had it. - delete $inherited_config{template}; - - map { - if (!$combined_inheritance{$_}) { - $combined_inheritance{$_} = []; - } - push @{$combined_inheritance{$_}}, $inherited_config{$_}; - } keys %inherited_config; - } - } - - # We won't need inherit_from in this target any more, since - # we've resolved all the inheritances that lead to this - delete $table{$target}->{inherit_from}; - - # Now is the time to deal with those lists. Here's the place - # to decide what shall be done with those lists, all based on - # the values of the target we're currently dealing with. - # - If a value is a coderef, it will be executed with the list - # of inherited values as arguments. - # - If the corresponding key doesn't have a value at all or is - # the emoty string, the inherited value list will be run - # through the default combiner (below), and the result - # becomes this target's value. - # - Otherwise, this target's value is assumed to be a string - # that will simply override the inherited list of values. - my $default_combiner = sub { join(' ',@_) }; - - my %all_keys = - map { $_ => 1 } (keys %combined_inheritance, - keys %{$table{$target}}); - foreach (sort keys %all_keys) { - - # Current target doesn't have a value for the current key? - # Assign it the default combiner, the rest of this loop - # body will handle it just like any other coderef. - if (!exists $table{$target}->{$_}) { - $table{$target}->{$_} = $default_combiner; - } - - my $valuetype = ref($table{$target}->{$_}); - if ($valuetype eq "CODE") { - # CODE reference, execute it with the inherited values - # as arguments. - $table{$target}->{$_} = - $table{$target}->{$_}->(@{$combined_inheritance{$_}}); - } elsif ($valuetype eq "") { - # Scalar, just leave it as is. - } else { - # Some other type of reference that we don't handle. - # Better to abort at this point. - die "cannot handle reference type $valuetype," - ," found in target $target -> $_\n"; - } - } - - # Finally done, return the result. - %{$table{$target}}; - }; +# resolve_config(target) +# +# Resolves all the late evalutations, inheritances and so on for the +# chosen target and any target it inherits from. +sub resolve_config; - # Go through all new targets and resolve inheritance and template - # references. - foreach (keys %targets) { - # We're ignoring the returned values here, they are only valuable - # to the inner recursion of this function. - $resolve_inheritance->($_); - } -} my ($vol, $dir, $dummy) = File::Spec->splitpath($0); my $pattern = File::Spec->catpath($vol, $dir, "Configurations/*.conf"); @@ -771,13 +172,6 @@ foreach (sort glob($pattern) ) { &read_config($_); } -my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A - debug-VC-WIN64I debug-VC-WIN64A - VC-NT VC-CE VC-WIN32 debug-VC-WIN32 - BC-32 - netware-clib netware-clib-bsdsock - netware-libc netware-libc-bsdsock); - my $prefix=""; my $libdir=""; my $openssldir=""; @@ -796,29 +190,15 @@ my $no_asm=0; my $no_dso=0; my @skip=(); my $Makefile="Makefile"; -my $des_locl="crypto/des/des_locl.h"; -my $des ="include/openssl/des.h"; -my $bn ="include/openssl/bn.h"; -my $md2 ="include/openssl/md2.h"; -my $rc4 ="include/openssl/rc4.h"; -my $rc4_locl="crypto/rc4/rc4_locl.h"; -my $idea ="include/openssl/idea.h"; -my $rc2 ="include/openssl/rc2.h"; -my $bf ="crypto/bf/bf_locl.h"; -my $bn_asm ="bn_asm.o"; -my $des_enc="des_enc.o fcrypt_b.o"; -my $aes_enc="aes_core.o aes_cbc.o"; -my $bf_enc ="bf_enc.o"; -my $cast_enc="c_enc.o"; -my $rc4_enc="rc4_enc.o rc4_skey.o"; -my $rc5_enc="rc5_enc.o"; -my $cmll_enc="camellia.o cmll_misc.o cmll_cbc.o"; -my $chacha_enc="chacha_enc.o"; my $processor=""; my $default_ranlib; my $perl; my $fips=0; +# Known TLS and DTLS protocols +my @tls = qw(ssl3 tls1 tls1_1 tls1_2); +my @dtls = qw(dtls1 dtls1_2); + # Explicitelly known options that are possible to disable. They can # be regexps, and will be used like this: /^no-${option}$/ # For developers: keep it sorted alphabetically @@ -846,6 +226,8 @@ my @disablables = ( "dynamic[-_]engine", "ec", "ec2m", + "ecdh", + "ecdsa", "ec_nistp_64_gcc_128", "engine", "err", # Really??? @@ -886,41 +268,108 @@ my @disablables = ( "srtp", "sse2", "ssl", - "ssl3", - "ssl3-method", "ssl-trace", "static-engine", "stdio", "store", "threads", "tls", - "tls1", "unit-test", "whirlpool", "zlib", "zlib-dynamic", ); +foreach my $proto ((@tls, @dtls)) + { + push(@disablables, $proto); + push(@disablables, "$proto-method"); + } # All of the following is disabled by default (RC5 was enabled before 0.9.8): my %disabled = ( # "what" => "comment" [or special keyword "experimental"] "ec_nistp_64_gcc_128" => "default", + "egd" => "default", "jpake" => "experimental", "md2" => "default", "rc5" => "default", - "sctp" => "default", + "sctp" => "default", "shared" => "default", "ssl-trace" => "default", "store" => "experimental", "unit-test" => "default", "zlib" => "default", - "zlib-dynamic" => "default" + "zlib-dynamic" => "default", + "crypto-mdebug" => "default", ); my @experimental = (); -# This is what $depflags will look like with the above defaults -# (we need this to see if we should advise the user to run "make depend"): -my $default_depflags = " -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST"; +# Note: => pair form used for aesthetics, not to truly make a hash table +my @disable_cascades = ( + # "what" => [ "cascade", ... ] + sub { $processor eq "386" } + => [ "sse2" ], + "ssl" => [ "ssl3" ], + "ssl3-method" => [ "ssl3" ], + "zlib" => [ "zlib-dynamic" ], + "rijndael" => [ "aes" ], + "des" => [ "mdc2" ], + "ec" => [ "ecdsa", "ecdh", "gost" ], + "dsa" => [ "gost" ], + "dh" => [ "gost" ], + + "dgram" => [ "dtls" ], + "dtls" => [ @dtls ], + + # SSL 3.0, (D)TLS 1.0 and TLS 1.1 require MD5 and SHA + "md5" => [ "ssl", "tls1", "tls1_1", "dtls1" ], + "sha" => [ "ssl", "tls1", "tls1_1", "dtls1" ], + + # Additionally, SSL 3.0 requires either RSA or DSA+DH + sub { $disabled{rsa} + && ($disabled{dsa} || $disabled{dh}); } + => [ "ssl" ], + + # (D)TLS 1.0 and TLS 1.1 also require either RSA or DSA+DH + # or ECDSA + ECDH. (D)TLS 1.2 has this requirement as well. + # (XXX: We don't support PSK-only builds). + sub { $disabled{rsa} + && ($disabled{dsa} || $disabled{dh}) + && ($disabled{ecdsa} || $disabled{ecdh}); } + => [ "tls1", "tls1_1", "tls1_2", + "dtls1", "dtls1_2" ], + + "tls" => [ @tls ], + + # SRP and HEARTBEATS require TLSEXT + "tlsext" => [ "srp", "heartbeats" ], + ); + +# Avoid protocol support holes. Also disable all versions below N, if version +# N is disabled while N+1 is enabled. +# +my @list = (reverse @tls); +while ((my $first, my $second) = (shift @list, shift @list)) { + last unless @list; + push @disable_cascades, ( sub { !$disabled{$first} && $disabled{$second} } + => [ @list ] ); + unshift @list, $second; +} +my @list = (reverse @dtls); +while ((my $first, my $second) = (shift @list, shift @list)) { + last unless @list; + push @disable_cascades, ( sub { !$disabled{$first} && $disabled{$second} } + => [ @list ] ); + unshift @list, $second; +} + +# Construct the string of what $depflags should look like with the defaults +# from %disabled above. (we need this to see if we should advise the user +# to run "make depend"): +my $default_depflags = " ".join(" ", + map { my $x = $_; $x =~ tr{[a-z]-}{[A-Z]_}; "-DOPENSSL_NO_$x"; } + grep { $disabled{$_} !~ /\(no-depflags\)$/ } + sort keys %disabled); # Explicit "no-..." options will be collected in %disabled along with the defaults. # To remove something from %disabled, use "enable-foo" (unless it's experimental). @@ -935,245 +384,235 @@ my $no_sse2=0; &usage if ($#ARGV < 0); -my $flags; -my $depflags; -my $openssl_experimental_defines; -my $openssl_algorithm_defines; -my $openssl_thread_defines; +my $flags=""; +my $depflags=""; +my $openssl_experimental_defines=""; +my $openssl_algorithm_defines=""; +my $openssl_thread_defines=""; my $openssl_sys_defines=""; -my $openssl_other_defines; -my $libs; -my $target; -my $options; +my $openssl_other_defines=""; +my $libs=""; +my $target=""; +my $options=""; my $api; my $make_depend=0; my %withargs=(); my $build_prefix = "release_"; my @argvcopy=@ARGV; -my $argvstring=""; -my $argv_unprocessed=1; -while($argv_unprocessed) - { - $flags=""; - $depflags=""; - $openssl_experimental_defines=""; - $openssl_algorithm_defines=""; - $openssl_thread_defines=""; - $openssl_sys_defines=""; - $openssl_other_defines=""; - $libs=""; - $target=""; - $options=""; - - $argv_unprocessed=0; - $argvstring=join(' ',@argvcopy); - -PROCESS_ARGS: +if (grep /^reconf(igure)?$/, @argvcopy) { + if (open IN, "<$Makefile") { + while () { + chomp; + if (/^CONFIGURE_ARGS=\s*(.*)\s*/) { + my $line = $1; + if ($line =~ /^\s*\(/) { + # New form perl expression saved in Makefile, eval it + @argvcopy = eval $line; + } else { + # Older form, we split the string and hope for the best + @argvcopy = split /\s+/, $line; + } + die "Incorrect data to reconfigure, please do a normal configuration\n" + if (grep(/^reconf/,@argvcopy)); + } elsif (/^CROSS_COMPILE=\s*(.*)/) { + $ENV{CROSS_COMPILE}=$1; + } elsif (/^CC=\s*(?:\$\(CROSS_COMPILE\))?(.*?)$/) { + $ENV{CC}=$1; + } + } + print "Reconfiguring with: ", join(" ",@argvcopy), "\n"; + print " CROSS_COMPILE = ",$ENV{CROSS_COMPILE},"\n" + if $ENV{CROSS_COMPILE}; + print " CC = ",$ENV{CC},"\n" if $ENV{CC}; + close IN; + } else { + die "Insufficient data to reconfigure, please do a normal configuration\n"; + } +} + + +my %unsupported_options = (); +foreach (@argvcopy) { - my %unsupported_options = (); - foreach (@argvcopy) - { - s /^-no-/no-/; # some people just can't read the instructions + s /^-no-/no-/; # some people just can't read the instructions - # rewrite some options in "enable-..." form - s /^-?-?shared$/enable-shared/; - s /^sctp$/enable-sctp/; - s /^threads$/enable-threads/; - s /^zlib$/enable-zlib/; - s /^zlib-dynamic$/enable-zlib-dynamic/; + # rewrite some options in "enable-..." form + s /^-?-?shared$/enable-shared/; + s /^sctp$/enable-sctp/; + s /^threads$/enable-threads/; + s /^zlib$/enable-zlib/; + s /^zlib-dynamic$/enable-zlib-dynamic/; - if (/^(no|disable|enable|experimental)-(.+)$/) + if (/^(no|disable|enable|experimental)-(.+)$/) + { + my $word = $2; + if (!grep { $word =~ /^${_}$/ } @disablables) { - my $word = $2; - if (!grep { $word =~ /^${_}$/ } @disablables) - { - $unsupported_options{$_} = 1; - next; - } + $unsupported_options{$_} = 1; + next; } - if (/^no-(.+)$/ || /^disable-(.+)$/) + } + if (/^no-(.+)$/ || /^disable-(.+)$/) + { + if (!($disabled{$1} eq "experimental")) { - if (!($disabled{$1} eq "experimental")) + foreach my $proto ((@tls, @dtls)) { - if ($1 eq "ssl") - { - $disabled{"ssl3"} = "option(ssl)"; - } - elsif ($1 eq "tls") + if ($1 eq "$proto-method") { - $disabled{"tls1"} = "option(tls)" + $disabled{"$proto"} = "option($proto-method)"; + last; } - elsif ($1 eq "ssl3-method") + } + if ($1 eq "dtls") + { + foreach my $proto (@dtls) { - $disabled{"ssl3-method"} = "option(ssl)"; - $disabled{"ssl3"} = "option(ssl)"; + $disabled{$proto} = "option(dtls)"; } - else + } + elsif ($1 eq "ssl") + { + # Last one of its kind + $disabled{"ssl3"} = "option(ssl)"; + } + elsif ($1 eq "tls") + { + # XXX: Tests will fail if all SSL/TLS + # protocols are disabled. + foreach my $proto (@tls) { - $disabled{$1} = "option"; + $disabled{$proto} = "option(tls)"; } } - } - elsif (/^enable-(.+)$/ || /^experimental-(.+)$/) - { - my $algo = $1; - if ($disabled{$algo} eq "experimental") + else { - die "You are requesting an experimental feature; please say 'experimental-$algo' if you are sure\n" - unless (/^experimental-/); - push @experimental, $algo; + $disabled{$1} = "option"; } - delete $disabled{$algo}; + } + } + elsif (/^enable-(.+)$/ || /^experimental-(.+)$/) + { + my $algo = $1; + if ($disabled{$algo} eq "experimental") + { + die "You are requesting an experimental feature; please say 'experimental-$algo' if you are sure\n" + unless (/^experimental-/); + push @experimental, $algo; + } + delete $disabled{$algo}; - $threads = 1 if ($algo eq "threads"); + $threads = 1 if ($algo eq "threads"); + } + elsif (/^--strict-warnings$/) + { + $strict_warnings = 1; + } + elsif (/^--debug$/) + { + $build_prefix = "debug_"; + } + elsif (/^--release$/) + { + $build_prefix = "release_"; + } + elsif (/^386$/) + { $processor=386; } + elsif (/^fips$/) + { + $fips=1; + } + elsif (/^rsaref$/) + { + # No RSAref support any more since it's not needed. + # The check for the option is there so scripts aren't + # broken + } + elsif (/^nofipscanistercheck$/) + { + $fips = 1; + $nofipscanistercheck = 1; + } + elsif (/^[-+]/) + { + if (/^--prefix=(.*)$/) + { + $prefix=$1; } - elsif (/^--test-sanity$/) + elsif (/^--api=(.*)$/) { - exit(&test_sanity()); + $api=$1; } - elsif (/^--strict-warnings$/) + elsif (/^--libdir=(.*)$/) { - $strict_warnings = 1; + $libdir=$1; } - elsif (/^--debug$/) + elsif (/^--openssldir=(.*)$/) { - $build_prefix = "debug_"; + $openssldir=$1; } - elsif (/^--release$/) + elsif (/^--install.prefix=(.*)$/) { - $build_prefix = "release_"; + $install_prefix=$1; } - elsif (/^reconfigure/ || /^reconf/) + elsif (/^--with-zlib-lib=(.*)$/) { - if (open(IN,"<$Makefile")) - { - my $config_args_found=0; - while () - { - chomp; - if (/^CONFIGURE_ARGS=(.*)/) - { - $argvstring=$1; - @argvcopy=split(' ',$argvstring); - die "Incorrect data to reconfigure, please do a normal configuration\n" - if (grep(/^reconf/,@argvcopy)); - print "Reconfiguring with: $argvstring\n"; - $argv_unprocessed=1; - $config_args_found=1; - } - elsif (/^CROSS_COMPILE=\s*(.*)/) - { - $ENV{CROSS_COMPILE}=$1; - } - elsif (/^CC=\s*(?:\$\(CROSS_COMPILE\))?(.*?)$/) - { - $ENV{CC}=$1; - } - } - close(IN); - last PROCESS_ARGS if ($config_args_found); - } - die "Insufficient data to reconfigure, please do a normal configuration\n"; + $withargs{"zlib-lib"}=$1; } - elsif (/^386$/) - { $processor=386; } - elsif (/^fips$/) + elsif (/^--with-zlib-include=(.*)$/) { - $fips=1; + $withargs{"zlib-include"}="-I$1"; } - elsif (/^rsaref$/) + elsif (/^--with-fipslibdir=(.*)$/) { - # No RSAref support any more since it's not needed. - # The check for the option is there so scripts aren't - # broken + $fipslibdir="$1/"; } - elsif (/^nofipscanistercheck$/) + elsif (/^--with-baseaddr=(.*)$/) { - $fips = 1; - $nofipscanistercheck = 1; + $baseaddr="$1"; } - elsif (/^[-+]/) + elsif (/^--cross-compile-prefix=(.*)$/) { - if (/^--prefix=(.*)$/) - { - $prefix=$1; - } - elsif (/^--api=(.*)$/) - { - $api=$1; - } - elsif (/^--libdir=(.*)$/) - { - $libdir=$1; - } - elsif (/^--openssldir=(.*)$/) - { - $openssldir=$1; - } - elsif (/^--install.prefix=(.*)$/) - { - $install_prefix=$1; - } - elsif (/^--with-zlib-lib=(.*)$/) - { - $withargs{"zlib-lib"}=$1; - } - elsif (/^--with-zlib-include=(.*)$/) - { - $withargs{"zlib-include"}="-I$1"; - } - elsif (/^--with-fipslibdir=(.*)$/) - { - $fipslibdir="$1/"; - } - elsif (/^--with-baseaddr=(.*)$/) - { - $baseaddr="$1"; - } - elsif (/^--cross-compile-prefix=(.*)$/) - { - $cross_compile_prefix=$1; - } - elsif (/^--config=(.*)$/) - { - read_config $1; - } - elsif (/^-[lL](.*)$/ or /^-Wl,/) - { - $libs.=$_." "; - } - else # common if (/^[-+]/), just pass down... - { - $_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei; - $flags.=$_." "; - } + $cross_compile_prefix=$1; } - elsif ($_ =~ /^([^:]+):(.+)$/) + elsif (/^--config=(.*)$/) { - eval "\$table{\$1} = \"$2\""; # allow $xxx constructs in the string - $target=$1; + read_config $1; } - else + elsif (/^-[lL](.*)$/ or /^-Wl,/) { - die "target already defined - $target (offending arg: $_)\n" if ($target ne ""); - $target=$_; + $libs.=$_." "; } - - unless ($_ eq $target || /^no-/ || /^disable-/) + else # common if (/^[-+]/), just pass down... { - # "no-..." follows later after implied disactivations - # have been derived. (Don't take this too seroiusly, - # we really only write OPTIONS to the Makefile out of - # nostalgia.) - - if ($options eq "") - { $options = $_; } - else - { $options .= " ".$_; } + $_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei; + $flags.=$_." "; } } + elsif ($_ =~ /^([^:]+):(.+)$/) + { + eval "\$table{\$1} = \"$2\""; # allow $xxx constructs in the string + $target=$1; + } + else + { + die "target already defined - $target (offending arg: $_)\n" if ($target ne ""); + $target=$_; + } + unless ($_ eq $target || /^no-/ || /^disable-/) + { + # "no-..." follows later after implied disactivations + # have been derived. (Don't take this too seroiusly, + # we really only write OPTIONS to the Makefile out of + # nostalgia.) + + if ($options eq "") + { $options = $_; } + else + { $options .= " ".$_; } + } if (defined($api) && !exists $apitable->{$api}) { die "***** Unsupported api compatibility level: $api\n", @@ -1185,54 +624,26 @@ PROCESS_ARGS: join(", ", keys %unsupported_options), "\n"; } } - } - - -if ($processor eq "386") - { - $disabled{"sse2"} = "forced"; - } - -if (!defined($disabled{"zlib-dynamic"})) - { - # "zlib-dynamic" was specifically enabled, so enable "zlib" - delete $disabled{"zlib"}; - } - -if (defined($disabled{"rijndael"})) - { - $disabled{"aes"} = "forced"; - } -if (defined($disabled{"des"})) - { - $disabled{"mdc2"} = "forced"; - } -if (defined($disabled{"ec"})) - { - $disabled{"ecdsa"} = "forced"; - $disabled{"ecdh"} = "forced"; - } -# SSL 3.0 and TLS requires MD5 and SHA and either RSA or DSA+DH -if (defined($disabled{"md5"}) || defined($disabled{"sha"}) - || (defined($disabled{"rsa"}) - && (defined($disabled{"dsa"}) || defined($disabled{"dh"})))) +if ($fips) { - $disabled{"ssl3"} = "forced"; - $disabled{"tls1"} = "forced"; + delete $disabled{"shared"} if ($disabled{"shared"} =~ /^default/); } -if (defined($disabled{"dgram"})) - { - $disabled{"dtls"} = "forced"; - } - -if (defined($disabled{"ec"}) || defined($disabled{"dsa"}) - || defined($disabled{"dh"}) || defined($disabled{"stdio"})) - { - $disabled{"gost"} = "forced"; +my @tocheckfor = (keys %disabled); +while (@tocheckfor) { + my %new_tocheckfor = (); + my @cascade_copy = (@disable_cascades); + while (@cascade_copy) { + my ($test, $descendents) = (shift @cascade_copy, shift @cascade_copy); + if (ref($test) eq "CODE" ? $test->() : defined($disabled{$test})) { + map { + $new_tocheckfor{$_} => 1; $disabled{$_} = "forced"; + } grep { !defined($disabled{$_}) } @$descendents; } - + } + @tocheckfor = (keys %new_tocheckfor); +} if ($target eq "TABLE") { foreach $target (sort keys %table) { @@ -1261,34 +672,6 @@ if ($target =~ m/^CygWin32(-.*)$/) { $target = "Cygwin".$1; } -print "Configuring for $target\n"; - -# Support for legacy targets having a name starting with 'debug-' -my ($d, $t) = $target =~ m/^(debug-)?(.*)$/; -if ($d) { - $build_prefix = "debug_"; - - # If we do not find debug-foo in the table, the target is set to foo, - # but only if the foo target has a noon-empty debug_cflags or debug_lflags - # attribute. - if (!$table{$target} && ($table{$t}->{debug_cflags} - || $table{$t}->{debug_lflags})) { - $target = $t; - } -} - -&usage if (!defined($table{$target}) - || $table{$target}->{template} - || ($build_prefix eq "debug_" - && $target !~ /^debug-/ - && !($table{$target}->{debug_cflags} - || $table{$target}->{debug_lflags}))); - -if ($fips) - { - delete $disabled{"shared"} if ($disabled{"shared"} eq "default"); - } - foreach (sort (keys %disabled)) { $options .= " no-$_"; @@ -1355,13 +738,27 @@ foreach (sort @experimental) $exp_cflags .= " -DOPENSSL_EXPERIMENTAL_$ALGO"; } -my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; +print "Configuring for $target\n"; + +# Support for legacy targets having a name starting with 'debug-' +my ($d, $t) = $target =~ m/^(debug-)?(.*)$/; +if ($d) { + $build_prefix = "debug_"; + + # If we do not find debug-foo in the table, the target is set to foo. + if (!$table{$target}) { + $target = $t; + } +} + +delete $table{$base_target}->{template}; # or the next test will fail. +my %target = ( %{$table{$base_target}}, resolve_config($target) ); + +&usage if (!%target || $target{template}); $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); $exe_ext=".nlm" if ($target =~ /netware/); $exe_ext=".pm" if ($target =~ /vos/); -$openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq ""); -$prefix=$openssldir if $prefix eq ""; $default_ranlib= &which("ranlib") or $default_ranlib="true"; $perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl") @@ -1370,59 +767,59 @@ my $make = $ENV{'MAKE'} || "make"; $cross_compile_prefix=$ENV{'CROSS_COMPILE'} if $cross_compile_prefix eq ""; -chop $openssldir if $openssldir =~ /\/$/; -chop $prefix if $prefix =~ /.\/$/; - -$openssldir=$prefix . "/ssl" if $openssldir eq ""; -$openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/; - +$prefix = "/usr/local" if !$prefix; +$openssldir = "ssl" if !$openssldir; +$openssldir = catdir($prefix, $openssldir) + unless file_name_is_absolute($openssldir); -print "IsMK1MF=$IsMK1MF\n"; # Allow environment CC to override compiler... -my $cc = $ENV{CC} || $table{$target}->{cc}; +my $cc = $ENV{CC} || $target{cc}; # For cflags and lflags, add the debug_ or release_ attributes # Do it in such a way that no spurious space is appended (hence the grep). my $cflags = join(" ", - grep { $_ } ($table{$target}->{cflags}, - $table{$target}->{$build_prefix."cflags"})); + grep { $_ } ($target{cflags}, + $target{$build_prefix."cflags"})); my $lflags = join(" ", - grep { $_ } ($table{$target}->{lflags}, - $table{$target}->{$build_prefix."lflags"})); - -my $unistd = $table{$target}->{unistd}; -my $thread_cflag = $table{$target}->{thread_cflag}; -my $sys_id = $table{$target}->{sys_id}; -my $bn_ops = $table{$target}->{bn_ops}; -my $cpuid_obj = $table{$target}->{cpuid_obj}; -my $bn_obj = $table{$target}->{bn_obj}; -my $ec_obj = $table{$target}->{ec_obj}; -my $des_obj = $table{$target}->{des_obj}; -my $aes_obj = $table{$target}->{aes_obj}; -my $bf_obj = $table{$target}->{bf_obj}; -my $md5_obj = $table{$target}->{md5_obj}; -my $sha1_obj = $table{$target}->{sha1_obj}; -my $cast_obj = $table{$target}->{cast_obj}; -my $rc4_obj = $table{$target}->{rc4_obj}; -my $rmd160_obj = $table{$target}->{rmd160_obj}; -my $rc5_obj = $table{$target}->{rc5_obj}; -my $wp_obj = $table{$target}->{wp_obj}; -my $cmll_obj = $table{$target}->{cmll_obj}; -my $modes_obj = $table{$target}->{modes_obj}; -my $engines_obj = $table{$target}->{engines_obj}; -my $chacha_obj = $table{$target}->{chacha_obj}; -my $poly1305_obj = $table{$target}->{poly1305_obj}; -my $perlasm_scheme = $table{$target}->{perlasm_scheme}; -my $dso_scheme = $table{$target}->{dso_scheme}; -my $shared_target = $table{$target}->{shared_target}; -my $shared_cflag = $table{$target}->{shared_cflag}; -my $shared_ldflag = $table{$target}->{shared_ldflag}; -my $shared_extension = $table{$target}->{shared_extension}; -my $ranlib = $ENV{'RANLIB'} || $table{$target}->{ranlib}; + grep { $_ } ($target{lflags}, + $target{$build_prefix."lflags"})); + +my $unistd = $target{unistd}; +my $thread_cflag = $target{thread_cflag}; +my $sys_id = $target{sys_id}; +my $bn_ops = $target{bn_ops}; +my $cpuid_obj = $target{cpuid_obj}; +my $bn_obj = $target{bn_obj}; +my $ec_obj = $target{ec_obj}; +my $des_obj = $target{des_obj}; +my $aes_obj = $target{aes_obj}; +my $bf_obj = $target{bf_obj}; +my $md5_obj = $target{md5_obj}; +my $sha1_obj = $target{sha1_obj}; +my $cast_obj = $target{cast_obj}; +my $rc4_obj = $target{rc4_obj}; +my $rmd160_obj = $target{rmd160_obj}; +my $rc5_obj = $target{rc5_obj}; +my $wp_obj = $target{wp_obj}; +my $cmll_obj = $target{cmll_obj}; +my $modes_obj = $target{modes_obj}; +my $engines_obj = $target{engines_obj}; +my $chacha_obj = $target{chacha_obj}; +my $poly1305_obj = $target{poly1305_obj}; +my $perlasm_scheme = $target{perlasm_scheme}; +my $dso_scheme = $target{dso_scheme}; +my $shared_target = $target{shared_target}; +my $shared_cflag = $target{shared_cflag}; +my $shared_ldflag = $target{shared_ldflag}; +my $shared_extension = $target{shared_extension}; +my $ranlib = $ENV{'RANLIB'} || $target{ranlib}; my $ar = $ENV{'AR'} || "ar"; -my $arflags = $table{$target}->{arflags}; -my $multilib = $table{$target}->{multilib}; +my $arflags = $target{arflags}; +my $multilib = $target{multilib}; +my @build_scheme = + ref($target{build_scheme}) eq "ARRAY" + ? @{$target{build_scheme}} : ( $target{build_scheme} ); # if $prefix/lib$multilib is not an existing directory, then # assume that it's not searched by linker automatically, in @@ -1521,22 +918,9 @@ $lflags="$libs$lflags" if ($libs ne ""); if ($no_asm) { - $cpuid_obj=$bn_obj=$ec_obj= - $des_obj=$aes_obj=$bf_obj=$cast_obj=$rc4_obj=$rc5_obj=$cmll_obj= - $modes_obj=$sha1_obj=$md5_obj=$rmd160_obj=$wp_obj=$engines_obj= - $chacha_obj=$poly1305_obj=""; $cflags=~s/\-D[BL]_ENDIAN// if ($fips); $thread_cflags=~s/\-D[BL]_ENDIAN// if ($fips); } -elsif (defined($disabled{ec2m})) - { - $bn_obj =~ s/\w+-gf2m.o//; - } - -if (!$no_shared) - { - $cast_obj=""; # CAST assembler is not PIC - } if ($threads) { @@ -1569,7 +953,7 @@ if (defined($disabled{"deprecated"})) { $api = $maxapi; } -# You will find shlib_mark1 and shlib_mark2 explained in Makefile.org +# You will find shlib_mark1 and shlib_mark2 explained in Makefile.in my $shared_mark = ""; if ($shared_target eq "") { @@ -1584,7 +968,7 @@ if (!$no_shared) } } -if (!$IsMK1MF) +if ($build_scheme[0] ne "mk1mf") { # add {no-}static-engine to options to allow mkdef.pl to work without extra arguments if ($no_shared) @@ -1599,8 +983,6 @@ if (!$IsMK1MF) } } -$cpuid_obj.=" uplink.o uplink-x86.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/); - # # Platform fix-ups # @@ -1646,7 +1028,7 @@ if ($target =~ /\-icc$/) # Intel C compiler # linker only when --prefix is not /usr. if ($target =~ /^BSD\-/) { - $shared_ldflag.=" -Wl,-rpath,\$(LIBRPATH)" if ($prefix !~ m|^/usr[/]*$|); + $shared_ldflag.=" -Wl,-rpath,\$\$(LIBRPATH)" if ($prefix !~ m|^/usr[/]*$|); } if ($sys_id ne "") @@ -1660,58 +1042,44 @@ if ($ranlib eq "") $ranlib = $default_ranlib; } -#my ($bn1)=split(/\s+/,$bn_obj); -#$bn1 = "" unless defined $bn1; -#$bn1=$bn_asm unless ($bn1 =~ /\.o$/); -#$bn_obj="$bn1"; +if (!$no_asm) { + $cpuid_obj=$table{BASE}->{cpuid_obj} if ($processor eq "386"); + $cpuid_obj.=" uplink.o uplink-x86.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/); -$cpuid_obj="" if ($processor eq "386"); + $bn_obj =~ s/\w+-gf2m.o// if (defined($disabled{ec2m})); -$bn_obj = $bn_asm unless $bn_obj ne ""; -# bn-586 is the only one implementing bn_*_part_words -$cflags.=" -DOPENSSL_BN_ASM_PART_WORDS" if ($bn_obj =~ /bn-586/); -$cflags.=" -DOPENSSL_IA32_SSE2" if (!$no_sse2 && $bn_obj =~ /86/); + # bn-586 is the only one implementing bn_*_part_words + $cflags.=" -DOPENSSL_BN_ASM_PART_WORDS" if ($bn_obj =~ /bn-586/); + $cflags.=" -DOPENSSL_IA32_SSE2" if (!$no_sse2 && $bn_obj =~ /86/); -$cflags.=" -DOPENSSL_BN_ASM_MONT" if ($bn_obj =~ /-mont/); -$cflags.=" -DOPENSSL_BN_ASM_MONT5" if ($bn_obj =~ /-mont5/); -$cflags.=" -DOPENSSL_BN_ASM_GF2m" if ($bn_obj =~ /-gf2m/); + $cflags.=" -DOPENSSL_BN_ASM_MONT" if ($bn_obj =~ /-mont/); + $cflags.=" -DOPENSSL_BN_ASM_MONT5" if ($bn_obj =~ /-mont5/); + $cflags.=" -DOPENSSL_BN_ASM_GF2m" if ($bn_obj =~ /-gf2m/); -if ($fips) - { + if ($fips) { $openssl_other_defines.="#define OPENSSL_FIPS\n"; - } + } -$cpuid_obj="mem_clr.o" unless ($cpuid_obj =~ /\.o$/); -$des_obj=$des_enc unless ($des_obj =~ /\.o$/); -$bf_obj=$bf_enc unless ($bf_obj =~ /\.o$/); -$cast_obj=$cast_enc unless ($cast_obj =~ /\.o$/); -$rc4_obj=$rc4_enc unless ($rc4_obj =~ /\.o$/); -$rc5_obj=$rc5_enc unless ($rc5_obj =~ /\.o$/); -if ($sha1_obj =~ /\.o$/) - { -# $sha1_obj=$sha1_enc; + if ($sha1_obj =~ /\.o$/) { $cflags.=" -DSHA1_ASM" if ($sha1_obj =~ /sx86/ || $sha1_obj =~ /sha1/); $cflags.=" -DSHA256_ASM" if ($sha1_obj =~ /sha256/); $cflags.=" -DSHA512_ASM" if ($sha1_obj =~ /sha512/); - if ($sha1_obj =~ /sse2/) - { if ($no_sse2) - { $sha1_obj =~ s/\S*sse2\S+//; } - elsif ($cflags !~ /OPENSSL_IA32_SSE2/) - { $cflags.=" -DOPENSSL_IA32_SSE2"; } + if ($sha1_obj =~ /sse2/) { + if ($no_sse2) { + $sha1_obj =~ s/\S*sse2\S+//; + } elsif ($cflags !~ /OPENSSL_IA32_SSE2/) { + $cflags.=" -DOPENSSL_IA32_SSE2"; } } -if ($md5_obj =~ /\.o$/) - { -# $md5_obj=$md5_enc; + } + if ($md5_obj =~ /\.o$/) { $cflags.=" -DMD5_ASM"; - } -if ($rmd160_obj =~ /\.o$/) - { -# $rmd160_obj=$rmd160_enc; + } + $cast_obj=$table{BASE}->{cast_obj} if (!$no_shared); # CAST assembler is not PIC + if ($rmd160_obj =~ /\.o$/) { $cflags.=" -DRMD160_ASM"; - } -if ($aes_obj =~ /\.o$/) - { + } + if ($aes_obj =~ /\.o$/) { $cflags.=" -DAES_ASM" if ($aes_obj =~ m/\baes\-/);; # aes-ctr.o is not a real file, only indication that assembler # module implements AES_ctr32_encrypt... @@ -1721,32 +1089,22 @@ if ($aes_obj =~ /\.o$/) $aes_obj =~ s/\s*(vpaes|aesni)\-x86\.o//g if ($no_sse2); $cflags.=" -DVPAES_ASM" if ($aes_obj =~ m/vpaes/); $cflags.=" -DBSAES_ASM" if ($aes_obj =~ m/bsaes/); - } -else { - $aes_obj=$aes_enc; - } -$wp_obj="" if ($wp_obj =~ /mmx/ && $processor eq "386"); -if ($wp_obj =~ /\.o$/ && !$disabled{"whirlpool"}) - { + } + if ($wp_obj =~ /mmx/ && $processor eq "386") { + $wp_obj=$table{BASE}->{wp_obj}; + } elsif (!$disabled{"whirlpool"}) { $cflags.=" -DWHIRLPOOL_ASM"; - } -else { - $wp_obj="wp_block.o"; - } -$cmll_obj=$cmll_enc unless ($cmll_obj =~ /.o$/); -if ($modes_obj =~ /ghash\-/) - { + } + if ($modes_obj =~ /ghash\-/) { $cflags.=" -DGHASH_ASM"; - } -if ($ec_obj =~ /ecp_nistz256/) - { + } + if ($ec_obj =~ /ecp_nistz256/) { $cflags.=" -DECP_NISTZ256_ASM"; - } -$chacha_obj=$chacha_enc unless ($chacha_obj =~ /\.o$/); -if ($poly1305_obj =~ /\.o$/) - { + } + if ($poly1305_obj =~ /\.o$/) { $cflags.=" -DPOLY1305_ASM"; - } + } +} # "Stringify" the C flags string. This permits it to be made part of a string # and works as well on command lines. @@ -1821,10 +1179,10 @@ if ($strict_warnings) } } -open(IN,"$Makefile.new") || die "unable to create $Makefile.new:$!\n"; -print OUT "### Generated automatically from Makefile.org by Configure.\n\n"; +print OUT "### Generated automatically from Makefile.in by Configure.\n\n"; my $sdirs=0; while () @@ -1841,7 +1199,6 @@ while () $sdirs = 0 unless /\\$/; s/fips // if (/^DIRS=/ && !$fips); s/engines // if (/^DIRS=/ && $disabled{"engine"}); - s/ccgost// if (/^ENGDIRS=/ && $disabled{"gost"}); s/^VERSION=.*/VERSION=$version/; s/^MAJOR=.*/MAJOR=$major/; s/^MINOR=.*/MINOR=$minor/; @@ -1857,6 +1214,7 @@ while () s/^INSTALL_PREFIX=.*$/INSTALL_PREFIX=$install_prefix/; s/^PLATFORM=.*$/PLATFORM=$target/; s/^OPTIONS=.*$/OPTIONS=$options/; + my $argvstring = "(".join(", ", map { quotify("perl", $_) } @argvcopy).")"; s/^CONFIGURE_ARGS=.*$/CONFIGURE_ARGS=$argvstring/; if ($cross_compile_prefix) { @@ -1932,9 +1290,10 @@ while () } close(IN); close(OUT); -rename($Makefile,"$Makefile.bak") || die "unable to rename $Makefile\n" if -e $Makefile; +rename($Makefile,"$Makefile.orig") || die "unable to rename $Makefile\n" if -e $Makefile; rename("$Makefile.new",$Makefile) || die "unable to rename $Makefile.new\n"; +print "IsMK1MF =", ($build_scheme[0] eq "mk1mf" ? "yes" : "no"), "\n"; print "CC =$cc\n"; print "CFLAG =$cflags\n"; print "EX_LIBS =$lflags\n"; @@ -2073,7 +1432,6 @@ while () ($export_var_as_fn)?"define":"undef"; } elsif (/^#define\s+OPENSSL_UNISTD/) { - $unistd = "" if $unistd eq ""; print OUT "#define OPENSSL_UNISTD $unistd\n"; } elsif (/^#((define)|(undef))\s+SIXTY_FOUR_BIT_LONG/) @@ -2088,8 +1446,8 @@ while () { printf OUT "#%s EIGHT_BIT\n",($b8)?"define":"undef"; } elsif (/^#((define)|(undef))\s+BN_LLONG\s*$/) { printf OUT "#%s BN_LLONG\n",($bn_ll)?"define":"undef"; } - elsif (/^\#define\s+DES_LONG\s+.*/) - { printf OUT "#define DES_LONG unsigned %s\n", + elsif (/^\#define\s+OSSL_DES_LONG\s+.*/) + { printf OUT "#define OSSL_DES_LONG unsigned %s\n", ($des_int)?'int':'long'; } elsif (/^\#(define|undef)\s+DES_PTR/) { printf OUT "#%s DES_PTR\n",($des_ptr)?'define':'undef'; } @@ -2160,19 +1518,48 @@ print "RC2 uses u$type[$rc2_int]\n" if $rc2_int != $def_int; print "BF_PTR used\n" if $bf_ptr == 1; print "BF_PTR2 used\n" if $bf_ptr == 2; -{ - my $perlguess = $perl =~ m@^/@ ? $perl : '/usr/local/bin/perl'; - - &dofile("tools/c_rehash",$perlguess, - '^#!/' => '#!%s', - '^my \$dir;$' => 'my $dir = "' . $openssldir . '";', - '^my \$prefix;$' => 'my $prefix = "' . $prefix . '";'); - &dofile("apps/CA.pl",$perl, - '^#!/' => '#!%s'); -} -if($IsMK1MF) { +# Copy all Makefile.in to Makefile (except top-level) +use File::Find; +use IO::File; +find(sub { + return if ($_ ne "Makefile.in" || $File::Find::dir eq "."); + my $in = IO::File->new($_, "r") or + die sprintf "Error reading Makefile.in in %s: !$\n", + $File::Find::dir; + my $out = IO::File->new("Makefile", "w") or + die sprintf "Error writing Makefile in %s: !$\n", + $File::Find::dir; + print $out "# Generated from $_, do not edit\n"; + while (my $line = <$in>) { print $out $line } + $in->close() or + die sprintf "Error reading Makefile.in in %s: !$\n", + $File::Find::dir; + $out->close() or + die sprintf "Error writing Makefile in %s: !$\n", + $File::Find::dir; + }, "."); + +my %builders = ( + unixmake => sub { + my $perlguess = $perl =~ m@^/@ ? $perl : '/usr/local/bin/perl'; + my $make_command = "$make PERL=\'$perlguess\'"; + my $make_targets = ""; + $make_targets .= " depend" if $depflags ne $default_depflags && $make_depend; + (system $make_command.$make_targets) == 0 or die "make $make_targets failed" + if $make_targets ne ""; + &dofile("tools/c_rehash",$perlguess, + '^#!/' => '#!%s', + '^my \$dir;$' => 'my $dir = "' . $openssldir . '";', + '^my \$prefix;$' => 'my $prefix = "' . $prefix . '";'); + &dofile("apps/CA.pl",$perlguess, + '^#!/' => '#!%s'); + if ($depflags ne $default_depflags && !$make_depend) { + $warn_make_depend++; + } + }, + mk1mf => sub { open (OUT,">crypto/buildinf.h") || die "Can't open buildinf.h"; - printf OUT <ms/version32.rc") || die "Can't open ms/version32.rc"; - print OUT <ms/version32.rc") || die "Can't open ms/version32.rc"; + print OUT <<"EOF"; #include LANGUAGE 0x09,0x01 @@ -2252,22 +1629,27 @@ BEGIN END END EOF - close(OUT); - } + close(OUT); + } + }, + ); + +my ($builder, @builder_opts) = @build_scheme; +$builders{$builder}->(@builder_opts); -print < [ "template", asm("asm_tmpl") ] +# +sub asm { + my @x = @_; + sub { + $no_asm ? () : @x; + } +} + +# Helper function to implement adding values to already existing configuration +# values. It handles elements that are ARRAYs, CODEs and scalars +sub _add { + my $separator = shift; + + # If there's any ARRAY in the collection of values, we will return + # an ARRAY of combined values, otherwise a string of joined values + # with $separator as the separator. + my $found_array = 0; + + my @values = + map { + if (ref($_) eq "ARRAY") { + $found_array = 1; + @$_; + } else { + $_; + } + } (@_); + + if ($found_array) { + [ @values ]; + } else { + join($separator, @values); + } +} +sub add_before { + my $separator = shift; + my @x = @_; + sub { _add($separator, @x, @_) }; +} +sub add { + my $separator = shift; + my @x = @_; + sub { _add($separator, @_, @x) }; +} + +# configuration reader, evaluates the input file as a perl script and expects +# it to fill %targets with target configurations. Those are then added to +# %table. +sub read_config { + my $fname = shift; + open(CONFFILE, "< $fname") + or die "Can't open configuration file '$fname'!\n"; + my $x = $/; + undef $/; + my $content = ; + $/ = $x; + close(CONFFILE); + my %targets = (); + { + local %table = %::table; # Protect %table from tampering + + eval $content; + warn $@ if $@; + } + + # For each target, check that it's configured with a hash table. + foreach (keys %targets) { + if (ref($targets{$_}) ne "HASH") { + if (ref($targets{$_}) eq "") { + warn "Deprecated target configuration for $_, ignoring...\n"; + } else { + warn "Misconfigured target configuration for $_ (should be a hash table), ignoring...\n"; + } + delete $targets{$_}; + } + } + + %table = (%table, %targets); + +} + +# configuration resolver. Will only resolve all the lazy evalutation +# codeblocks for the chozen target and all those it inherits from, +# recursively +sub resolve_config { + my $target = shift; + my @breadcrumbs = @_; + + if (grep { $_ eq $target } @breadcrumbs) { + die "inherit_from loop! target backtrace:\n " + ,$target,"\n ",join("\n ", @breadcrumbs),"\n"; + } + + if (!defined($table{$target})) { + warn "Warning! target $target doesn't exist!\n"; + return (); + } + # Recurse through all inheritances. They will be resolved on the + # fly, so when this operation is done, they will all just be a + # bunch of attributes with string values. + # What we get here, though, are keys with references to lists of + # the combined values of them all. We will deal with lists after + # this stage is done. + my %combined_inheritance = (); + if ($table{$target}->{inherit_from}) { + my @inherit_from = + map { ref($_) eq "CODE" ? $_->() : $_ } @{$table{$target}->{inherit_from}}; + foreach (@inherit_from) { + my %inherited_config = resolve_config($_, $target, @breadcrumbs); + + # 'template' is a marker that's considered private to + # the config that had it. + delete $inherited_config{template}; + + map { + if (!$combined_inheritance{$_}) { + $combined_inheritance{$_} = []; + } + push @{$combined_inheritance{$_}}, $inherited_config{$_}; + } keys %inherited_config; + } + } + + # We won't need inherit_from in this target any more, since we've + # resolved all the inheritances that lead to this + delete $table{$target}->{inherit_from}; + + # Now is the time to deal with those lists. Here's the place to + # decide what shall be done with those lists, all based on the + # values of the target we're currently dealing with. + # - If a value is a coderef, it will be executed with the list of + # inherited values as arguments. + # - If the corresponding key doesn't have a value at all or is the + # emoty string, the inherited value list will be run through the + # default combiner (below), and the result becomes this target's + # value. + # - Otherwise, this target's value is assumed to be a string that + # will simply override the inherited list of values. + my $default_combiner = add(" "); + + my %all_keys = + map { $_ => 1 } (keys %combined_inheritance, + keys %{$table{$target}}); + foreach (sort keys %all_keys) { + + # Current target doesn't have a value for the current key? + # Assign it the default combiner, the rest of this loop body + # will handle it just like any other coderef. + if (!exists $table{$target}->{$_}) { + $table{$target}->{$_} = $default_combiner; + } + + my $valuetype = ref($table{$target}->{$_}); + if ($valuetype eq "CODE") { + # CODE reference, execute it with the inherited values as + # arguments. + $table{$target}->{$_} = + $table{$target}->{$_}->(@{$combined_inheritance{$_}}); + } elsif ($valuetype eq "ARRAY" || $valuetype eq "") { + # ARRAY or Scalar, just leave it as is. + } else { + # Some other type of reference that we don't handle. + # Better to abort at this point. + die "cannot handle reference type $valuetype," + ," found in target $target -> $_\n"; + } + } + + # Finally done, return the result. + return %{$table{$target}}; +} + sub usage { print STDERR $usage; @@ -2294,6 +1859,7 @@ sub usage my $k=0; foreach $i (sort keys %table) { + next if $table{$i}->{template}; next if $i =~ /^debug/; $k += length($i) + 1; if ($k > 78) @@ -2305,6 +1871,7 @@ sub usage } foreach $i (sort keys %table) { + next if $table{$i}->{template}; next if $i !~ /^debug/; $k += length($i) + 1; if ($k > 78) @@ -2354,53 +1921,54 @@ sub dofile sub print_table_entry { my $target = shift; + my %target = resolve_config($target); my $type = shift; # Don't print the templates - return if $table{$target}->{template}; + return if $target{template}; if ($type eq "TABLE") { - print <{cc} -\$cflags = $table{$target}->{cflags} -\$debug_cflags = $table{$target}->{debug_cflags} -\$release_cflags = $table{$target}->{release_cflags} -\$unistd = $table{$target}->{unistd} -\$thread_cflag = $table{$target}->{thread_cflag} -\$sys_id = $table{$target}->{sys_id} -\$lflags = $table{$target}->{lflags} -\$debug_lflags = $table{$target}->{debug_lflags} -\$release_lflags = $table{$target}->{release_lflags} -\$bn_ops = $table{$target}->{bn_ops} -\$cpuid_obj = $table{$target}->{cpuid_obj} -\$bn_obj = $table{$target}->{bn_obj} -\$ec_obj = $table{$target}->{ec_obj} -\$des_obj = $table{$target}->{des_obj} -\$aes_obj = $table{$target}->{aes_obj} -\$bf_obj = $table{$target}->{bf_obj} -\$md5_obj = $table{$target}->{md5_obj} -\$sha1_obj = $table{$target}->{sha1_obj} -\$cast_obj = $table{$target}->{cast_obj} -\$rc4_obj = $table{$target}->{rc4_obj} -\$rmd160_obj = $table{$target}->{rmd160_obj} -\$rc5_obj = $table{$target}->{rc5_obj} -\$wp_obj = $table{$target}->{wp_obj} -\$cmll_obj = $table{$target}->{cmll_obj} -\$modes_obj = $table{$target}->{modes_obj} -\$engines_obj = $table{$target}->{engines_obj} -\$chacha_obj = $table{$target}->{chacha_obj} -\$poly1305_obj = $table{$target}->{poly1305_obj} -\$perlasm_scheme = $table{$target}->{perlasm_scheme} -\$dso_scheme = $table{$target}->{dso_scheme} -\$shared_target= $table{$target}->{shared_target} -\$shared_cflag = $table{$target}->{shared_cflag} -\$shared_ldflag = $table{$target}->{shared_ldflag} -\$shared_extension = $table{$target}->{shared_extension} -\$ranlib = $table{$target}->{ranlib} -\$arflags = $table{$target}->{arflags} -\$multilib = $table{$target}->{multilib} +\$cc = $target{cc} +\$cflags = $target{cflags} +\$debug_cflags = $target{debug_cflags} +\$release_cflags = $target{release_cflags} +\$unistd = $target{unistd} +\$thread_cflag = $target{thread_cflag} +\$sys_id = $target{sys_id} +\$lflags = $target{lflags} +\$debug_lflags = $target{debug_lflags} +\$release_lflags = $target{release_lflags} +\$bn_ops = $target{bn_ops} +\$cpuid_obj = $target{cpuid_obj} +\$bn_obj = $target{bn_obj} +\$ec_obj = $target{ec_obj} +\$des_obj = $target{des_obj} +\$aes_obj = $target{aes_obj} +\$bf_obj = $target{bf_obj} +\$md5_obj = $target{md5_obj} +\$sha1_obj = $target{sha1_obj} +\$cast_obj = $target{cast_obj} +\$rc4_obj = $target{rc4_obj} +\$rmd160_obj = $target{rmd160_obj} +\$rc5_obj = $target{rc5_obj} +\$wp_obj = $target{wp_obj} +\$cmll_obj = $target{cmll_obj} +\$modes_obj = $target{modes_obj} +\$engines_obj = $target{engines_obj} +\$chacha_obj = $target{chacha_obj} +\$poly1305_obj = $target{poly1305_obj} +\$perlasm_scheme = $target{perlasm_scheme} +\$dso_scheme = $target{dso_scheme} +\$shared_target= $target{shared_target} +\$shared_cflag = $target{shared_cflag} +\$shared_ldflag = $target{shared_ldflag} +\$shared_extension = $target{shared_extension} +\$ranlib = $target{ranlib} +\$arflags = $target{arflags} +\$multilib = $target{multilib} EOF } elsif ($type eq "HASH") { my @sequence = ( @@ -2447,49 +2015,23 @@ EOF length((sort { length($a) <=> length($b) } @sequence)[-1]); print " '$target' => {\n"; foreach (@sequence) { - if ($table{$target}->{$_}) { - print " '",$_,"'"," " x ($largest - length($_))," => '",$table{$target}->{$_},"',\n"; + if ($target{$_}) { + print " '",$_,"'"," " x ($largest - length($_))," => '",$target{$_},"',\n"; } } print " },\n"; } } -sub test_sanity - { - my $errorcnt = 0; - - print STDERR "=" x 70, "\n"; - print STDERR "=== SANITY TESTING!\n"; - print STDERR "=== No configuration will be done, all other arguments will be ignored!\n"; - print STDERR "=" x 70, "\n"; - - foreach $target (sort keys %table) - { - my $pre_dso_scheme = "perlasm_scheme"; - my $dso_scheme = "dso_scheme"; - my $post_dso_scheme = "shared_target"; - +sub quotify { + my %processors = ( + perl => sub { my $x = shift; + $x =~ s/([\\\$\@"])/\\$1/g; + return '"'.$x.'"'; }, + ); + my $for = shift; + my $processor = + defined($processors{$for}) ? $processors{$for} : sub { shift; }; - if ($table{$target}->{$pre_dso_scheme} =~ /^(beos|dl|dlfcn|win32|vms)$/) - { - $errorcnt++; - print STDERR "SANITY ERROR: '$target' has the dso_scheme values\n"; - print STDERR " in the previous field\n"; - } - elsif ($table{$target}->{$post_dso_scheme} =~ /^(beos|dl|dlfcn|win32|vms)$/) - { - $errorcnt++; - print STDERR "SANITY ERROR: '$target' has the dso_scheme values\n"; - print STDERR " in the following field\n"; - } - elsif ($table{$target}->{$dso_scheme} !~ /^(beos|dl|dlfcn|win32|vms|)$/) - { - $errorcnt++; - print STDERR "SANITY ERROR: '$target' has the dso_scheme field = ",$table{$target}->{$dso_scheme},"\n"; - print STDERR " valid values are 'beos', 'dl', 'dlfcn', 'win32' and 'vms'\n"; - } - } - print STDERR "No sanity errors detected!\n" if $errorcnt == 0; - return $errorcnt; - } + map { $processor->($_); } @_; +}