diff options
author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 21:57:09 +0000 |
---|---|---|
committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 21:57:09 +0000 |
commit | 54df73904399a0c2fceb00676ebcef58062e39aa (patch) | |
tree | 045f08104b12ed0c69075de8d62617f7ed3ca89a /crypto | |
parent | a6b23b1c774889bb7006783f4e5bade521a4b68b (diff) | |
download | chromium_src-54df73904399a0c2fceb00676ebcef58062e39aa.zip chromium_src-54df73904399a0c2fceb00676ebcef58062e39aa.tar.gz chromium_src-54df73904399a0c2fceb00676ebcef58062e39aa.tar.bz2 |
This change implements certificate import from ONC file.
It will import any certificates in an ONC file into the certificate
database. It does not yet associate the given GUID for the
certificate with the certificate added to the database. That will
happen in an upcoming CL.
This also adds test cases for importing each type of certificate.
BUG=chromium-os:19404,chromium-os:19406
TEST=Ran new unit test cases. Imported ONC file with a certificate
and saw that it appeared in the certificate manager.
Review URL: http://codereview.chromium.org/8403007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/nss_util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index 95afb54..803b01c 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -353,7 +353,7 @@ class NSSInitSingleton { if (test_slot_) { SECStatus status = SECMOD_CloseUserDB(test_slot_); if (status != SECSuccess) - LOG(ERROR) << "SECMOD_CloseUserDB failed: " << PORT_GetError(); + PLOG(ERROR) << "SECMOD_CloseUserDB failed: " << PORT_GetError(); PK11_FreeSlot(test_slot_); test_slot_ = NULL; } |