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

Unified Diff: net/ssl/client_cert_store_impl_mac.cc

Issue 18121007: *WIP* Store NSS slots per profile. Move keygen to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cert manager basics working Created 7 years, 2 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
« no previous file with comments | « net/ssl/client_cert_store_impl.h ('k') | net/ssl/client_cert_store_impl_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ssl/client_cert_store_impl_mac.cc
diff --git a/net/ssl/client_cert_store_impl_mac.cc b/net/ssl/client_cert_store_impl_mac.cc
index 33457358f1e7d60ff914e670c9b9fff8093b9cd7..2ac726bb6a2e06612ff64727863f4a7f1b891109 100644
--- a/net/ssl/client_cert_store_impl_mac.cc
+++ b/net/ssl/client_cert_store_impl_mac.cc
@@ -172,8 +172,9 @@ bool GetClientCertsImpl(const scoped_refptr<X509Certificate>& preferred_cert,
} // namespace
-bool ClientCertStoreImpl::GetClientCerts(const SSLCertRequestInfo& request,
- CertificateList* selected_certs) {
+void ClientCertStoreImpl::GetClientCerts(const SSLCertRequestInfo& request,
+ CertificateList* selected_certs,
+ const base::Closure& callback) {
std::string server_domain =
HostPortPair::FromString(request.host_and_port).host();
@@ -205,8 +206,10 @@ bool ClientCertStoreImpl::GetClientCerts(const SSLCertRequestInfo& request,
base::AutoLock lock(crypto::GetMacSecurityServicesLock());
err = SecIdentitySearchCreate(NULL, CSSM_KEYUSE_SIGN, &search);
}
- if (err)
- return false;
+ if (err) {
+ callback.Run();
+ return;
+ }
ScopedCFTypeRef<SecIdentitySearchRef> scoped_search(search);
while (!err) {
SecIdentityRef identity = NULL;
@@ -239,11 +242,13 @@ bool ClientCertStoreImpl::GetClientCerts(const SSLCertRequestInfo& request,
if (err != errSecItemNotFound) {
OSSTATUS_LOG(ERROR, err) << "SecIdentitySearch error";
- return false;
+ callback.Run();
+ return;
}
- return GetClientCertsImpl(preferred_cert, regular_certs, request, true,
- selected_certs);
+ GetClientCertsImpl(preferred_cert, regular_certs, request, true,
+ selected_certs);
+ callback.Run();
}
bool ClientCertStoreImpl::SelectClientCertsForTesting(
« no previous file with comments | « net/ssl/client_cert_store_impl.h ('k') | net/ssl/client_cert_store_impl_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698