projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ec/ecp_nistz256.c: further harmonization with latest rules.
[oweals/openssl.git]
/
crypto
/
objects
/
objxref.pl
diff --git
a/crypto/objects/objxref.pl
b/crypto/objects/objxref.pl
index 3fa584036e1e13cb430c742ec08620a4ba1c786f..833f4ab8829037ab2305935a4f9bd00cffbcfea1 100644
(file)
--- a/
crypto/objects/objxref.pl
+++ b/
crypto/objects/objxref.pl
@@
-39,7
+39,8
@@
my @xrkeys = keys %xref_tbl;
my @srt1 = sort { $oid_tbl{$a} <=> $oid_tbl{$b}} @xrkeys;
my @srt1 = sort { $oid_tbl{$a} <=> $oid_tbl{$b}} @xrkeys;
-for(my $i = 0; $i <= $#srt1; $i++)
+my $i;
+for($i = 0; $i <= $#srt1; $i++)
{
$xref_tbl{$srt1[$i]}[2] = $i;
}
{
$xref_tbl{$srt1[$i]}[2] = $i;
}
@@
-54,10
+55,13
@@
my @srt2 = sort
return $ap2 - $bp2;
} @xrkeys;
return $ap2 - $bp2;
} @xrkeys;
-
+
+my $pname = $0;
+
+$pname =~ s|^.[^/]/||;
print <<EOF;
print <<EOF;
-/* AUTOGENERATED BY $
0
, DO NOT EDIT */
+/* AUTOGENERATED BY $
pname
, DO NOT EDIT */
typedef struct
{
typedef struct
{
@@
-87,7
+91,10
@@
EOF
foreach (@srt2)
{
foreach (@srt2)
{
- my $x = $xref_tbl{$_}[2];
+ my ($p1, $p2, $x) = @{$xref_tbl{$_}};
+ # 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 "\t\&sigoid_srt\[$x\],\n";
}