The branch OpenSSL_1_1_0-stable has been updated
via 60ccf93d1bb5fb29907f789a913e6e259dfc1ee2 (commit)
via c2b980d89fa8aa2084206f007ab9879cee4cda4e (commit)
from de403939a65e3aa581a97aa9a6c60b9d75c3ae8c (commit)
- Log -----------------------------------------------------------------
commit 60ccf93d1bb5fb29907f789a913e6e259dfc1ee2
Author: Richard Levitte <levi...@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 <rs...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3804)
(cherry picked from commit 0e288c2af2f24121ebd5f0c58912d9429915c02a)
commit c2b980d89fa8aa2084206f007ab9879cee4cda4e
Author: Richard Levitte <levi...@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 <rs...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3804)
(cherry picked from commit 9c06cf04ee9aa6682e6cc635aeb453ac12e641c1)
-----------------------------------------------------------------------
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 f54d7d4..b057115 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -66,6 +66,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;
@@ -73,7 +74,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",
@@ -153,6 +154,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"
@@ -1095,6 +1097,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; }
@@ -1241,7 +1244,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);
@@ -1254,6 +1256,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 "") {
@@ -1309,7 +1312,7 @@ EOF
}
}
}
- } while ($thisversion ne $currversion);
+ } while ($linux && $thisversion ne $currversion);
if ($linux) {
if ($prevprevsymversion ne "") {
print OUT " local: *;\n}
OPENSSL_$prevprevsymversion;\n\n";
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
