diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 21:43:03 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 21:43:03 +0000 |
| commit | 11e2f036d75ba1be094578036b63ba2c288553a5 (patch) | |
| tree | 90e887805c8d5e9016f175443aa93abd3b373789 /net/socket | |
| parent | fa147c7d7155ef7b8e1096633724daa154f04530 (diff) | |
| download | chromium_src-11e2f036d75ba1be094578036b63ba2c288553a5.zip chromium_src-11e2f036d75ba1be094578036b63ba2c288553a5.tar.gz chromium_src-11e2f036d75ba1be094578036b63ba2c288553a5.tar.bz2 | |
Update SSLClientSocketNSS::ClientAuthHandler now that
SSL_HandshakeNegotiatedExtension can be called before the handshake.
(re: http://codereview.chromium.org/7746010)
BUG=88782
TEST=None
Review URL: http://codereview.chromium.org/7765012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99461 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 11ee568..0965cc56 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -2328,13 +2328,10 @@ SECStatus SSLClientSocketNSS::ClientAuthHandler( SSLClientSocketNSS* that = reinterpret_cast<SSLClientSocketNSS*>(arg); // Check if an origin-bound certificate is requested. - PRBool xtn_negotiated; + PRBool xtn_negotiated = PR_FALSE; SECStatus rv = SSL_HandshakeNegotiatedExtension( socket, ssl_ob_cert_xtn, &xtn_negotiated); - // TODO(rkn): Patch SSL_HandshakeNegotiatedExtension so that it can be called - // before the handshake is done. Then add "DCHECK_EQ(SECSuccess, rv);". - if (rv != SECSuccess) - xtn_negotiated = PR_FALSE; + DCHECK_EQ(SECSuccess, rv); that->ob_cert_xtn_negotiated_ = xtn_negotiated ? true : false; if (that->ob_cert_xtn_negotiated_) { |