[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  3c8be9c35068a283a70054ded86de7495e2e0877 (commit)
       via  67d81419f53660ffd166c785803dea7804c76e72 (commit)
      from  fd2107e077c94b61df7dcca0cc1aed9b833927dd (commit)


- Log -----------------------------------------------------------------
commit 3c8be9c35068a283a70054ded86de7495e2e0877
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Aug 31 19:47:35 2016 +0200

    Have Configure's HASH or TABLE produce complete lists
    
    Because some targets execute perl code that might die, we risk
    incomplete lists.  Make it so dying doesn't happen when we're listing
    targets.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit d63c12c697faa4e2fa0e5d7565521a5813c86415)

commit 67d81419f53660ffd166c785803dea7804c76e72
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Aug 31 19:47:08 2016 +0200

    Configure's print_table_entry printed incorrect information
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit 0c0d78b88d0bc4171b577ba3877c7b7ed0e91935)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/10-main.conf | 33 +++++++++++++++++++++--------
 Configure                   | 51 +++++++++++++++++++++++++++++----------------
 2 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 2838c3d..e75d164 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -14,7 +14,10 @@ sub vc_win64a_info {
                                 asflags   => "/c /Cp /Cx /Zi",
                                 asoutflag => "/Fo" };
         } else {
-            die "NASM not found - please read INSTALL and NOTES.WIN for further details\n";
+            $die->("NASM not found - please read INSTALL and NOTES.WIN for further details\n");
+            $vc_win64a_info = { as        => "{unknown}",
+                                asflags   => "",
+                                asoutflag => "" };
         }
     }
     return $vc_win64a_info;
@@ -36,7 +39,11 @@ sub vc_win32_info {
                                asoutflag => "/Fo",
                                perlasm_scheme => "win32" };
         } else {
-            die "NASM not found - please read INSTALL and NOTES.WIN for further details\n";
+            $die->("NASM not found - please read INSTALL and NOTES.WIN for further details\n");
+            $vc_win32_info = { as        => "{unknown}",
+                               asflags   => "",
+                               asoutflag => "",
+                               perlasm_scheme => "win32" };
         }
     }
     return $vc_win32_info;
@@ -46,18 +53,26 @@ my $vc_wince_info = {};
 sub vc_wince_info {
     unless (%$vc_wince_info) {
         # sanity check
-        die '%OSVERSION% is not defined' if (!defined($ENV{'OSVERSION'}));
-        die '%PLATFORM% is not defined'  if (!defined($ENV{'PLATFORM'}));
-        die '%TARGETCPU% is not defined' if (!defined($ENV{'TARGETCPU'}));
+        $die->('%OSVERSION% is not defined') if (!defined($ENV{'OSVERSION'}));
+        $die->('%PLATFORM% is not defined')  if (!defined($ENV{'PLATFORM'}));
+        $die->('%TARGETCPU% is not defined') if (!defined($ENV{'TARGETCPU'}));
 
         #
         # Idea behind this is to mimic flags set by eVC++ IDE...
         #
         my $wcevers = $ENV{'OSVERSION'};                    # WCENNN
-        die '%OSVERSION% value is insane'
-            if ($wcevers !~ /^WCE([1-9])([0-9]{2})$/);
-        my $wcecdefs = "-D_WIN32_WCE=$1$2 -DUNDER_CE=$1$2"; # -D_WIN32_WCE=NNN
-        my $wcelflag = "/subsystem:windowsce,$1.$2";        # ...,N.NN
+	my $wcevernum;
+	my $wceverdotnum;
+	if ($wcevers =~ /^WCE([1-9])([0-9]{2})$/) {
+	    $wcevernum = "$1$2";
+	    $wceverdotnum = "$1.$2";
+	} else {
+	    $die->('%OSVERSION% value is insane');
+	    $wcevernum = "{unknown}";
+	    $wceverdotnum = "{unknown}";
+	}
+        my $wcecdefs = "-D_WIN32_WCE=$wcevernum -DUNDER_CE=$wcevernum"; # -D_WIN32_WCE=NNN
+        my $wcelflag = "/subsystem:windowsce,$wceverdotnum";        # ...,N.NN
 
         my $wceplatf =  $ENV{'PLATFORM'};
 
diff --git a/Configure b/Configure
index b95f311..4fbce03 100755
--- a/Configure
+++ b/Configure
@@ -788,7 +788,9 @@ while (@tocheckfor) {
     @tocheckfor = (keys %new_tocheckfor);
 }
 
+our $die = sub { die @_; };
 if ($target eq "TABLE") {
+    local $die = sub { warn @_; };
     foreach (sort keys %table) {
 	print_table_entry($_, "TABLE");
     }
@@ -803,6 +805,7 @@ if ($target eq "LIST") {
 }
 
 if ($target eq "HASH") {
+    local $die = sub { warn @_; };
     print "%table = (\n";
     foreach (sort keys %table) {
 	print_table_entry($_, "HASH");
@@ -2447,41 +2450,53 @@ sub print_table_entry
 	"unistd",
 	"ld",
 	"lflags",
+	"loutflag",
 	"plib_lflags",
 	"ex_libs",
 	"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",
-	"padlock_obj",
+	"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",
 	"dso_scheme",
 	"shared_target",
 	"shared_cflag",
+	"shared_defines",
 	"shared_ldflag",
 	"shared_rcflag",
 	"shared_extension",
-	"shared_extension_simple",
-	"shared_import_extension",
 	"dso_extension",
 	"obj_extension",
 	"exe_extension",
 	"ranlib",
 	"ar",
 	"arflags",
+	"aroutflag",
+	"rc",
+	"rcflags",
+	"rcoutflag",
+	"mt",
+	"mtflags",
+	"mtinflag",
+	"mtoutflag",
 	"multilib",
 	"build_scheme",
 	);