diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-07-07 08:57:00 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-07-07 08:57:00 -0400 |
| commit | ddb34d947fe45fcc4d2a8da284e7fa0c001bb7d3 (patch) | |
| tree | ca8fc6529b2ff894f5264dbce5b53d3e595ee1c9 /openssl/util | |
| parent | bbc50e3219a2e7801f4e636fe90df08fe3a28323 (diff) | |
| download | vcxsrv-ddb34d947fe45fcc4d2a8da284e7fa0c001bb7d3.tar.gz vcxsrv-ddb34d947fe45fcc4d2a8da284e7fa0c001bb7d3.tar.bz2 vcxsrv-ddb34d947fe45fcc4d2a8da284e7fa0c001bb7d3.zip | |
Update openssl: 1.0.1m -> 1.0.1o
Diffstat (limited to 'openssl/util')
| -rw-r--r-- | openssl/util/mk1mf.pl | 2 | ||||
| -rw-r--r-- | openssl/util/mkerr.pl | 21 | ||||
| -rw-r--r-- | openssl/util/pl/BC-32.pl | 2 | ||||
| -rw-r--r-- | openssl/util/pl/VC-32.pl | 2 |
4 files changed, 17 insertions, 10 deletions
diff --git a/openssl/util/mk1mf.pl b/openssl/util/mk1mf.pl index 550ef9f68..1eee7aa34 100644 --- a/openssl/util/mk1mf.pl +++ b/openssl/util/mk1mf.pl @@ -326,7 +326,7 @@ open(IN,"<$infile") || die "unable to open $infile:$!\n"; $_=<IN>; for (;;) { - chop; + s/\s*$//; # was chop, didn't work in mixture of perls for Windows... ($key,$val)=/^([^=]+)=(.*)/; if ($key eq "RELATIVE_DIRECTORY") diff --git a/openssl/util/mkerr.pl b/openssl/util/mkerr.pl index 8d2fdbc7e..d87c4fd22 100644 --- a/openssl/util/mkerr.pl +++ b/openssl/util/mkerr.pl @@ -534,14 +534,21 @@ EOF # First, read any existing reason string definitions: my %err_reason_strings; if (open(IN,"<$cfile")) { + my $line = ""; while (<IN>) { - if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) { - $err_reason_strings{$1} = $2; - } - if (/\b${lib}_F_(\w*)\b.*\"(.*)\"/) { - if (!exists $ftrans{$1} && ($1 ne $2)) { - print STDERR "WARNING: Mismatched function string $2\n"; - $ftrans{$1} = $2; + chomp; + $_ = $line . $_; + $line = ""; + if (/{ERR_(FUNC|REASON)\(/) { + if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) { + $err_reason_strings{$1} = $2; + } elsif (/\b${lib}_F_(\w*)\b.*\"(.*)\"/) { + if (!exists $ftrans{$1} && ($1 ne $2)) { + print STDERR "WARNING: Mismatched function string $2\n"; + $ftrans{$1} = $2; + } + } else { + $line = $_; } } } diff --git a/openssl/util/pl/BC-32.pl b/openssl/util/pl/BC-32.pl index b41bb45e8..6d036644d 100644 --- a/openssl/util/pl/BC-32.pl +++ b/openssl/util/pl/BC-32.pl @@ -130,7 +130,7 @@ sub do_link_rule local($ret,$_); $file =~ s/\//$o/g if $o ne '/'; - $n=&bname($targer); + $n=&bname($target); $ret.="$target: $files $dep_libs\n"; $ret.="\t\$(LINK) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n\n"; return($ret); diff --git a/openssl/util/pl/VC-32.pl b/openssl/util/pl/VC-32.pl index 3705fc73b..b59799851 100644 --- a/openssl/util/pl/VC-32.pl +++ b/openssl/util/pl/VC-32.pl @@ -341,7 +341,7 @@ sub do_link_rule my($target,$files,$dep_libs,$libs,$standalone)=@_; local($ret,$_); $file =~ s/\//$o/g if $o ne '/'; - $n=&bname($targer); + $n=&bname($target); $ret.="$target: $files $dep_libs\n"; if ($standalone == 1) { |