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

Side by Side Diff: chrome/browser/chromeos/options/cert_library.h

Issue 421113002: Use correct slot id for client certs in network config. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments. 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/options/cert_library.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 CHROME_BROWSER_CHROMEOS_OPTIONS_CERT_LIBRARY_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_CERT_LIBRARY_H_
6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_CERT_LIBRARY_H_ 6 #define CHROME_BROWSER_CHROMEOS_OPTIONS_CERT_LIBRARY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 // Returns true when the certificate list has been requested but not loaded. 57 // Returns true when the certificate list has been requested but not loaded.
58 bool CertificatesLoading() const; 58 bool CertificatesLoading() const;
59 59
60 // Returns true when the certificate list has been initiailized. 60 // Returns true when the certificate list has been initiailized.
61 bool CertificatesLoaded() const; 61 bool CertificatesLoaded() const;
62 62
63 // Returns true if the TPM is available for hardware-backed certificates. 63 // Returns true if the TPM is available for hardware-backed certificates.
64 bool IsHardwareBacked() const; 64 bool IsHardwareBacked() const;
65 65
66 // Returns the id of the slot that contains the user certificates.
67 std::string GetTPMSlotID() const;
68
69 // Retruns the number of certificates available for |type|. 66 // Retruns the number of certificates available for |type|.
70 int NumCertificates(CertType type) const; 67 int NumCertificates(CertType type) const;
71 68
72 // Retreives the certificate property for |type| at |index|. 69 // Retreives the certificate property for |type| at |index|.
73 base::string16 GetCertDisplayStringAt(CertType type, int index) const; 70 base::string16 GetCertDisplayStringAt(CertType type, int index) const;
74 std::string GetServerCACertPEMAt(int index) const; 71 std::string GetServerCACertPEMAt(int index) const;
75 std::string GetUserCertPkcs11IdAt(int index) const; 72 std::string GetUserCertPkcs11IdAt(int index, int* slot_id) const;
76 bool IsCertHardwareBackedAt(CertType type, int index) const; 73 bool IsCertHardwareBackedAt(CertType type, int index) const;
77 74
78 // Returns the index of a Certificate matching |pem_encoded| or -1 if none 75 // Returns the index of a Certificate matching |pem_encoded| or -1 if none
79 // found. This function may be slow depending on the number of stored 76 // found. This function may be slow depending on the number of stored
80 // certificates. 77 // certificates.
81 // TOOD(pneubeck): Either make this more efficient, asynchronous or get rid of 78 // TOOD(pneubeck): Either make this more efficient, asynchronous or get rid of
82 // it. 79 // it.
83 int GetServerCACertIndexByPEM(const std::string& pem_encoded) const; 80 int GetServerCACertIndexByPEM(const std::string& pem_encoded) const;
84 // Same as above but for a PKCS#11 id. 81 // Same as above but for a PKCS#11 id.
85 int GetUserCertIndexByPkcs11Id(const std::string& pkcs11_id) const; 82 int GetUserCertIndexByPkcs11Id(const std::string& pkcs11_id) const;
(...skipping 16 matching lines...) Expand all
102 net::CertificateList user_certs_; 99 net::CertificateList user_certs_;
103 net::CertificateList server_certs_; 100 net::CertificateList server_certs_;
104 net::CertificateList server_ca_certs_; 101 net::CertificateList server_ca_certs_;
105 102
106 DISALLOW_COPY_AND_ASSIGN(CertLibrary); 103 DISALLOW_COPY_AND_ASSIGN(CertLibrary);
107 }; 104 };
108 105
109 } // namespace chromeos 106 } // namespace chromeos
110 107
111 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_CERT_LIBRARY_H_ 108 #endif // CHROME_BROWSER_CHROMEOS_OPTIONS_CERT_LIBRARY_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/options/cert_library.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698