wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make objxref.pl output in correct format

Browse source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 6922ddee1b)
This commit is contained in:
Dr. Stephen Henson 2015-02-04 03:31:34 +00:00
parent 3b740cebd5
commit 75c77a71fa
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
crypto/objects/objxref.pl
View file

@ -63,30 +63,36 @@ $pname =~ s|^.[^/]/||;
print <<EOF;
/* AUTOGENERATED BY $pname, DO NOT EDIT */
typedef struct
{
int sign_id;
int hash_id;
int pkey_id;
} nid_triple;
typedef struct {
int sign_id;
int hash_id;
int pkey_id;
} nid_triple;
static const nid_triple sigoid_srt[] =
{
static const nid_triple sigoid_srt[] = {
EOF
foreach (@srt1)
{
my $xr = $_;
my ($p1, $p2) = @{$xref_tbl{$_}};
print "\t{NID_$xr, NID_$p1, NID_$p2},\n";
}
my $o1 = " {NID_$xr, NID_$p1,";
my $o2 = "NID_$p2},";
if (length("$o1 $o2") < 78)
{
print "$o1 $o2\n";
}
else
{
print "$o1\n $o2\n";
}
}
print "\t};";
print "};";
print <<EOF;
static const nid_triple * const sigoid_srt_xref[] =
{
static const nid_triple *const sigoid_srt_xref[] = {
EOF
foreach (@srt2)
@ -95,10 +101,10 @@ foreach (@srt2)
# If digest or signature algorithm is "undef" then the algorithm
# needs special handling and is excluded from the cross reference table.
next if $p1 eq "undef" || $p2 eq "undef";
print "\t\&sigoid_srt\[$x\],\n";
print " \&sigoid_srt\[$x\],\n";
}
print "\t};\n\n";
print "};\n";
sub check_oid
{
@ -108,4 +114,3 @@ sub check_oid
die "Not Found \"$chk\"\n";
}
}