Index: net/cert/nss_cert_database_chromeos.h |
diff --git a/net/cert/nss_cert_database_chromeos.h b/net/cert/nss_cert_database_chromeos.h |
index b68f742b5183f9e62798a015de1e76452d625302..ef831294e7300b0f1bf58c4dc928380ed5c9ee1b 100644 |
--- a/net/cert/nss_cert_database_chromeos.h |
+++ b/net/cert/nss_cert_database_chromeos.h |
@@ -16,16 +16,23 @@ namespace net { |
class NET_EXPORT NSSCertDatabaseChromeOS : public NSSCertDatabase { |
public: |
+ // |public_slot| is the NSS software slot for the user. |
Ryan Sleevi
2014/07/29 23:53:15
Comment wise, I think the older bits were more cor
pneubeck (no reviews)
2014/07/30 06:27:39
Actually, this comment should be unnecessary as th
Ryan Sleevi
2014/07/30 06:45:30
Yeah.
Either way, the comment is wrong as is. We
pneubeck (no reviews)
2014/07/30 13:54:10
Removed.
|
+ // |private_slot| is the TPM slot for the user (if a TPM is present). |
NSSCertDatabaseChromeOS(crypto::ScopedPK11Slot public_slot, |
crypto::ScopedPK11Slot private_slot); |
virtual ~NSSCertDatabaseChromeOS(); |
+ // |system_slot| is the system TPM slot, which is only enabled for certain |
+ // users. |
+ void SetSystemSlot(crypto::ScopedPK11Slot system_slot); |
+ |
// NSSCertDatabase implementation. |
virtual void ListCertsSync(CertificateList* certs) OVERRIDE; |
virtual void ListCerts(const NSSCertDatabase::ListCertsCallback& callback) |
OVERRIDE; |
virtual void ListModules(CryptoModuleList* modules, bool need_rw) const |
OVERRIDE; |
+ virtual crypto::ScopedPK11Slot GetSystemSlot() const OVERRIDE; |
// TODO(mattm): handle trust setting, deletion, etc correctly when certs exist |
// in multiple slots. |
@@ -40,6 +47,7 @@ class NET_EXPORT NSSCertDatabaseChromeOS : public NSSCertDatabase { |
CertificateList* certs); |
NSSProfileFilterChromeOS profile_filter_; |
+ crypto::ScopedPK11Slot system_slot_; |
DISALLOW_COPY_AND_ASSIGN(NSSCertDatabaseChromeOS); |
}; |