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

Unified Diff: net/http/http_cache_transaction.cc

Issue 1422573008: Plumbing SSLPrivateKey (//net) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing un-needed forward decl. Created 5 years, 1 month 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/http/http_cache_transaction.h ('k') | net/http/http_network_transaction.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_cache_transaction.cc
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
index b9003e76cda7c43a4143b3e70a4b511a5c641645..8c19b9a592bd4fb8d491cfd2e5ea555b218b8082 100644
--- a/net/http/http_cache_transaction.cc
+++ b/net/http/http_cache_transaction.cc
@@ -405,6 +405,7 @@ int HttpCache::Transaction::RestartIgnoringLastError(
int HttpCache::Transaction::RestartWithCertificate(
X509Certificate* client_cert,
+ SSLPrivateKey* client_private_key,
const CompletionCallback& callback) {
DCHECK(!callback.is_null());
@@ -414,7 +415,8 @@ int HttpCache::Transaction::RestartWithCertificate(
if (!cache_.get())
return ERR_UNEXPECTED;
- int rv = RestartNetworkRequestWithCertificate(client_cert);
+ int rv =
+ RestartNetworkRequestWithCertificate(client_cert, client_private_key);
if (rv == ERR_IO_PENDING)
callback_ = callback;
@@ -2280,13 +2282,15 @@ int HttpCache::Transaction::RestartNetworkRequest() {
}
int HttpCache::Transaction::RestartNetworkRequestWithCertificate(
- X509Certificate* client_cert) {
+ X509Certificate* client_cert,
+ SSLPrivateKey* client_private_key) {
DCHECK(mode_ & WRITE || mode_ == NONE);
DCHECK(network_trans_.get());
DCHECK_EQ(STATE_NONE, next_state_);
next_state_ = STATE_SEND_REQUEST_COMPLETE;
- int rv = network_trans_->RestartWithCertificate(client_cert, io_callback_);
+ int rv = network_trans_->RestartWithCertificate(
+ client_cert, client_private_key, io_callback_);
if (rv != ERR_IO_PENDING)
return DoLoop(rv);
return rv;
« no previous file with comments | « net/http/http_cache_transaction.h ('k') | net/http/http_network_transaction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698