net/socket/ssl_client_socket_nss.cc - Issue 16501002: Give more request types a TransportSecurityState.

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_nss.cc

Issue 16501002: Give more request types a TransportSecurityState. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Resolve merge conflict after rebase. Created 7 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:

Index: net/socket/ssl_client_socket_nss.cc

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

index 9d74425d9b24e646701b0cef7014e693db799e7a..754f09cfbbd021fa402f0622067837f6e7d13ef9 100644

--- a/net/socket/ssl_client_socket_nss.cc

+++ b/net/socket/ssl_client_socket_nss.cc

@@ -2935,6 +2935,9 @@ SSLClientSocketNSS::GetNextProto(std::string* proto,

int SSLClientSocketNSS::Connect(const CompletionCallback& callback) {

EnterFunction("");

DCHECK(transport_.get());

+ // It is an error to create an SSLClientSocket whose context has no

+ // TransportSecurityState.

+ DCHECK(transport_security_state_);

DCHECK_EQ(STATE_NONE, next_handshake_state_);

DCHECK(user_connect_callback_.is_null());

DCHECK(!callback.is_null());