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

Unified Diff: net/ssl/client_cert_store_chromeos.h

Issue 424523002: Enable system NSS key slot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: net/ssl/client_cert_store_chromeos.h
diff --git a/net/ssl/client_cert_store_chromeos.h b/net/ssl/client_cert_store_chromeos.h
index 087190ce11a6e1650630c25f1e23ae455fb2b0d0..0e015b313d70a8579359a6f57947d08d2c9ed4db 100644
--- a/net/ssl/client_cert_store_chromeos.h
+++ b/net/ssl/client_cert_store_chromeos.h
@@ -15,7 +15,10 @@ namespace net {
class NET_EXPORT ClientCertStoreChromeOS : public ClientCertStoreNSS {
public:
+ // Always accesses client certs of the user's private and public slot. If
+ // |use_system_slot| is true, also accesses the system slot.
Ryan Sleevi 2014/07/29 00:23:16 This comment seems confusing. // Constructs a Cli
pneubeck (no reviews) 2014/07/29 16:00:15 Done.
ClientCertStoreChromeOS(
+ bool use_system_slot,
const std::string& username_hash,
const PasswordDelegateFactory& password_delegate_factory);
virtual ~ClientCertStoreChromeOS();
@@ -33,13 +36,13 @@ class NET_EXPORT ClientCertStoreChromeOS : public ClientCertStoreNSS {
CertificateList* selected_certs) OVERRIDE;
private:
- friend class ClientCertStoreChromeOSTestDelegate;
-
- void DidGetPrivateSlot(const SSLCertRequestInfo* request,
- CertificateList* selected_certs,
- const base::Closure& callback,
- crypto::ScopedPK11Slot private_slot);
+ void DidGetPrivateAndSystemSlot(const SSLCertRequestInfo* request,
+ CertificateList* selected_certs,
+ const base::Closure& callback,
+ crypto::ScopedPK11Slot system_slot,
+ crypto::ScopedPK11Slot private_slot);
+ bool use_system_slot_;
std::string username_hash_;
NSSProfileFilterChromeOS profile_filter_;

Powered by Google App Engine
This is Rietveld 408576698