diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-12 19:49:40 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-12 19:49:40 +0000 |
| commit | bb639038078bfd16f820c026efeb1a9d21395e60 (patch) | |
| tree | a0176554e744bc729bb014d24215de8de002cc00 /net/net.gyp | |
| parent | c42d7348f690d96354e509a2082f2de9cc137f5c (diff) | |
| download | chromium_src-bb639038078bfd16f820c026efeb1a9d21395e60.zip chromium_src-bb639038078bfd16f820c026efeb1a9d21395e60.tar.gz chromium_src-bb639038078bfd16f820c026efeb1a9d21395e60.tar.bz2 | |
Add NSS PKCS12 import/export functions to CertDatabase.
Use sql: prefix when opening NSS UserDB (this will affect existing Chromeos installations, which had been using the old berkelydb format.)
BUG=19991,51327,51328,51330,51332
TEST=net/base/cert_database_nss_unittest.cc
Review URL: http://codereview.chromium.org/3018038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index b9bda56..4cb3225 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -185,6 +185,8 @@ 'base/x509_cert_types_mac.cc', 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 'third_party/mozilla_security_manager/nsKeygenHandler.h', + 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', + 'third_party/mozilla_security_manager/nsPKCS12Blob.h', ], 'export_dependent_settings': [ '../base/base.gyp:base', @@ -205,6 +207,8 @@ 'base/x509_certificate_nss.cc', 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 'third_party/mozilla_security_manager/nsKeygenHandler.h', + 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', + 'third_party/mozilla_security_manager/nsPKCS12Blob.h', ], }, ], @@ -666,6 +670,7 @@ 'msvs_guid': 'E99DA267-BE90-4F45-88A1-6919DB2C7567', 'sources': [ 'base/address_list_unittest.cc', + 'base/cert_database_nss_unittest.cc', 'base/cookie_monster_unittest.cc', 'base/data_url_unittest.cc', 'base/directory_lister_unittest.cc', @@ -814,6 +819,11 @@ 'base/sdch_filter_unittest.cc', ], }, + { # else: OS is not in the above list + 'sources!': [ + 'base/cert_database_nss_unittest.cc', + ], + } ], ['OS == "linux"', { 'conditions': [ |