Hakase/openssl-custom
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity

Latest update. (3.0.0-dev)

Browse Source
This commit is contained in:
Hakase
2018-12-06 23:51:02 +09:00
parent 5fd41967fd
commit 3aaee0f8f9
2113 changed files with 3892 additions and 3218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/perl/OpenSSL/Ordinals.pm
+6 -4
View File
@@ -1,7 +1,7 @@
#! /usr/bin/env perl
# Copyright 2018 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the OpenSSL license (the "License"). You may not use
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
# in the file LICENSE in the source distribution or at
# https://www.openssl.org/source/license.html
@@ -638,7 +638,7 @@ STRING must conform to the following EBNF description:
space = " " | "\t";
symbol = ( letter | "_"), { letter | digit | "_" };
ordinal = number;
version = number, "_", number, "_", number, letter, [ letter ];
version = number, "_", number, "_", number, [ letter, [ letter ] ];
exist = "EXIST" | "NOEXIST";
platforms = platform, { ",", platform };
platform = ( letter | "_" ) { letter | digit | "_" };
@@ -678,7 +678,7 @@ sub new {
unless ( scalar @a == 4
&& $a[0] =~ /^[A-Za-z_][A-Za-z_0-9]*$/
&& $a[1] =~ /^\d+$/
&& $a[2] =~ /^(?:\*|\d+_\d+_\d+(?:[a-z]{0,2}))$/
&& $a[2] =~ /^(?:\*|\d+_\d+_\d+[a-z]{0,2})$/
&& $a[3] =~ /^
(?:NO)?EXIST:
[^:]*:
@@ -841,6 +841,8 @@ OpenSSL::Ordinals::Item objects.
=cut
sub by_version {
# Until we're rid of everything with the old version scheme,
# we need to be able to handle older style x.y.zl versions.
sub _ossl_versionsplit {
my $textversion = shift;
return $textversion if $textversion eq '*';
@@ -891,7 +893,7 @@ sub f_version {
$version =~ s|\.|_|g if $version;
croak "No version specified"
unless $version && $version =~ /^\d_\d_\d[a-z]{0,2}$/;
unless $version && $version =~ /^\d+_\d+_\d+[a-z]{0,2}$/;
return sub { $_[0]->version() eq $version };
}
util/perl/OpenSSL/ParseC.pm
+5 -15
View File
@@ -1,7 +1,7 @@
#! /usr/bin/env perl
# Copyright 2018 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the OpenSSL license (the "License"). You may not use
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
# in the file LICENSE in the source distribution or at
# https://www.openssl.org/source/license.html
@@ -65,21 +65,11 @@ my @opensslcpphandlers = (
# These are used to convert certain pre-precessor expressions into
# others that @cpphandlers have a better chance to understand.
{ regexp => qr/#if OPENSSL_API_COMPAT(\S+)(0x[0-9a-fA-F]{8})L$/,
{ regexp => qr/#if (!?)OPENSSL_API_([0-9_]+)$/,
massager => sub {
my $op = $1;
my $v = hex($2);
if ($op ne '<' && $op ne '>=') {
die "Error: unacceptable operator $op: $_[0]\n";
}
my ($one, $major, $minor) =
( ($v >> 28) & 0xf,
($v >> 20) & 0xff,
($v >> 12) & 0xff );
my $t = "DEPRECATEDIN_${one}_${major}_${minor}";
my $cond = $op eq '<' ? 'ifndef' : 'ifdef';
my $cnd = $1 eq '!' ? 'ndef' : 'def';
return (<<"EOF");
#$cond $t
#if$cnd DEPRECATEDIN_$2
EOF
}
}
@@ -284,7 +274,7 @@ EOF
# We trick the parser by pretending that the declaration is wrapped in a
# check if the DEPRECATEDIN macro is defined or not. Callers of parse()
# will have to decide what to do with it.
{ regexp => qr/(DEPRECATEDIN_\d+_\d+_\d+)<<<\((.*)\)>>>/,
{ regexp => qr/(DEPRECATEDIN_\d+(?:_\d+_\d+)?)<<<\((.*)\)>>>/,
massager => sub { return (<<"EOF");
#ifndef $1
$2;
util/perl/OpenSSL/Test.pm
+6 -7
View File
@@ -1,6 +1,6 @@
# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the OpenSSL license (the "License"). You may not use
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
# in the file LICENSE in the source distribution or at
# https://www.openssl.org/source/license.html
@@ -810,9 +810,9 @@ sub quotify {
=item B<openssl_versions>
Returns a list of two numbers, the first representing the build version,
the second representing the library version. See opensslv.h for more
information on those numbers.
Returns a list of two version numbers, the first representing the build
version, the second representing the library version. See opensslv.h for
more information on those numbers.
=back
@@ -823,9 +823,8 @@ sub openssl_versions {
unless (@versions) {
my %lines =
map { s/\R$//;
/^(.*): (0x[[:xdigit:]]{8})$/;
die "Weird line: $_" unless defined $1;
$1 => hex($2) }
/^(.*): (.*)$/;
$1 => $2 }
run(test(['versions']), capture => 1);
@versions = ( $lines{'Build version'}, $lines{'Library version'} );
}
util/perl/OpenSSL/Test/Simple.pm
+1 -1
View File
@@ -1,6 +1,6 @@
# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the OpenSSL license (the "License"). You may not use
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
# in the file LICENSE in the source distribution or at
# https://www.openssl.org/source/license.html
util/perl/OpenSSL/Test/Utils.pm
+1 -1
View File
@@ -1,6 +1,6 @@
# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the OpenSSL license (the "License"). You may not use
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
# in the file LICENSE in the source distribution or at
# https://www.openssl.org/source/license.html
util/perl/OpenSSL/Util/Pod.pm
+1 -1
View File
@@ -1,6 +1,6 @@
# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the OpenSSL license (the "License"). You may not use
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
# in the file LICENSE in the source distribution or at
# https://www.openssl.org/source/license.html