OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "net/ssl/client_cert_store_impl.h" | 5 #include "net/ssl/client_cert_store_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #define SECURITY_WIN32 // Needs to be defined before including security.h | 10 #define SECURITY_WIN32 // Needs to be defined before including security.h |
11 #include <windows.h> | 11 #include <windows.h> |
12 #include <wincrypt.h> | 12 #include <wincrypt.h> |
13 #include <security.h> | 13 #include <security.h> |
14 | 14 |
| 15 #include "base/callback.h" |
15 #include "base/logging.h" | 16 #include "base/logging.h" |
16 #include "crypto/scoped_capi_types.h" | 17 #include "crypto/scoped_capi_types.h" |
17 #include "net/cert/x509_util.h" | 18 #include "net/cert/x509_util.h" |
18 | 19 |
19 namespace net { | 20 namespace net { |
20 | 21 |
21 namespace { | 22 namespace { |
22 | 23 |
23 // Callback required by Windows API function CertFindChainInStore(). In addition | 24 // Callback required by Windows API function CertFindChainInStore(). In addition |
24 // to filtering by extended/enhanced key usage, we do not show expired | 25 // to filtering by extended/enhanced key usage, we do not show expired |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 CertFreeCertificateContext(intermediates[i]); | 137 CertFreeCertificateContext(intermediates[i]); |
137 } | 138 } |
138 | 139 |
139 std::sort(selected_certs->begin(), selected_certs->end(), | 140 std::sort(selected_certs->begin(), selected_certs->end(), |
140 x509_util::ClientCertSorter()); | 141 x509_util::ClientCertSorter()); |
141 return true; | 142 return true; |
142 } | 143 } |
143 | 144 |
144 } // namespace | 145 } // namespace |
145 | 146 |
146 bool ClientCertStoreImpl::GetClientCerts(const SSLCertRequestInfo& request, | 147 void ClientCertStoreImpl::GetClientCerts(const SSLCertRequestInfo& request, |
147 CertificateList* selected_certs) { | 148 CertificateList* selected_certs, |
| 149 const base::Closure& callback) { |
148 // Client certificates of the user are in the "MY" system certificate store. | 150 // Client certificates of the user are in the "MY" system certificate store. |
149 HCERTSTORE my_cert_store = CertOpenSystemStore(NULL, L"MY"); | 151 HCERTSTORE my_cert_store = CertOpenSystemStore(NULL, L"MY"); |
150 if (!my_cert_store) { | 152 if (!my_cert_store) { |
151 PLOG(ERROR) << "Could not open the \"MY\" system certificate store: "; | 153 PLOG(ERROR) << "Could not open the \"MY\" system certificate store: "; |
152 return false; | 154 callback.Run(); |
| 155 return; |
153 } | 156 } |
154 | 157 |
155 bool rv = GetClientCertsImpl(my_cert_store, request, selected_certs); | 158 GetClientCertsImpl(my_cert_store, request, selected_certs); |
156 if (!CertCloseStore(my_cert_store, CERT_CLOSE_STORE_CHECK_FLAG)) { | 159 if (!CertCloseStore(my_cert_store, CERT_CLOSE_STORE_CHECK_FLAG)) |
157 PLOG(ERROR) << "Could not close the \"MY\" system certificate store: "; | 160 PLOG(ERROR) << "Could not close the \"MY\" system certificate store: "; |
158 return false; | 161 callback.Run(); |
159 } | |
160 return rv; | |
161 } | 162 } |
162 | 163 |
163 bool ClientCertStoreImpl::SelectClientCertsForTesting( | 164 bool ClientCertStoreImpl::SelectClientCertsForTesting( |
164 const CertificateList& input_certs, | 165 const CertificateList& input_certs, |
165 const SSLCertRequestInfo& request, | 166 const SSLCertRequestInfo& request, |
166 CertificateList* selected_certs) { | 167 CertificateList* selected_certs) { |
167 typedef crypto::ScopedCAPIHandle< | 168 typedef crypto::ScopedCAPIHandle< |
168 HCERTSTORE, | 169 HCERTSTORE, |
169 crypto::CAPIDestroyerWithFlags<HCERTSTORE, | 170 crypto::CAPIDestroyerWithFlags<HCERTSTORE, |
170 CertCloseStore, 0> > ScopedHCERTSTORE; | 171 CertCloseStore, 0> > ScopedHCERTSTORE; |
(...skipping 25 matching lines...) Expand all Loading... |
196 // copy). | 197 // copy). |
197 if (!CertFreeCertificateContext(cert)) | 198 if (!CertFreeCertificateContext(cert)) |
198 return false; | 199 return false; |
199 } | 200 } |
200 | 201 |
201 bool rv = GetClientCertsImpl(test_store.get(), request, selected_certs); | 202 bool rv = GetClientCertsImpl(test_store.get(), request, selected_certs); |
202 return rv; | 203 return rv; |
203 } | 204 } |
204 | 205 |
205 } // namespace net | 206 } // namespace net |
OLD | NEW |