diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/socket/socket_test_util.cc | 3 | ||||
-rw-r--r-- | net/socket/ssl_client_socket_mac.cc | 4 | ||||
-rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 4 | ||||
-rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 4 | ||||
-rw-r--r-- | net/socket/ssl_client_socket_win.cc | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index c48694d..96b137f 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc @@ -1132,7 +1132,8 @@ base::TimeDelta MockSSLClientSocket::GetConnectTimeMicros() const { void MockSSLClientSocket::GetSSLInfo(SSLInfo* ssl_info) { ssl_info->Reset(); ssl_info->cert = data_->cert; - ssl_info->client_cert_sent = data_->client_cert_sent; + ssl_info->client_cert_sent = WasOriginBoundCertSent() || + data_->client_cert_sent; } void MockSSLClientSocket::GetSSLCertRequestInfo( diff --git a/net/socket/ssl_client_socket_mac.cc b/net/socket/ssl_client_socket_mac.cc index aa62b96..a7e97d5 100644 --- a/net/socket/ssl_client_socket_mac.cc +++ b/net/socket/ssl_client_socket_mac.cc @@ -724,8 +724,8 @@ void SSLClientSocketMac::GetSSLInfo(SSLInfo* ssl_info) { ssl_info->public_key_hashes = server_cert_verify_result_.public_key_hashes; ssl_info->is_issued_by_known_root = server_cert_verify_result_.is_issued_by_known_root; - ssl_info->client_cert_sent = - ssl_config_.send_client_cert && ssl_config_.client_cert; + ssl_info->client_cert_sent = WasOriginBoundCertSent() || + (ssl_config_.send_client_cert && ssl_config_.client_cert); // security info SSLCipherSuite suite; diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index f3b8fa9..fd32158 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -499,8 +499,8 @@ void SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) { } ssl_info->is_issued_by_known_root = server_cert_verify_result_->is_issued_by_known_root; - ssl_info->client_cert_sent = - ssl_config_.send_client_cert && ssl_config_.client_cert; + ssl_info->client_cert_sent = WasOriginBoundCertSent() || + (ssl_config_.send_client_cert && ssl_config_.client_cert); PRUint16 cipher_suite = SSLConnectionStatusToCipherSuite(ssl_connection_status_); diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index 5039487..fcdb644 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -587,8 +587,8 @@ void SSLClientSocketOpenSSL::GetSSLInfo(SSLInfo* ssl_info) { server_cert_verify_result_.is_issued_by_known_root; ssl_info->public_key_hashes = server_cert_verify_result_.public_key_hashes; - ssl_info->client_cert_sent = - ssl_config_.send_client_cert && ssl_config_.client_cert; + ssl_info->client_cert_sent = WasOriginBoundCertSent() || + (ssl_config_.send_client_cert && ssl_config_.client_cert); const SSL_CIPHER* cipher = SSL_get_current_cipher(ssl_); CHECK(cipher); diff --git a/net/socket/ssl_client_socket_win.cc b/net/socket/ssl_client_socket_win.cc index 3f3511f..8387fa1 100644 --- a/net/socket/ssl_client_socket_win.cc +++ b/net/socket/ssl_client_socket_win.cc @@ -427,8 +427,8 @@ void SSLClientSocketWin::GetSSLInfo(SSLInfo* ssl_info) { ssl_info->public_key_hashes = server_cert_verify_result_.public_key_hashes; ssl_info->is_issued_by_known_root = server_cert_verify_result_.is_issued_by_known_root; - ssl_info->client_cert_sent = - ssl_config_.send_client_cert && ssl_config_.client_cert; + ssl_info->client_cert_sent = WasOriginBoundCertSent() || + (ssl_config_.send_client_cert && ssl_config_.client_cert); SecPkgContext_ConnectionInfo connection_info; SECURITY_STATUS status = QueryContextAttributes( &ctxt_, SECPKG_ATTR_CONNECTION_INFO, &connection_info); |