diff options
author | Mike DePaulo <mikedep333@gmail.com> | 2015-03-28 09:50:31 -0400 |
---|---|---|
committer | Mike DePaulo <mikedep333@gmail.com> | 2015-03-28 13:13:13 -0400 |
commit | 91e3957fb0e38a5d5649f82e5d9f89dd0e85666f (patch) | |
tree | fe0992fb4cf6f3c2a5d597557552ae69caccbe70 /openssl/crypto/objects/objxref.pl | |
parent | 9073d97eff3f6d3b33450ef3532a826674c7e1e8 (diff) | |
download | vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.tar.gz vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.tar.bz2 vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.zip |
Update openssl to version openssl-1.0.1m
Conflicts:
openssl/Makefile
openssl/Makefile.bak
openssl/crypto/cryptlib.c
Diffstat (limited to 'openssl/crypto/objects/objxref.pl')
-rw-r--r-- | openssl/crypto/objects/objxref.pl | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/openssl/crypto/objects/objxref.pl b/openssl/crypto/objects/objxref.pl index 6c4c832ab..35c06514b 100644 --- a/openssl/crypto/objects/objxref.pl +++ b/openssl/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"; } } - |