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

Unified Diff: net/ssl/client_cert_store_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/cert/nss_profile_filter_chromeos_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ssl/client_cert_store_chromeos.cc
diff --git a/net/ssl/client_cert_store_chromeos.cc b/net/ssl/client_cert_store_chromeos.cc
index f357797e34b5d18b87766d81eaf1a42452635950..a2d9b56c2dc4f7b76b1b078476b7c5c60cec5138 100644
--- a/net/ssl/client_cert_store_chromeos.cc
+++ b/net/ssl/client_cert_store_chromeos.cc
@@ -63,14 +63,18 @@ void ClientCertStoreChromeOS::DidGetPrivateSlot(
const base::Closure& callback,
crypto::ScopedPK11Slot private_slot) {
profile_filter_.Init(crypto::GetPublicSlotForChromeOSUser(username_hash_),
- private_slot.Pass());
+ private_slot.Pass(),
+ crypto::ScopedPK11Slot(crypto::GetSystemNSSKeySlot()));
ClientCertStoreNSS::GetClientCerts(*request, selected_certs, callback);
}
void ClientCertStoreChromeOS::InitForTesting(
crypto::ScopedPK11Slot public_slot,
crypto::ScopedPK11Slot private_slot) {
- profile_filter_.Init(public_slot.Pass(), private_slot.Pass());
+ profile_filter_.Init(public_slot.Pass(),
+ private_slot.Pass(),
+ // XXX pass system slot? add unittests with system slot?
+ crypto::ScopedPK11Slot());
}
bool ClientCertStoreChromeOS::SelectClientCertsForTesting(
« no previous file with comments | « net/cert/nss_profile_filter_chromeos_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698