diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 06:01:59 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-15 06:01:59 +0000 |
| commit | 68da887c6a2acc6dac295bf27930eaeba8da0eed (patch) | |
| tree | 1f2b6b6c608eeda607386c075107ee7797d3f8f4 /net/net.gyp | |
| parent | a9891b44234b0037a60a280de36f35d584e13cc1 (diff) | |
| download | chromium_src-68da887c6a2acc6dac295bf27930eaeba8da0eed.zip chromium_src-68da887c6a2acc6dac295bf27930eaeba8da0eed.tar.gz chromium_src-68da887c6a2acc6dac295bf27930eaeba8da0eed.tar.bz2 | |
Properly parse UTF8Strings in certificates on Windows.
BUG=114168
TEST=https://www.verisign.co.jp appears correctly regardless of system
locale. Additionally, net_unittests:X509TypesTest* should cover this.
Review URL: https://chromiumcodereview.appspot.com/9358080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122053 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/net.gyp b/net/net.gyp index b0c100d..ed13468 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -253,6 +253,7 @@ 'base/x509_cert_types.cc', 'base/x509_cert_types.h', 'base/x509_cert_types_mac.cc', + 'base/x509_cert_types_win.cc', 'base/x509_certificate.cc', 'base/x509_certificate.h', 'base/x509_certificate_mac.cc', @@ -1060,7 +1061,7 @@ 'base/upload_data_unittest.cc', 'base/upload_data_stream_unittest.cc', 'base/x509_certificate_unittest.cc', - 'base/x509_cert_types_mac_unittest.cc', + 'base/x509_cert_types_unittest.cc', 'base/x509_util_nss_unittest.cc', 'base/x509_util_openssl_unittest.cc', 'disk_cache/addr_unittest.cc', @@ -1305,6 +1306,11 @@ ], }, ], + [ 'OS != "win" and OS != "mac"', { + 'sources!': [ + 'base/x509_cert_types_unittest.cc', + ], + }] ], }, { |