[openssl-commits] [openssl] OpenSSL_1_0_1-stable update
Dr. Stephen Henson
steve at openssl.org
Wed Feb 4 13:37:25 UTC 2015
The branch OpenSSL_1_0_1-stable has been updated
via ac7d33deec9a61ff4bdf3b6c89725b588a8917e7 (commit)
from 6b7c68e0388e499a1c2846131fca7ffd7b3fa78f (commit)
- Log -----------------------------------------------------------------
commit ac7d33deec9a61ff4bdf3b6c89725b588a8917e7
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>
(cherry picked from commit 6922ddee1b7b1bddbe0d59a5bbdcf8ff39343434)
-----------------------------------------------------------------------
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 6c4c832..35c0651 100644
--- a/crypto/objects/objxref.pl
+++ b/crypto/objects/objxref.pl
@@ -62,30 +62,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)
@@ -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";
}
}
-
More information about the openssl-commits
mailing list