Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(434)

Side by Side Diff: net/socket/ssl_client_socket_openssl.cc

Issue 8401024: Disable SPDY IP pooling for SSL connections with client authentication. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // OpenSSL binding for SSLClientSocket. The class layout and general principle 5 // OpenSSL binding for SSLClientSocket. The class layout and general principle
6 // of operation is derived from SSLClientSocketNSS. 6 // of operation is derived from SSLClientSocketNSS.
7 7
8 #include "net/socket/ssl_client_socket_openssl.h" 8 #include "net/socket/ssl_client_socket_openssl.h"
9 9
10 #include <openssl/ssl.h> 10 #include <openssl/ssl.h>
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 ssl_info->Reset(); 554 ssl_info->Reset();
555 if (!server_cert_) 555 if (!server_cert_)
556 return; 556 return;
557 557
558 ssl_info->cert = server_cert_; 558 ssl_info->cert = server_cert_;
559 ssl_info->cert_status = server_cert_verify_result_.cert_status; 559 ssl_info->cert_status = server_cert_verify_result_.cert_status;
560 ssl_info->is_issued_by_known_root = 560 ssl_info->is_issued_by_known_root =
561 server_cert_verify_result_.is_issued_by_known_root; 561 server_cert_verify_result_.is_issued_by_known_root;
562 ssl_info->public_key_hashes = 562 ssl_info->public_key_hashes =
563 server_cert_verify_result_.public_key_hashes; 563 server_cert_verify_result_.public_key_hashes;
564 ssl_info->client_cert_sent =
565 ssl_config_.send_client_cert && ssl_config_.client_cert;
564 566
565 const SSL_CIPHER* cipher = SSL_get_current_cipher(ssl_); 567 const SSL_CIPHER* cipher = SSL_get_current_cipher(ssl_);
566 CHECK(cipher); 568 CHECK(cipher);
567 ssl_info->security_bits = SSL_CIPHER_get_bits(cipher, NULL); 569 ssl_info->security_bits = SSL_CIPHER_get_bits(cipher, NULL);
568 const COMP_METHOD* compression = SSL_get_current_compression(ssl_); 570 const COMP_METHOD* compression = SSL_get_current_compression(ssl_);
569 571
570 ssl_info->connection_status = EncodeSSLConnectionStatus( 572 ssl_info->connection_status = EncodeSSLConnectionStatus(
571 SSL_CIPHER_get_id(cipher), 573 SSL_CIPHER_get_id(cipher),
572 compression ? compression->type : 0, 574 compression ? compression->type : 0,
573 GetNetSSLVersion(ssl_)); 575 GetNetSSLVersion(ssl_));
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv, 1220 net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv,
1219 user_write_buf_->data()); 1221 user_write_buf_->data());
1220 return rv; 1222 return rv;
1221 } 1223 }
1222 1224
1223 int err = SSL_get_error(ssl_, rv); 1225 int err = SSL_get_error(ssl_, rv);
1224 return MapOpenSSLError(err, err_tracer); 1226 return MapOpenSSLError(err, err_tracer);
1225 } 1227 }
1226 1228
1227 } // namespace net 1229 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698