From aaf933597001578c193f853c8e68470a8b7d9fd0 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sat, 1 Nov 2014 00:10:56 +0000 Subject: [PATCH] Fix cross reference table generator. If the hash or public key algorithm is "undef" the signature type will receive special handling and shouldn't be included in the cross reference table. Reviewed-by: Tim Hudson (cherry picked from commit 55f7fb8848b6e4bec291724a479e1580d6f407d6) Conflicts: crypto/objects/obj_xref.h --- crypto/objects/obj_xref.h | 2 -- crypto/objects/objxref.pl | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/crypto/objects/obj_xref.h b/crypto/objects/obj_xref.h index 7836f01d95..25e7222d44 100644 --- a/crypto/objects/obj_xref.h +++ b/crypto/objects/obj_xref.h @@ -42,8 +42,6 @@ static const nid_triple sigoid_srt[] = static const nid_triple * const sigoid_srt_xref[] = { - &sigoid_srt[17], - &sigoid_srt[18], &sigoid_srt[0], &sigoid_srt[1], &sigoid_srt[7], diff --git a/crypto/objects/objxref.pl b/crypto/objects/objxref.pl index 731d3ae22c..6c4c832ab2 100644 --- a/crypto/objects/objxref.pl +++ b/crypto/objects/objxref.pl @@ -90,7 +90,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"; } -- 2.34.1