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

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: Created 6 years, 6 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
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..64b470c0ccf866f0314f50b7604c57ca4264e3c2 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_),
pneubeck (no reviews) 2014/06/13 12:40:43 Why does this need the public slot? Aren't client
mattm 2014/06/24 03:16:46 Client certs can be stored in the software slot al
- private_slot.Pass());
+ private_slot.Pass(),
+ crypto::ScopedPK11Slot(crypto::GetPrivateNSSKeySlot()));
pneubeck (no reviews) 2014/06/13 12:40:43 If GetPrivateNSSKeySlot is referring to the system
mattm 2014/06/24 03:16:46 Done.
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(

Powered by Google App Engine
This is Rietveld 408576698