Import OpenSSL 1.1.0f

This commit is contained in:
Steve Dower
2017-09-07 16:27:43 -07:00
committed by Steve Dower
parent ccd3ab4aff
commit f4b81cb7c9
3340 changed files with 325158 additions and 557542 deletions

View File

@@ -1,307 +1,227 @@
#!/usr/local/bin/perl
#! /usr/bin/env perl
# Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the OpenSSL license (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
# fixes bug in floating point emulation on sparc64 when
# this script produces off-by-one output on sparc64
use integer;
use strict;
use warnings;
sub obj_cmp
{
local(@a,@b,$_,$r);
# Generate the DER encoding for the given OID.
sub der_it
{
# Prologue
my ($v) = @_;
my @a = split(/\s+/, $v);
my $ret = pack("C*", $a[0] * 40 + $a[1]);
shift @a;
shift @a;
$A=$obj_len{$obj{$nid{$a}}};
$B=$obj_len{$obj{$nid{$b}}};
# Loop over rest of bytes; or in 0x80 for multi-byte numbers.
my $t;
foreach (@a) {
my @r = ();
$t = 0;
while ($_ >= 128) {
my $x = $_ % 128;
$_ /= 128;
push(@r, ($t++ ? 0x80 : 0) | $x);
}
push(@r, ($t++ ? 0x80 : 0) | $_);
$ret .= pack("C*", reverse(@r));
}
return $ret;
}
$r=($A-$B);
return($r) if $r != 0;
$A=$obj_der{$obj{$nid{$a}}};
$B=$obj_der{$obj{$nid{$b}}};
return($A cmp $B);
}
sub expand_obj
{
local(*v)=@_;
local($k,$d);
local($i);
do {
$i=0;
foreach $k (keys %v)
{
if (($v{$k} =~ s/(OBJ_[^,]+),/$v{$1},/))
{ $i++; }
}
} while($i);
foreach $k (keys %v)
{
@a=split(/,/,$v{$k});
$objn{$k}=$#a+1;
}
return(%objn);
}
open (IN,"$ARGV[0]") || die "Can't open input file $ARGV[0]";
open (OUT,">$ARGV[1]") || die "Can't open output file $ARGV[1]";
while (<IN>)
{
next unless /^\#define\s+(\S+)\s+(.*)$/;
$v=$1;
$d=$2;
$d =~ s/^\"//;
$d =~ s/\"$//;
if ($v =~ /^SN_(.*)$/)
{
if(defined $snames{$d})
{
print "WARNING: Duplicate short name \"$d\"\n";
}
else
{ $snames{$d} = "X"; }
$sn{$1}=$d;
}
elsif ($v =~ /^LN_(.*)$/)
{
if(defined $lnames{$d})
{
print "WARNING: Duplicate long name \"$d\"\n";
}
else
{ $lnames{$d} = "X"; }
$ln{$1}=$d;
}
elsif ($v =~ /^NID_(.*)$/)
{ $nid{$d}=$1; }
elsif ($v =~ /^OBJ_(.*)$/)
{
$obj{$1}=$v;
$objd{$v}=$d;
}
}
# Read input, parse all #define's into OID name and value.
# Populate %ln and %sn with long and short names (%dupln and %dupsn)
# are used to watch for duplicates. Also %nid and %obj get the
# NID and OBJ entries.
my %ln;
my %sn;
my %dupln;
my %dupsn;
my %nid;
my %obj;
my %objd;
open(IN, "$ARGV[0]") || die "Can't open input file $ARGV[0], $!";
while (<IN>) {
next unless /^\#define\s+(\S+)\s+(.*)$/;
my $v = $1;
my $d = $2;
$d =~ s/^\"//;
$d =~ s/\"$//;
if ($v =~ /^SN_(.*)$/) {
if (defined $dupsn{$d}) {
print "WARNING: Duplicate short name \"$d\"\n";
} else {
$dupsn{$d} = 1;
}
$sn{$1} = $d;
}
elsif ($v =~ /^LN_(.*)$/) {
if (defined $dupln{$d}) {
print "WARNING: Duplicate long name \"$d\"\n";
} else {
$dupln{$d} = 1;
}
$ln{$1} = $d;
}
elsif ($v =~ /^NID_(.*)$/) {
$nid{$d} = $1;
}
elsif ($v =~ /^OBJ_(.*)$/) {
$obj{$1} = $v;
$objd{$v} = $d;
}
}
close IN;
%ob=&expand_obj(*objd);
# For every value in %obj, recursively expand OBJ_xxx values. That is:
# #define OBJ_iso 1L
# #define OBJ_identified_organization OBJ_iso,3L
# Modify %objd values in-place. Create an %objn array that has
my $changed;
do {
$changed = 0;
foreach my $k (keys %objd) {
$changed = 1 if $objd{$k} =~ s/(OBJ_[^,]+),/$objd{$1},/;
}
} while ($changed);
@a=sort { $a <=> $b } keys %nid;
$n=$a[$#a]+1;
my @a = sort { $a <=> $b } keys %nid;
my $n = $a[$#a] + 1;
my @lvalues = ();
my $lvalues = 0;
@lvalues=();
$lvalues=0;
# Scan all defined objects, building up the @out array.
# %obj_der holds the DER encoding as an array of bytes, and %obj_len
# holds the length in bytes.
my @out;
my %obj_der;
my %obj_len;
for (my $i = 0; $i < $n; $i++) {
if (!defined $nid{$i}) {
push(@out, " { NULL, NULL, NID_undef },\n");
next;
}
for ($i=0; $i<$n; $i++)
{
if (!defined($nid{$i}))
{
push(@out,"{NULL,NULL,NID_undef,0,NULL,0},\n");
}
else
{
$sn=defined($sn{$nid{$i}})?"$sn{$nid{$i}}":"NULL";
$ln=defined($ln{$nid{$i}})?"$ln{$nid{$i}}":"NULL";
my $sn = defined $sn{$nid{$i}} ? "$sn{$nid{$i}}" : "NULL";
my $ln = defined $ln{$nid{$i}} ? "$ln{$nid{$i}}" : "NULL";
if ($sn eq "NULL") {
$sn = $ln;
$sn{$nid{$i}} = $ln;
}
if ($ln eq "NULL") {
$ln = $sn;
$ln{$nid{$i}} = $sn;
}
if ($sn eq "NULL") {
$sn=$ln;
$sn{$nid{$i}} = $ln;
}
my $out = " {\"$sn\", \"$ln\", NID_$nid{$i}";
if (defined $obj{$nid{$i}} && $objd{$obj{$nid{$i}}} =~ /,/) {
my $v = $objd{$obj{$nid{$i}}};
$v =~ s/L//g;
$v =~ s/,/ /g;
my $r = &der_it($v);
my $z = "";
my $length = 0;
# Format using fixed-with because we use strcmp later.
foreach (unpack("C*",$r)) {
$z .= sprintf("0x%02X,", $_);
$length++;
}
$obj_der{$obj{$nid{$i}}} = $z;
$obj_len{$obj{$nid{$i}}} = $length;
if ($ln eq "NULL") {
$ln=$sn;
$ln{$nid{$i}} = $sn;
}
$out ="{";
$out.="\"$sn\"";
$out.=","."\"$ln\"";
$out.=",NID_$nid{$i},";
if (defined($obj{$nid{$i}}) && $objd{$obj{$nid{$i}}} =~ /,/)
{
$v=$objd{$obj{$nid{$i}}};
$v =~ s/L//g;
$v =~ s/,/ /g;
$r=&der_it($v);
$z="";
$length=0;
foreach (unpack("C*",$r))
{
$z.=sprintf("0x%02X,",$_);
$length++;
}
$obj_der{$obj{$nid{$i}}}=$z;
$obj_len{$obj{$nid{$i}}}=$length;
push(@lvalues,sprintf("%-45s/* [%3d] %s */\n",
$z,$lvalues,$obj{$nid{$i}}));
$out.="$length,&(lvalues[$lvalues]),0";
$lvalues+=$length;
}
else
{
$out.="0,NULL,0";
}
$out.="},\n";
push(@out,$out);
}
}
@a=grep(defined($sn{$nid{$_}}),0 .. $n);
foreach (sort { $sn{$nid{$a}} cmp $sn{$nid{$b}} } @a)
{
push(@sn,sprintf("%2d,\t/* \"$sn{$nid{$_}}\" */\n",$_));
}
@a=grep(defined($ln{$nid{$_}}),0 .. $n);
foreach (sort { $ln{$nid{$a}} cmp $ln{$nid{$b}} } @a)
{
push(@ln,sprintf("%2d,\t/* \"$ln{$nid{$_}}\" */\n",$_));
}
@a=grep(defined($obj{$nid{$_}}),0 .. $n);
foreach (sort obj_cmp @a)
{
$m=$obj{$nid{$_}};
$v=$objd{$m};
$v =~ s/L//g;
$v =~ s/,/ /g;
push(@ob,sprintf("%2d,\t/* %-32s %s */\n",$_,$m,$v));
}
push(@lvalues,
sprintf(" %-45s /* [%5d] %s */\n",
$z, $lvalues, $obj{$nid{$i}}));
$out .= ", $length, &so[$lvalues]";
$lvalues += $length;
}
$out .= "},\n";
push(@out, $out);
}
# Finally ready to generate the output.
open(OUT, ">$ARGV[1]") || die "Can't open output file $ARGV[1], $!";
print OUT <<'EOF';
/* crypto/objects/obj_dat.h */
/* THIS FILE IS GENERATED FROM objects.h by obj_dat.pl via the
* following command:
* perl obj_dat.pl obj_mac.h obj_dat.h
*/
/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
* All rights reserved.
/*
* WARNING: do not edit!
* Generated by crypto/objects/obj_dat.pl
*
* This package is an SSL implementation written
* by Eric Young (eay@cryptsoft.com).
* The implementation was written so as to conform with Netscapes SSL.
*
* This library is free for commercial and non-commercial use as long as
* the following conditions are aheared to. The following conditions
* apply to all code found in this distribution, be it the RC4, RSA,
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
* included with this distribution is covered by the same copyright terms
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
*
* Copyright remains Eric Young's, and as such any Copyright notices in
* the code are not to be removed.
* If this package is used in a product, Eric Young should be given attribution
* as the author of the parts of the library used.
* This can be in the form of a textual message at program startup or
* in documentation (online or textual) provided with the package.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* "This product includes cryptographic software written by
* Eric Young (eay@cryptsoft.com)"
* The word 'cryptographic' can be left out if the rouines from the library
* being used are not cryptographic related :-).
* 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
*
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* The licence and distribution terms for any publically available version or
* derivative of this code cannot be changed. i.e. this code cannot simply be
* copied and put under another distribution licence
* [including the GNU Public Licence.]
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
* Licensed under the OpenSSL license (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
*/
EOF
printf OUT "#define NUM_NID %d\n",$n;
printf OUT "#define NUM_SN %d\n",$#sn+1;
printf OUT "#define NUM_LN %d\n",$#ln+1;
printf OUT "#define NUM_OBJ %d\n\n",$#ob+1;
printf OUT "static const unsigned char lvalues[%d]={\n",$lvalues+1;
print OUT "/* Serialized OID's */\n";
printf OUT "static const unsigned char so[%d] = {\n", $lvalues + 1;
print OUT @lvalues;
print OUT "};\n\n";
printf OUT "static const ASN1_OBJECT nid_objs[NUM_NID]={\n";
foreach (@out)
{
if (length($_) > 75)
{
$out="";
foreach (split(/,/))
{
$t=$out.$_.",";
if (length($t) > 70)
{
print OUT "$out\n";
$t="\t$_,";
}
$out=$t;
}
chop $out;
print OUT "$out";
}
else
{ print OUT $_; }
}
printf OUT "#define NUM_NID %d\n", $n;
printf OUT "static const ASN1_OBJECT nid_objs[NUM_NID] = {\n";
print OUT @out;
print OUT "};\n\n";
printf OUT "static const unsigned int sn_objs[NUM_SN]={\n";
print OUT @sn;
{
no warnings "uninitialized";
@a = grep(defined $sn{$nid{$_}}, 0 .. $n);
}
printf OUT "#define NUM_SN %d\n", $#a + 1;
printf OUT "static const unsigned int sn_objs[NUM_SN] = {\n";
foreach (sort { $sn{$nid{$a}} cmp $sn{$nid{$b}} } @a) {
printf OUT " %4d, /* \"$sn{$nid{$_}}\" */\n", $_;
}
print OUT "};\n\n";
printf OUT "static const unsigned int ln_objs[NUM_LN]={\n";
print OUT @ln;
{
no warnings "uninitialized";
@a = grep(defined $ln{$nid{$_}}, 0 .. $n);
}
printf OUT "#define NUM_LN %d\n", $#a + 1;
printf OUT "static const unsigned int ln_objs[NUM_LN] = {\n";
foreach (sort { $ln{$nid{$a}} cmp $ln{$nid{$b}} } @a) {
printf OUT " %4d, /* \"$ln{$nid{$_}}\" */\n", $_;
}
print OUT "};\n\n";
printf OUT "static const unsigned int obj_objs[NUM_OBJ]={\n";
print OUT @ob;
print OUT "};\n\n";
{
no warnings "uninitialized";
@a = grep(defined $obj{$nid{$_}}, 0 .. $n);
}
printf OUT "#define NUM_OBJ %d\n", $#a + 1;
printf OUT "static const unsigned int obj_objs[NUM_OBJ] = {\n";
# Compare DER; prefer shorter; if some length, use the "smaller" encoding.
sub obj_cmp
{
no warnings "uninitialized";
my $A = $obj_len{$obj{$nid{$a}}};
my $B = $obj_len{$obj{$nid{$b}}};
my $r = $A - $B;
return $r if $r != 0;
$A = $obj_der{$obj{$nid{$a}}};
$B = $obj_der{$obj{$nid{$b}}};
return $A cmp $B;
}
foreach (sort obj_cmp @a) {
my $m = $obj{$nid{$_}};
my $v = $objd{$m};
$v =~ s/L//g;
$v =~ s/,/ /g;
printf OUT " %4d, /* %-32s %s */\n", $_, $m, $v;
}
print OUT "};\n";
close OUT;
sub der_it
{
local($v)=@_;
local(@a,$i,$ret,@r);
@a=split(/\s+/,$v);
$ret.=pack("C*",$a[0]*40+$a[1]);
shift @a;
shift @a;
foreach (@a)
{
@r=();
$t=0;
while ($_ >= 128)
{
$x=$_%128;
$_/=128;
push(@r,((($t++)?0x80:0)|$x));
}
push(@r,((($t++)?0x80:0)|$_));
$ret.=pack("C*",reverse(@r));
}
return($ret);
}