diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-01-08 22:40:39 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-01-08 22:40:39 +0000 |
| commit | c6485458b37e3f0f5d1c69c0452e4551ac3b1824 (patch) | |
| tree | c2b36ecba3cb850d324786e97809c541cb5c2d5a /crypto/objects | |
| parent | 58ab7656b2c140e06d60a7831a9f5b6e1ddc2fe5 (diff) | |
| download | src-c6485458b37e3f0f5d1c69c0452e4551ac3b1824.tar.gz src-c6485458b37e3f0f5d1c69c0452e4551ac3b1824.zip | |
Import OpenSSL 1.0.1k.vendor/openssl/1.0.1k
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=276856
svn path=/vendor-crypto/openssl/1.0.1k/; revision=276858; tag=vendor/openssl/1.0.1k
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/obj_xref.h | 3 | ||||
| -rwxr-xr-x | crypto/objects/objxref.pl | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crypto/objects/obj_xref.h b/crypto/objects/obj_xref.h index e23938c29604..33cb24b0708b 100644 --- a/crypto/objects/obj_xref.h +++ b/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/crypto/objects/objxref.pl b/crypto/objects/objxref.pl index 731d3ae22c27..6c4c832ab205 100755 --- 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"; } |