X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fobjects%2Fobjxref.pl;h=833f4ab8829037ab2305935a4f9bd00cffbcfea1;hb=319d5c7a586a5695589494e16cb3dd5f82d753ca;hp=3fa584036e1e13cb430c742ec08620a4ba1c786f;hpb=aaa29f9e8354aa8a3a8d33474a28b70a2010ad30;p=oweals%2Fopenssl.git

diff --git a/crypto/objects/objxref.pl b/crypto/objects/objxref.pl
index 3fa584036e..833f4ab882 100644
--- 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;
 
-for(my $i = 0; $i <= $#srt1; $i++)
+my $i;
+for($i = 0; $i <= $#srt1; $i++)
 	{
 	$xref_tbl{$srt1[$i]}[2] = $i;
 	}
@@ -54,10 +55,13 @@ my @srt2 = sort
 
 	return $ap2 - $bp2;
 	} @xrkeys;
-	
+
+my $pname = $0;
+
+$pname =~ s|^.[^/]/||;
 
 print <<EOF;
-/* AUTOGENERATED BY $0, DO NOT EDIT */
+/* AUTOGENERATED BY $pname, DO NOT EDIT */
 
 typedef struct
 	{
@@ -87,7 +91,10 @@ EOF
 
 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";
 	}