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

Unified Diff: net/url_request/url_request_http_job.cc

Issue 1304143010: Plumbing SSLPrivateKey Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 3 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: net/url_request/url_request_http_job.cc
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index 2937478109334fc4a467408a1fcf596b3d33f954..5c70124f651bd984abcc608ac0ba3381c60e63d9 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -42,6 +42,7 @@
#include "net/proxy/proxy_info.h"
#include "net/ssl/ssl_cert_request_info.h"
#include "net/ssl/ssl_config_service.h"
+#include "net/ssl/ssl_private_key.h"
davidben 2015/09/25 20:10:12 Nit: unnecessary
svaldez 2015/09/28 16:54:53 Done.
#include "net/url_request/http_user_agent_settings.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_backoff_manager.h"
@@ -1245,8 +1246,8 @@ void URLRequestHttpJob::CancelAuth() {
weak_factory_.GetWeakPtr(), OK));
}
-void URLRequestHttpJob::ContinueWithCertificate(
- X509Certificate* client_cert) {
+void URLRequestHttpJob::ContinueWithCertificate(X509Certificate* client_cert,
+ SSLPrivateKey* client_pkey) {
DCHECK(transaction_.get());
DCHECK(!response_info_) << "should not have a response yet";
@@ -1258,7 +1259,8 @@ void URLRequestHttpJob::ContinueWithCertificate(
// be notifying our consumer asynchronously via OnStartCompleted.
SetStatus(URLRequestStatus(URLRequestStatus::IO_PENDING, 0));
- int rv = transaction_->RestartWithCertificate(client_cert, start_callback_);
+ int rv = transaction_->RestartWithCertificate(client_cert, client_pkey,
+ start_callback_);
if (rv == ERR_IO_PENDING)
return;

Powered by Google App Engine
This is Rietveld 408576698