Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(959)

Side by Side Diff: net/cert/nss_cert_database_chromeos.cc

Issue 330213002: *wip* NSS: handle chromeos system slot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: child of https://codereview.chromium.org/383593002/ now Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/cert/nss_cert_database_chromeos.h ('k') | net/cert/nss_cert_database_chromeos_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/cert/nss_cert_database_chromeos.h" 5 #include "net/cert/nss_cert_database_chromeos.h"
6 6
7 #include <cert.h> 7 #include <cert.h>
8 #include <pk11pub.h> 8 #include <pk11pub.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/location.h" 14 #include "base/location.h"
15 #include "base/task_runner.h" 15 #include "base/task_runner.h"
16 #include "net/base/crypto_module.h" 16 #include "net/base/crypto_module.h"
17 #include "net/cert/x509_certificate.h" 17 #include "net/cert/x509_certificate.h"
18 18
19 namespace net { 19 namespace net {
20 20
21 NSSCertDatabaseChromeOS::NSSCertDatabaseChromeOS( 21 NSSCertDatabaseChromeOS::NSSCertDatabaseChromeOS(
22 crypto::ScopedPK11Slot public_slot, 22 crypto::ScopedPK11Slot public_slot,
23 crypto::ScopedPK11Slot private_slot) 23 crypto::ScopedPK11Slot private_slot,
24 crypto::ScopedPK11Slot system_slot)
24 : public_slot_(public_slot.Pass()), 25 : public_slot_(public_slot.Pass()),
25 private_slot_(private_slot.Pass()) { 26 private_slot_(private_slot.Pass()) {
26 profile_filter_.Init(GetPublicSlot(), GetPrivateSlot()); 27 profile_filter_.Init(GetPublicSlot(), GetPrivateSlot(), system_slot.Pass());
27 } 28 }
28 29
29 NSSCertDatabaseChromeOS::~NSSCertDatabaseChromeOS() {} 30 NSSCertDatabaseChromeOS::~NSSCertDatabaseChromeOS() {}
30 31
31 void NSSCertDatabaseChromeOS::ListCertsSync(CertificateList* certs) { 32 void NSSCertDatabaseChromeOS::ListCertsSync(CertificateList* certs) {
32 ListCertsImpl(profile_filter_, certs); 33 ListCertsImpl(profile_filter_, certs);
33 } 34 }
34 35
35 void NSSCertDatabaseChromeOS::ListCerts( 36 void NSSCertDatabaseChromeOS::ListCerts(
36 const base::Callback<void(scoped_ptr<CertificateList> certs)>& callback) { 37 const base::Callback<void(scoped_ptr<CertificateList> certs)>& callback) {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 certs->begin(), 83 certs->begin(),
83 certs->end(), 84 certs->end(),
84 NSSProfileFilterChromeOS::CertNotAllowedForProfilePredicate( 85 NSSProfileFilterChromeOS::CertNotAllowedForProfilePredicate(
85 profile_filter)), 86 profile_filter)),
86 certs->end()); 87 certs->end());
87 DVLOG(1) << "filtered " << pre_size - certs->size() << " of " << pre_size 88 DVLOG(1) << "filtered " << pre_size - certs->size() << " of " << pre_size
88 << " certs"; 89 << " certs";
89 } 90 }
90 91
91 } // namespace net 92 } // namespace net
OLDNEW
« no previous file with comments | « net/cert/nss_cert_database_chromeos.h ('k') | net/cert/nss_cert_database_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698