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

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

Issue 424523002: Enable system NSS key slot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Minor changes. Created 6 years, 4 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
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 #ifndef NET_CERT_NSS_CERT_DATABASE_CHROMEOS_ 5 #ifndef NET_CERT_NSS_CERT_DATABASE_CHROMEOS_
6 #define NET_CERT_NSS_CERT_DATABASE_CHROMEOS_ 6 #define NET_CERT_NSS_CERT_DATABASE_CHROMEOS_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "crypto/scoped_nss_types.h" 10 #include "crypto/scoped_nss_types.h"
11 #include "net/base/net_export.h" 11 #include "net/base/net_export.h"
12 #include "net/cert/nss_cert_database.h" 12 #include "net/cert/nss_cert_database.h"
13 #include "net/cert/nss_profile_filter_chromeos.h" 13 #include "net/cert/nss_profile_filter_chromeos.h"
14 14
15 namespace net { 15 namespace net {
16 16
17 class NET_EXPORT NSSCertDatabaseChromeOS : public NSSCertDatabase { 17 class NET_EXPORT NSSCertDatabaseChromeOS : public NSSCertDatabase {
18 public: 18 public:
19 NSSCertDatabaseChromeOS(crypto::ScopedPK11Slot public_slot, 19 NSSCertDatabaseChromeOS(crypto::ScopedPK11Slot public_slot,
20 crypto::ScopedPK11Slot private_slot); 20 crypto::ScopedPK11Slot private_slot);
21 virtual ~NSSCertDatabaseChromeOS(); 21 virtual ~NSSCertDatabaseChromeOS();
22 22
23 // |system_slot| is the system TPM slot, which is only enabled for certain
24 // users.
25 void SetSystemSlot(crypto::ScopedPK11Slot system_slot);
26
23 // NSSCertDatabase implementation. 27 // NSSCertDatabase implementation.
24 virtual void ListCertsSync(CertificateList* certs) OVERRIDE; 28 virtual void ListCertsSync(CertificateList* certs) OVERRIDE;
25 virtual void ListCerts(const NSSCertDatabase::ListCertsCallback& callback) 29 virtual void ListCerts(const NSSCertDatabase::ListCertsCallback& callback)
26 OVERRIDE; 30 OVERRIDE;
27 virtual void ListModules(CryptoModuleList* modules, bool need_rw) const 31 virtual void ListModules(CryptoModuleList* modules, bool need_rw) const
28 OVERRIDE; 32 OVERRIDE;
33 virtual crypto::ScopedPK11Slot GetSystemSlot() const OVERRIDE;
29 34
30 // TODO(mattm): handle trust setting, deletion, etc correctly when certs exist 35 // TODO(mattm): handle trust setting, deletion, etc correctly when certs exist
31 // in multiple slots. 36 // in multiple slots.
32 // TODO(mattm): handle trust setting correctly for certs in read-only slots. 37 // TODO(mattm): handle trust setting correctly for certs in read-only slots.
33 38
34 private: 39 private:
35 // Certificate listing implementation used by |ListCerts| and |ListCertsSync|. 40 // Certificate listing implementation used by |ListCerts| and |ListCertsSync|.
36 // The certificate list normally returned by NSSCertDatabase::ListCertsImpl 41 // The certificate list normally returned by NSSCertDatabase::ListCertsImpl
37 // is additionally filtered by |profile_filter|. 42 // is additionally filtered by |profile_filter|.
38 // Static so it may safely be used on the worker thread. 43 // Static so it may safely be used on the worker thread.
39 static void ListCertsImpl(const NSSProfileFilterChromeOS& profile_filter, 44 static void ListCertsImpl(const NSSProfileFilterChromeOS& profile_filter,
40 CertificateList* certs); 45 CertificateList* certs);
41 46
42 NSSProfileFilterChromeOS profile_filter_; 47 NSSProfileFilterChromeOS profile_filter_;
48 crypto::ScopedPK11Slot system_slot_;
43 49
44 DISALLOW_COPY_AND_ASSIGN(NSSCertDatabaseChromeOS); 50 DISALLOW_COPY_AND_ASSIGN(NSSCertDatabaseChromeOS);
45 }; 51 };
46 52
47 } // namespace net 53 } // namespace net
48 54
49 #endif // NET_CERT_NSS_CERT_DATABASE_CHROMEOS_ 55 #endif // NET_CERT_NSS_CERT_DATABASE_CHROMEOS_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698