Rewrite obj_xref.c

Instead of having two unreadable tables placed in a header generated by a
janky perl script from an ugly text file, use a single table inlined in
the C file. This table is used to translate between signature algorithm
OIDs and pairs of OIDs of a message digest and a cipher. The table has
fewer than fifty entries and isn't used in a hot path. Using binary search
is overkill. Just do two linear searches, one for each translation. None
of the original code remains apart from the API.

ok jsing

1 files changed, 0 insertions, 111 deletions

diff --git a/src/lib/libcrypto/objects/objxref.pl b/src/lib/libcrypto/objects/objxref.pl
deleted file mode 100644
index 8873c91ad9..0000000000
--- a/src/lib/libcrypto/objects/objxref.pl
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/local/bin/perl
-
-use strict;
-
-my %xref_tbl;
-my %oid_tbl;
-
-my ($mac_file, $xref_file) = @ARGV;
-
-open(IN, $mac_file) || die "Can't open $mac_file";
-
-# Read in OID nid values for a lookup table.
-
-while (<IN>)
-        {
-        chomp;
-        my ($name, $num) = /^(\S+)\s+(\S+)$/;
-        $oid_tbl{$name} = $num;
-        }
-close IN;
-
-open(IN, $xref_file) || die "Can't open $xref_file";
-
-my $ln = 1;
-
-while (<IN>)
-        {
-        chomp;
-        s/#.*$//;
-        next if (/^\S*$/);
-        my ($xr, $p1, $p2) = /^(\S+)\s+(\S+)\s+(\S+)/;
-        check_oid($xr);
-        check_oid($p1);
-        check_oid($p2);
-        $xref_tbl{$xr} = [$p1, $p2, $ln];
-        }
-
-my @xrkeys = keys %xref_tbl;
-
-my @srt1 = sort { $oid_tbl{$a} <=> $oid_tbl{$b}} @xrkeys;
-
-for(my $i = 0; $i <= $#srt1; $i++)
-        {
-        $xref_tbl{$srt1[$i]}[2] = $i;
-        }
-
-my @srt2 = sort
-        {
-        my$ap1 = $oid_tbl{$xref_tbl{$a}[0]};
-        my$bp1 = $oid_tbl{$xref_tbl{$b}[0]};
-        return $ap1 - $bp1 if ($ap1 != $bp1);
-        my$ap2 = $oid_tbl{$xref_tbl{$a}[1]};
-        my$bp2 = $oid_tbl{$xref_tbl{$b}[1]};
-
-        return $ap2 - $bp2;
-        } @xrkeys;
-
-my $pname = $0;
-
-$pname =~ s|^.[^/]/||;
-
-print <<EOF;
-/* \$OpenBSD\$ */
-/* AUTOGENERATED BY $pname, DO NOT EDIT */
-
-__BEGIN_HIDDEN_DECLS
-
-typedef struct
-        {
-        int sign_id;
-        int hash_id;
-        int pkey_id;
-        } nid_triple;
-
-static const nid_triple sigoid_srt[] =
-        {
-EOF
-
-foreach (@srt1)
-        {
-        my $xr = $_;
-        my ($p1, $p2) = @{$xref_tbl{$_}};
-        print "\t{NID_$xr, NID_$p1, NID_$p2},\n";
-        }
-
-print "\t};";
-print <<EOF;
-
-
-static const nid_triple * const sigoid_srt_xref[] =
-        {
-EOF
-
-foreach (@srt2)
-        {
-        my $x = $xref_tbl{$_}[2];
-        print "\t\&sigoid_srt\[$x\],\n";
-        }
-
-print "\t};\n\n";
-print "__END_HIDDEN_DECLS\n";
-
-sub check_oid
-        {
-        my ($chk) = @_;
-        if (!exists $oid_tbl{$chk})
-                {
-                die "Not Found \"$chk\"\n";
-                }
-        }
-