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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1304143010: Plumbing SSLPrivateKey Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase. Created 4 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
« no previous file with comments | « content/browser/loader/resource_loader.h ('k') | content/browser/loader/resource_loader_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/resource_loader.cc
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index eee044c6aaf87a0119371de0a8722a239657692f..3f7357ebc1dacd4af74ae6cae907523986a59a40 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -417,16 +417,11 @@ void ResourceLoader::ContinueSSLRequest() {
request_->ContinueDespiteLastError();
}
-void ResourceLoader::ContinueWithCertificate(net::X509Certificate* cert) {
+void ResourceLoader::ContinueWithCertificate(net::X509Certificate* cert,
+ net::SSLPrivateKey* private_key) {
DCHECK(ssl_client_auth_handler_);
ssl_client_auth_handler_.reset();
- if (!cert) {
- request_->ContinueWithCertificate(nullptr, nullptr);
- return;
- }
- scoped_refptr<net::SSLPrivateKey> private_key =
- net::FetchClientCertPrivateKey(cert);
- request_->ContinueWithCertificate(cert, private_key.get());
+ request_->ContinueWithCertificate(cert, private_key);
}
void ResourceLoader::CancelCertificateSelection() {
« no previous file with comments | « content/browser/loader/resource_loader.h ('k') | content/browser/loader/resource_loader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698