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

Unified Diff: content/browser/loader/resource_loader.cc

Issue 12035105: Move client certificates retrieval logic out of the SSL sockets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Linux Redux build Created 7 years, 11 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
Index: content/browser/loader/resource_loader.cc
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index a45229ee70ec4df164d8686cd132b5e862d3ae64..6056d879bd46054b8eca6119ff068022901dab6c 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -21,6 +21,8 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/resource_response.h"
#include "content/public/common/url_constants.h"
+#include "net/base/client_cert_store.h"
+#include "net/base/client_cert_store_impl.h"
#include "net/base/load_flags.h"
#include "net/http/http_response_headers.h"
#include "webkit/appcache/appcache_interceptor.h"
@@ -269,6 +271,11 @@ void ResourceLoader::OnCertificateRequested(
return;
}
+#if defined(USE_NSS) && !defined(OS_IOS)
+ scoped_ptr<net::ClientCertStore> store(new net::ClientCertStoreImpl());
Ryan Sleevi 2013/01/29 19:59:49 Rather than creating a new object every time, you
ppi 2013/01/30 15:34:56 Sounds good, thanks! Made the pointer a member var
+ store->GetClientCerts(*cert_info, &cert_info->client_certs);
+#endif
+
if (cert_info->client_certs.empty()) {
// No need to query the user if there are no certs to choose from.
request_->ContinueWithCertificate(NULL);
« no previous file with comments | « no previous file | net/base/x509_certificate.h » ('j') | net/data/ssl/scripts/client_authentication/run-test-server.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698