diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 02:51:10 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 02:51:10 +0000 |
| commit | e6d31f1f2ab3fc3c1774ee2d01626c068134d3d1 (patch) | |
| tree | 562366b9a2c52ed9f4f6a8e44cd1e0f3e8b52d1a /net/socket | |
| parent | 4e182855a8f6ef70ae619d109dfb76ff3dd0039f (diff) | |
| download | chromium_src-e6d31f1f2ab3fc3c1774ee2d01626c068134d3d1.zip chromium_src-e6d31f1f2ab3fc3c1774ee2d01626c068134d3d1.tar.gz chromium_src-e6d31f1f2ab3fc3c1774ee2d01626c068134d3d1.tar.bz2 | |
Pull out debug instrumentation.
The check hasn't been hit, and the crash has stopped after rch's change r121829.
Revert 121851 - Add some instrumentation to track down a crash.
See if the state machine in SSLClientSocketNSS is failing to cancel the origin bound certificate request.
BUG=113233
Review URL: http://codereview.chromium.org/9383034
Review URL: http://codereview.chromium.org/9417035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 11 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_nss.h | 1 |
2 files changed, 0 insertions, 12 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 255dc3f..9c74ecb 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -1610,11 +1610,6 @@ int SSLClientSocketNSS::DoGetOBCertComplete(int result) { net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_GET_ORIGIN_BOUND_CERT, result); client_auth_cert_needed_ = false; - - if (ob_cert_request_handle_) { - CHECK(!origin_bound_cert_service_->DebugIsRequestAlive( - ob_cert_request_id_)); - } ob_cert_request_handle_ = NULL; if (result != OK) @@ -2212,8 +2207,6 @@ SECStatus SSLClientSocketNSS::OriginBoundClientAuthHandler( std::vector<uint8> requested_cert_types(cert_types->data, cert_types->data + cert_types->len); net_log_.BeginEvent(NetLog::TYPE_SSL_GET_ORIGIN_BOUND_CERT, NULL); - - CHECK(!ob_cert_request_handle_); int error = origin_bound_cert_service_->GetOriginBoundCert( origin, requested_cert_types, @@ -2225,10 +2218,6 @@ SECStatus SSLClientSocketNSS::OriginBoundClientAuthHandler( &ob_cert_request_handle_); if (error == ERR_IO_PENDING) { - CHECK(ob_cert_request_handle_); - origin_bound_cert_service_->DebugGetRequestId( - ob_cert_request_handle_, &ob_cert_request_id_); - // Asynchronous case. client_auth_cert_needed_ = true; return SECWouldBlock; diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h index ccf762b..e9f4f48 100644 --- a/net/socket/ssl_client_socket_nss.h +++ b/net/socket/ssl_client_socket_nss.h @@ -261,7 +261,6 @@ class SSLClientSocketNSS : public SSLClientSocket { std::string ob_private_key_; std::string ob_cert_; OriginBoundCertService::RequestHandle ob_cert_request_handle_; - DebugOBCertRequestId ob_cert_request_id_; // True if NSS has called HandshakeCallback. bool handshake_callback_called_; |