diff options
| author | miod <> | 2014-07-11 13:45:45 +0000 |
|---|---|---|
| committer | miod <> | 2014-07-11 13:45:45 +0000 |
| commit | e92e577394c8b1db9d6cb9d4f59c8afbeb7c2449 (patch) | |
| tree | 82beeac0c7d2f11322ecdb5a9ba0c03056af1b5b | |
| parent | 9b099cfe9b8ff48ebf73f26baf1ffb356d3ab825 (diff) | |
| download | openbsd-e92e577394c8b1db9d6cb9d4f59c8afbeb7c2449.tar.gz openbsd-e92e577394c8b1db9d6cb9d4f59c8afbeb7c2449.tar.bz2 openbsd-e92e577394c8b1db9d6cb9d4f59c8afbeb7c2449.zip | |
Fix OID encoding for single components. OpenSSL PR #2556 via OpenSSL trunk.
(be sure to make cleandir and make includes before building)
| -rw-r--r-- | src/lib/libcrypto/objects/obj_dat.pl | 2 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/objects/obj_dat.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/objects/obj_dat.pl b/src/lib/libcrypto/objects/obj_dat.pl index c67f71c327..86bcefb97a 100644 --- a/src/lib/libcrypto/objects/obj_dat.pl +++ b/src/lib/libcrypto/objects/obj_dat.pl | |||
| @@ -115,7 +115,7 @@ for ($i=0; $i<$n; $i++) | |||
| 115 | $out.="\"$sn\""; | 115 | $out.="\"$sn\""; |
| 116 | $out.=","."\"$ln\""; | 116 | $out.=","."\"$ln\""; |
| 117 | $out.=",NID_$nid{$i},"; | 117 | $out.=",NID_$nid{$i},"; |
| 118 | if (defined($obj{$nid{$i}})) | 118 | if (defined($obj{$nid{$i}}) && $objd{$obj{$nid{$i}}} =~ /,/) |
| 119 | { | 119 | { |
| 120 | $v=$objd{$obj{$nid{$i}}}; | 120 | $v=$objd{$obj{$nid{$i}}}; |
| 121 | $v =~ s/L//g; | 121 | $v =~ s/L//g; |
diff --git a/src/lib/libssl/src/crypto/objects/obj_dat.pl b/src/lib/libssl/src/crypto/objects/obj_dat.pl index c67f71c327..86bcefb97a 100644 --- a/src/lib/libssl/src/crypto/objects/obj_dat.pl +++ b/src/lib/libssl/src/crypto/objects/obj_dat.pl | |||
| @@ -115,7 +115,7 @@ for ($i=0; $i<$n; $i++) | |||
| 115 | $out.="\"$sn\""; | 115 | $out.="\"$sn\""; |
| 116 | $out.=","."\"$ln\""; | 116 | $out.=","."\"$ln\""; |
| 117 | $out.=",NID_$nid{$i},"; | 117 | $out.=",NID_$nid{$i},"; |
| 118 | if (defined($obj{$nid{$i}})) | 118 | if (defined($obj{$nid{$i}}) && $objd{$obj{$nid{$i}}} =~ /,/) |
| 119 | { | 119 | { |
| 120 | $v=$objd{$obj{$nid{$i}}}; | 120 | $v=$objd{$obj{$nid{$i}}}; |
| 121 | $v =~ s/L//g; | 121 | $v =~ s/L//g; |