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

Unified Diff: net/http/http_auth_handler_factory.cc

Issue 1408433006: Support tls-server-end-point channel bindings for HTTP authentication. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Narrower dependencies, update comments, address review comments. Created 4 years, 9 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/http/http_auth_handler_factory.cc
diff --git a/net/http/http_auth_handler_factory.cc b/net/http/http_auth_handler_factory.cc
index c03792f1e93c03d43ad29e146fbbbde8b825a1ec..af682e12d988494283a0244e38e994e08ef35bfd 100644
--- a/net/http/http_auth_handler_factory.cc
+++ b/net/http/http_auth_handler_factory.cc
@@ -14,6 +14,7 @@
#include "net/http/http_auth_handler_ntlm.h"
#include "net/http/http_auth_preferences.h"
#include "net/http/http_auth_scheme.h"
+#include "net/ssl/ssl_info.h"
#if defined(USE_KERBEROS)
#include "net/http/http_auth_handler_negotiate.h"
@@ -24,12 +25,13 @@ namespace net {
int HttpAuthHandlerFactory::CreateAuthHandlerFromString(
const std::string& challenge,
HttpAuth::Target target,
+ const SSLInfo& ssl_info,
const GURL& origin,
const BoundNetLog& net_log,
scoped_ptr<HttpAuthHandler>* handler) {
HttpAuthChallengeTokenizer props(challenge.begin(), challenge.end());
- return CreateAuthHandler(&props, target, origin, CREATE_CHALLENGE, 1,
- net_log, handler);
+ return CreateAuthHandler(&props, target, ssl_info, origin, CREATE_CHALLENGE,
+ 1, net_log, handler);
}
int HttpAuthHandlerFactory::CreatePreemptiveAuthHandlerFromString(
@@ -40,8 +42,10 @@ int HttpAuthHandlerFactory::CreatePreemptiveAuthHandlerFromString(
const BoundNetLog& net_log,
scoped_ptr<HttpAuthHandler>* handler) {
HttpAuthChallengeTokenizer props(challenge.begin(), challenge.end());
- return CreateAuthHandler(&props, target, origin, CREATE_PREEMPTIVE,
- digest_nonce_count, net_log, handler);
+ SSLInfo null_ssl_info;
+ return CreateAuthHandler(&props, target, null_ssl_info, origin,
+ CREATE_PREEMPTIVE, digest_nonce_count, net_log,
+ handler);
}
namespace {
@@ -161,6 +165,7 @@ HttpAuthHandlerRegistryFactory::Create(const HttpAuthPreferences* prefs,
int HttpAuthHandlerRegistryFactory::CreateAuthHandler(
HttpAuthChallengeTokenizer* challenge,
HttpAuth::Target target,
+ const SSLInfo& ssl_info,
const GURL& origin,
CreateReason reason,
int digest_nonce_count,
@@ -178,8 +183,9 @@ int HttpAuthHandlerRegistryFactory::CreateAuthHandler(
return ERR_UNSUPPORTED_AUTH_SCHEME;
}
DCHECK(it->second);
- return it->second->CreateAuthHandler(challenge, target, origin, reason,
- digest_nonce_count, net_log, handler);
+ return it->second->CreateAuthHandler(challenge, target, ssl_info, origin,
+ reason, digest_nonce_count, net_log,
+ handler);
}
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698