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

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

Issue 328903004: SSL Connect Job Waiting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added a command line flag that enables my changes. Created 6 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:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/err.h> 10 #include <openssl/err.h>
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 next_handshake_state_(STATE_NONE), 359 next_handshake_state_(STATE_NONE),
360 npn_status_(kNextProtoUnsupported), 360 npn_status_(kNextProtoUnsupported),
361 channel_id_request_return_value_(ERR_UNEXPECTED), 361 channel_id_request_return_value_(ERR_UNEXPECTED),
362 channel_id_xtn_negotiated_(false), 362 channel_id_xtn_negotiated_(false),
363 net_log_(transport_->socket()->NetLog()) {} 363 net_log_(transport_->socket()->NetLog()) {}
364 364
365 SSLClientSocketOpenSSL::~SSLClientSocketOpenSSL() { 365 SSLClientSocketOpenSSL::~SSLClientSocketOpenSSL() {
366 Disconnect(); 366 Disconnect();
367 } 367 }
368 368
369 bool SSLClientSocketOpenSSL::InSessionCache(std::string cache_key) {
wtc 2014/06/13 22:47:24 Nit: The Chromium convention often (but not always
mshelley1 2014/06/16 19:02:49 Done.
370 SSLContext* context = SSLContext::GetInstance();
371 return context->session_cache()->SessionIsInCache(cache_key);
372 }
373
369 void SSLClientSocketOpenSSL::GetSSLCertRequestInfo( 374 void SSLClientSocketOpenSSL::GetSSLCertRequestInfo(
370 SSLCertRequestInfo* cert_request_info) { 375 SSLCertRequestInfo* cert_request_info) {
371 cert_request_info->host_and_port = host_and_port_; 376 cert_request_info->host_and_port = host_and_port_;
372 cert_request_info->cert_authorities = cert_authorities_; 377 cert_request_info->cert_authorities = cert_authorities_;
373 cert_request_info->cert_key_types = cert_key_types_; 378 cert_request_info->cert_key_types = cert_key_types_;
374 } 379 }
375 380
376 SSLClientSocket::NextProtoStatus SSLClientSocketOpenSSL::GetNextProto( 381 SSLClientSocket::NextProtoStatus SSLClientSocketOpenSSL::GetNextProto(
377 std::string* proto, std::string* server_protos) { 382 std::string* proto, std::string* server_protos) {
378 *proto = npn_proto_; 383 *proto = npn_proto_;
(...skipping 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after
1430 DVLOG(2) << "next protocol: '" << npn_proto_ << "' status: " << npn_status_; 1435 DVLOG(2) << "next protocol: '" << npn_proto_ << "' status: " << npn_status_;
1431 return SSL_TLSEXT_ERR_OK; 1436 return SSL_TLSEXT_ERR_OK;
1432 } 1437 }
1433 1438
1434 scoped_refptr<X509Certificate> 1439 scoped_refptr<X509Certificate>
1435 SSLClientSocketOpenSSL::GetUnverifiedServerCertificateChain() const { 1440 SSLClientSocketOpenSSL::GetUnverifiedServerCertificateChain() const {
1436 return server_cert_; 1441 return server_cert_;
1437 } 1442 }
1438 1443
1439 } // namespace net 1444 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698