From ee914bf036b78dcbde9bf694794c15482d721028 Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Sat, 10 Jan 2015 12:26:41 -0500 Subject: Update openssl to version openssl-1.0.1k Conflicts: openssl/Makefile --- openssl/crypto/objects/obj_xref.h | 3 --- openssl/crypto/objects/objxref.pl | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'openssl/crypto/objects') diff --git a/openssl/crypto/objects/obj_xref.h b/openssl/crypto/objects/obj_xref.h index e23938c29..33cb24b07 100644 --- a/openssl/crypto/objects/obj_xref.h +++ b/openssl/crypto/objects/obj_xref.h @@ -43,9 +43,6 @@ static const nid_triple sigoid_srt[] = static const nid_triple * const sigoid_srt_xref[] = { - &sigoid_srt[29], - &sigoid_srt[17], - &sigoid_srt[18], &sigoid_srt[0], &sigoid_srt[1], &sigoid_srt[7], diff --git a/openssl/crypto/objects/objxref.pl b/openssl/crypto/objects/objxref.pl index 731d3ae22..6c4c832ab 100644 --- a/openssl/crypto/objects/objxref.pl +++ b/openssl/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"; } -- cgit v1.2.3