net/socket/ssl_client_socket_impl.cc - Issue 2084783002: Cleanup HPKP error handling and weak DH key handling

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/socket/ssl_client_socket_impl.cc

Issue 2084783002: Cleanup HPKP error handling and weak DH key handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@require_ct_enforcer

Patch Set: Created 4 years, 6 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

« components/ssl_errors/error_info.cc ('K') | « net/quic/crypto/proof_verifier_chromium.cc ('k') | net/url_request/url_request_http_job.cc » ('j') | net/url_request/url_request_http_job.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/socket/ssl_client_socket_impl.cc

diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc

index 10bda9110ba2ed90d2667458c34c931df66961cc..60a8fae446bc38d88b85149bbbb7bdeb07299eef 100644

--- a/net/socket/ssl_client_socket_impl.cc

+++ b/net/socket/ssl_client_socket_impl.cc

@@ -1335,10 +1335,12 @@ int SSLClientSocketImpl::DoVerifyCertComplete(int result) {

server_cert_verify_result_.public_key_hashes, server_cert_.get(),

server_cert_verify_result_.verified_cert.get(),

TransportSecurityState::ENABLE_PIN_REPORTS, &pinning_failure_log_)) {

- if (server_cert_verify_result_.is_issued_by_known_root)

+ if (server_cert_verify_result_.is_issued_by_known_root) {

+ server_cert_verify_result_.cert_status |= CERT_STATUS_PINNED_KEY_MISSING;

davidben 2016/06/21 00:14:12 Think it's worth adding a line to SSLClientSocketT

result = ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN;

davidben 2016/06/21 00:14:12 [Confirmed these are the two places in //net which

- else

+ } else {

pkp_bypassed_ = true;

+ }

}

if (result == OK) {