[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  6922ddee1b7b1bddbe0d59a5bbdcf8ff39343434 (commit)
      from  a724e79ed761ea535a6c7457c90da5ff4b1cea69 (commit)


- Log -----------------------------------------------------------------
commit 6922ddee1b7b1bddbe0d59a5bbdcf8ff39343434
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Feb 4 03:31:34 2015 +0000

    Make objxref.pl output in correct format
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/objects/objxref.pl |   37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/crypto/objects/objxref.pl b/crypto/objects/objxref.pl
index 833f4ab..1913b9d 100644
--- a/crypto/objects/objxref.pl
+++ b/crypto/objects/objxref.pl
@@ -63,30 +63,36 @@ $pname =~ s|^.[^/]/||;
 print <<EOF;
 /* AUTOGENERATED BY $pname, DO NOT EDIT */
 
-typedef struct
-	{
-	int sign_id;
-	int hash_id;
-	int pkey_id;
-	} nid_triple;
+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)
@@ -95,10 +101,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
 	{
@@ -108,4 +114,3 @@ sub check_oid
 		die "Not Found \"$chk\"\n";
 		}
 	}
-