diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-01-10 12:26:41 -0500 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-02-28 07:16:26 -0500 |
| commit | 29d3851ef58419274f5f80a050d22b14319eff74 (patch) | |
| tree | c70cbddb9c2100abb5e0e5fdd5acaf180b89b946 /openssl/crypto/objects | |
| parent | a1babdda61e8cb3f8d0608d87120ba46ca91a21d (diff) | |
| download | vcxsrv-29d3851ef58419274f5f80a050d22b14319eff74.tar.gz vcxsrv-29d3851ef58419274f5f80a050d22b14319eff74.tar.bz2 vcxsrv-29d3851ef58419274f5f80a050d22b14319eff74.zip | |
Update openssl to version openssl-1.0.1k
Diffstat (limited to 'openssl/crypto/objects')
| -rw-r--r-- | openssl/crypto/objects/obj_xref.h | 3 | ||||
| -rw-r--r-- | openssl/crypto/objects/objxref.pl | 5 |
2 files changed, 4 insertions, 4 deletions
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"; } |