[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  0e288c2af2f24121ebd5f0c58912d9429915c02a (commit)
       via  9c06cf04ee9aa6682e6cc635aeb453ac12e641c1 (commit)
      from  7807267bedb3b5ad18bce7ef2b984028fd0b7510 (commit)


- Log -----------------------------------------------------------------
commit 0e288c2af2f24121ebd5f0c58912d9429915c02a
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jun 29 21:11:48 2017 +0200

    util/mkdef.pl: Make symbol version processing Linux only
    
    For Windows, we care which way it is, the resulting file is just a pile
    of symbols.  For VMS, we really need to care about the numeric ordering,
    and getting the symbols sorted by symbol version too didn't agree with
    that.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3804)

commit 9c06cf04ee9aa6682e6cc635aeb453ac12e641c1
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jun 29 21:09:52 2017 +0200

    util/mkdef.pl: Add UNIX as a platform
    
    This allows us to guard Unix specific functions with
    #ifndef / #ifdef OPENSSL_SYS_UNIX
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3804)

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

Summary of changes:
 util/mkdef.pl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 0fdf965..cc2fef7 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -68,6 +68,7 @@ my $do_checkexist = 0;
 my $VMS=0;
 my $W32=0;
 my $NT=0;
+my $UNIX=0;
 my $linux=0;
 # Set this to make typesafe STACK definitions appear in DEF
 my $safe_stack_def = 0;
@@ -75,7 +76,7 @@ my $safe_stack_def = 0;
 my @known_platforms = ( "__FreeBSD__", "PERL5",
 			"EXPORT_VAR_AS_FUNCTION", "ZLIB", "_WIN32"
 			);
-my @known_ossl_platforms = ( "VMS", "WIN32", "WINNT", "OS2" );
+my @known_ossl_platforms = ( "UNIX", "VMS", "WIN32", "WINNT", "OS2" );
 my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
 			 "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
 			 "SHA256", "SHA512", "RMD160",
@@ -165,6 +166,7 @@ foreach (@ARGV, split(/ /, $config{options}))
 	}
 	if ($_ eq "linux") {
 		$linux=1;
+		$UNIX=1;
 	}
 	$VMS=1 if $_ eq "VMS";
 	if ($_ eq "zlib" || $_ eq "enable-zlib" || $_ eq "zlib-dynamic"
@@ -1064,6 +1066,7 @@ sub is_valid
 
 		if ($platforms) {
 			# platforms
+			if ($keyword eq "UNIX" && $UNIX) { return 1; }
 			if ($keyword eq "VMS" && $VMS) { return 1; }
 			if ($keyword eq "WIN32" && $W32) { return 1; }
 			if ($keyword eq "_WIN32" && $W32) { return 1; }
@@ -1210,7 +1213,6 @@ EOF
 					if(!$do_update);
 			} else {
 				(my $n, my $symversion, my $dummy) = split /\\/, $nums{$s};
-				next if $symversion ne $thisversion;
 				my %pf = ();
 				my $p = ($i =~ /^[^:]*:([^:]*):/,$1);
 				my $a = ($i =~ /^[^:]*:[^:]*:[^:]*:([^:]*)/,$1);
@@ -1223,6 +1225,7 @@ EOF
 					}
 					$prev = $s2;	# To warn about duplicates...
 					if($linux) {
+						next if $symversion ne $thisversion;
 						if ($symversion ne $prevsymversion) {
 							if ($prevsymversion ne "") {
 								if ($prevprevsymversion ne "") {
@@ -1278,7 +1281,7 @@ EOF
 				}
 			}
 		}
-	} while ($thisversion ne $currversion);
+	} while ($linux && $thisversion ne $currversion);
 	if ($linux) {
 		if ($prevprevsymversion ne "") {
 			print OUT "    local: *;\n} OPENSSL_$prevprevsymversion;\n\n";