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

Unified Diff: net/url_request/url_request.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.cc
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index cfacae0dee7dbc4b9526ab200e41ab5ac632c9fe..32bcb7b400f77bdf128765473a7cf67bbaf80835 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -30,6 +30,7 @@
#include "net/http/http_util.h"
#include "net/log/net_log.h"
#include "net/ssl/ssl_cert_request_info.h"
+#include "net/ssl/ssl_private_key.h"
davidben 2015/09/25 20:10:12 I don't think you need this include when using raw
svaldez 2015/09/28 16:54:53 Done.
#include "net/url_request/redirect_info.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_error_job.h"
@@ -848,10 +849,11 @@ void URLRequest::CancelAuth() {
job_->CancelAuth();
}
-void URLRequest::ContinueWithCertificate(X509Certificate* client_cert) {
+void URLRequest::ContinueWithCertificate(X509Certificate* client_cert,
+ SSLPrivateKey* client_pkey) {
DCHECK(job_.get());
- job_->ContinueWithCertificate(client_cert);
+ job_->ContinueWithCertificate(client_cert, client_pkey);
}
void URLRequest::ContinueDespiteLastError() {

Powered by Google App Engine
This is Rietveld 408576698