diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 22:52:52 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 22:52:52 +0000 |
| commit | 2feacc349a55719e56d1713e5e466b035199f901 (patch) | |
| tree | aac2b81bfa096eeac62671665f7aed6925671226 /net/base | |
| parent | 3e2ad0b931c70b2d17da437fdbf988742de9b5cb (diff) | |
| download | chromium_src-2feacc349a55719e56d1713e5e466b035199f901.zip chromium_src-2feacc349a55719e56d1713e5e466b035199f901.tar.gz chromium_src-2feacc349a55719e56d1713e5e466b035199f901.tar.bz2 | |
DOMUI cert manager: Add CA cert import.
Minor cleanup of CertificateManagerModel by removing some wrappers of CertDatabase readonly functions.
BUG=19991
TEST=manual
Review URL: http://codereview.chromium.org/3516023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/cert_database.h | 2 | ||||
| -rw-r--r-- | net/base/cert_database_nss.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/base/cert_database.h b/net/base/cert_database.h index a40a56f..377c0a8 100644 --- a/net/base/cert_database.h +++ b/net/base/cert_database.h @@ -87,7 +87,7 @@ class CertDatabase { // root. Assumes the list is an ordered hierarchy with the root being either // the first or last element. // TODO(mattm): improve this to handle any order. - X509Certificate* FindRootInList(const CertificateList& certificates); + X509Certificate* FindRootInList(const CertificateList& certificates) const; // Import CA certificates. // Tries to import all the certificates given. The root will be trusted diff --git a/net/base/cert_database_nss.cc b/net/base/cert_database_nss.cc index 2c1ad92..69b2128 100644 --- a/net/base/cert_database_nss.cc +++ b/net/base/cert_database_nss.cc @@ -119,7 +119,7 @@ int CertDatabase::ExportToPKCS12( } X509Certificate* CertDatabase::FindRootInList( - const CertificateList& certificates) { + const CertificateList& certificates) const { DCHECK_GT(certificates.size(), 0U); if (certificates.size() == 1) |