summaryrefslogtreecommitdiffstats
path: root/net/base/cert_database.h
diff options
context:
space:
mode:
authorgspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 21:57:09 +0000
committergspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 21:57:09 +0000
commit54df73904399a0c2fceb00676ebcef58062e39aa (patch)
tree045f08104b12ed0c69075de8d62617f7ed3ca89a /net/base/cert_database.h
parenta6b23b1c774889bb7006783f4e5bade521a4b68b (diff)
downloadchromium_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 'net/base/cert_database.h')
-rw-r--r--net/base/cert_database.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/net/base/cert_database.h b/net/base/cert_database.h
index 4851a77..a735e693 100644
--- a/net/base/cert_database.h
+++ b/net/base/cert_database.h
@@ -174,10 +174,16 @@ class NET_EXPORT CertDatabase {
TrustBits trust_bits);
// Delete certificate and associated private key (if one exists).
- // Returns true on success or false on failure.
- // |cert| is still valid when this function returns.
+ // |cert| is still valid when this function returns. Returns true on
+ // success.
bool DeleteCertAndKey(const X509Certificate* cert);
+ // Delete the certificate and associated public and private key (if
+ // one exists) with the given label from the database. Returns true
+ // on success. ("label" here refers to the NSS Attribute CKA_LABEL,
+ // also referred to as a nickname or friendly name).
+ bool DeleteCertAndKeyByLabel(const std::string& label);
+
// Check whether cert is stored in a readonly slot.
bool IsReadOnly(const X509Certificate* cert) const;
#endif