summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
authorpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-01 20:21:26 +0000
committerpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-01 20:21:26 +0000
commit73cac6248c8734f9f15809e605c1dea08e0cf6a5 (patch)
treea4a6c5bc07777f1d1d842b00a401f30b34fc1f37 /net/socket
parent6d7d17d721dcc74ff58be9269a80cbc99df6b65a (diff)
downloadchromium_src-73cac6248c8734f9f15809e605c1dea08e0cf6a5.zip
chromium_src-73cac6248c8734f9f15809e605c1dea08e0cf6a5.tar.gz
chromium_src-73cac6248c8734f9f15809e605c1dea08e0cf6a5.tar.bz2
Fix the official build.
Had a renamed method that is only called in official builds. BUG=113280, 120373 TBR=rsleevi@chromium.org Review URL: https://chromiumcodereview.appspot.com/10272036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/ssl_client_socket_nss.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index bd7b8e9c..7c3440f 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -1766,8 +1766,9 @@ int SSLClientSocketNSS::DoVerifyCertComplete(int result) {
const std::string& host = host_and_port_.host();
TransportSecurityState::DomainState domain_state;
- if (transport_security_state_->HasPinsForHost(
- &domain_state, host, sni_available)) {
+ if (transport_security_state_->GetDomainState(host, sni_available,
+ &domain_state) &&
+ domain_state.HasPins()) {
if (!domain_state.IsChainOfPublicKeysPermitted(
server_cert_verify_result_->public_key_hashes)) {
const base::Time build_time = base::GetBuildTime();