diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-17 02:59:34 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-17 02:59:34 +0000 |
| commit | 76c0613c3feb32332f67a1b6a273102d2c064801 (patch) | |
| tree | 2fc1f85917f0b9cda5b8fb2ae9fa5c6618d0398e /net/net.gyp | |
| parent | da5ec5315e9b93fd5cfb011367327aef148acd70 (diff) | |
| download | chromium_src-76c0613c3feb32332f67a1b6a273102d2c064801.zip chromium_src-76c0613c3feb32332f67a1b6a273102d2c064801.tar.gz chromium_src-76c0613c3feb32332f67a1b6a273102d2c064801.tar.bz2 | |
Add support for parsing certificate formats other than raw, DER-encoded certificates - specifically formats that represent collections of certificates. The certificate format can now be specified as an explicit format, or as a bit-mask of formats that are acceptable/expected, with the first parsable format winning.
This is one half of a commit to address BUG #37142, with the second half involving connecting this through the X509UserCertHandler and the actual UI.
R=wtc
BUG=37142
TEST=X509CertificateParseTest* and PEMTokenizerTest.*
Review URL: http://codereview.chromium.org/2819018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index 98dc526..ea740ff 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -125,6 +125,8 @@ 'base/network_change_notifier_win.h', 'base/nss_memio.c', 'base/nss_memio.h', + 'base/pem_tokenizer.cc', + 'base/pem_tokenizer.h', 'base/platform_mime_util.h', # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? 'base/platform_mime_util_linux.cc', @@ -674,6 +676,7 @@ 'base/net_test_constants.h', 'base/net_test_suite.h', 'base/net_util_unittest.cc', + 'base/pem_tokenizer_unittest.cc', 'base/registry_controlled_domain_unittest.cc', 'base/run_all_unittests.cc', 'base/sdch_filter_unittest.cc', |