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

Unified Diff: net/ssl/client_cert_store_mac.cc

Issue 2848313003: Revert of Remove client_certs from SSLCertRequestInfo. (Closed)
Patch Set: Created 3 years, 8 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_mac.h ('k') | net/ssl/client_cert_store_nss.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ssl/client_cert_store_mac.cc
diff --git a/net/ssl/client_cert_store_mac.cc b/net/ssl/client_cert_store_mac.cc
index 80035244e441e5adba6a47f8f1358309c7fa769a..a3ef5899155d3a1f3fec7da227c3af7845724fd7 100644
--- a/net/ssl/client_cert_store_mac.cc
+++ b/net/ssl/client_cert_store_mac.cc
@@ -236,9 +236,9 @@
ClientCertStoreMac::~ClientCertStoreMac() {}
-void ClientCertStoreMac::GetClientCerts(
- const SSLCertRequestInfo& request,
- const ClientCertListCallback& callback) {
+void ClientCertStoreMac::GetClientCerts(const SSLCertRequestInfo& request,
+ CertificateList* selected_certs,
+ const base::Closure& callback) {
std::string server_domain = request.host_and_port.host();
ScopedCFTypeRef<SecIdentityRef> preferred_identity;
@@ -270,7 +270,8 @@
err = SecIdentitySearchCreate(NULL, CSSM_KEYUSE_SIGN, &search);
}
if (err) {
- callback.Run(CertificateList());
+ selected_certs->clear();
+ callback.Run();
return;
}
ScopedCFTypeRef<SecIdentitySearchRef> scoped_search(search);
@@ -310,14 +311,14 @@
if (err != errSecItemNotFound) {
OSSTATUS_LOG(ERROR, err) << "SecIdentitySearch error";
- callback.Run(CertificateList());
+ selected_certs->clear();
+ callback.Run();
return;
}
- CertificateList selected_certs;
GetClientCertsImpl(preferred_cert, regular_certs, request, true,
- &selected_certs);
- callback.Run(std::move(selected_certs));
+ selected_certs);
+ callback.Run();
}
bool ClientCertStoreMac::SelectClientCertsForTesting(
« no previous file with comments | « net/ssl/client_cert_store_mac.h ('k') | net/ssl/client_cert_store_nss.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698