Commit beac071b authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make objxref.pl output in correct format 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(cherry picked from commit 6922ddee)
parent 99ff4051

crypto/objects/objxref.pl

+21 −16
Original line number Diff line number Diff line
@@ -62,30 +62,36 @@ $pname =~ s|^.[^/]/||; 
print <<EOF;

/* AUTOGENERATED BY $pname, DO NOT EDIT */



typedef struct

	{

typedef struct {

    int sign_id;

    int hash_id;

    int pkey_id;

} nid_triple;



static const nid_triple sigoid_srt[] =

	{

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";

	my $o1 = "    {NID_$xr, NID_$p1,";

	my $o2 = "NID_$p2},";

        if (length("$o1 $o2") < 78)

		{

		print "$o1 $o2\n";

		}

	else

		{

		print "$o1\n     $o2\n";

		}

        }



print "\t};";

print "};";

print <<EOF;





static const nid_triple * const sigoid_srt_xref[] =

	{

static const nid_triple *const sigoid_srt_xref[] = {

EOF



foreach (@srt2)
@@ -94,10 +100,10 @@ foreach (@srt2) 
	# 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";

	print "    \&sigoid_srt\[$x\],\n";

	}



print "\t};\n\n";

print "};\n";



sub check_oid

	{
@@ -107,4 +113,3 @@ sub check_oid 
		die "Not Found \"$chk\"\n";

		}

	}