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

Side by Side Diff: net/socket/ssl_client_socket.h

Issue 328903004: SSL Connect Job Waiting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed bugs related to memory management and early exits in DoSSLConnectComplete 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 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 kNextProtoUnsupported = 0, // The server doesn't support NPN. 74 kNextProtoUnsupported = 0, // The server doesn't support NPN.
75 kNextProtoNegotiated = 1, // We agreed on a protocol. 75 kNextProtoNegotiated = 1, // We agreed on a protocol.
76 kNextProtoNoOverlap = 2, // No protocols in common. We requested 76 kNextProtoNoOverlap = 2, // No protocols in common. We requested
77 // the first protocol in our list. 77 // the first protocol in our list.
78 }; 78 };
79 79
80 // StreamSocket: 80 // StreamSocket:
81 virtual bool WasNpnNegotiated() const OVERRIDE; 81 virtual bool WasNpnNegotiated() const OVERRIDE;
82 virtual NextProto GetNegotiatedProtocol() const OVERRIDE; 82 virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
83 83
84 // Returns true if there is a cache entry in the ssl session cache
85 // for the given |cache key|.
86 //
87 // |cache_key| consists of an SSLConnectJobs host_and_port name
88 // concatenated with its session cache shard.
wtc 2014/06/19 19:38:10 Since this method doesn't have a |cache_key| param
mshelley1 2014/06/24 17:03:59 Done.
89 virtual bool InSessionCache() const;
wtc 2014/06/19 19:38:10 Could you declare this virtual method as abstract
mshelley1 2014/06/24 17:03:59 Done.
90
84 // Gets the SSL CertificateRequest info of the socket after Connect failed 91 // Gets the SSL CertificateRequest info of the socket after Connect failed
85 // with ERR_SSL_CLIENT_AUTH_CERT_NEEDED. 92 // with ERR_SSL_CLIENT_AUTH_CERT_NEEDED.
86 virtual void GetSSLCertRequestInfo( 93 virtual void GetSSLCertRequestInfo(
87 SSLCertRequestInfo* cert_request_info) = 0; 94 SSLCertRequestInfo* cert_request_info) = 0;
88 95
89 // Get the application level protocol that we negotiated with the server. 96 // Get the application level protocol that we negotiated with the server.
90 // *proto is set to the resulting protocol (n.b. that the string may have 97 // *proto is set to the resulting protocol (n.b. that the string may have
91 // embedded NULs). 98 // embedded NULs).
92 // kNextProtoUnsupported: *proto is cleared. 99 // kNextProtoUnsupported: *proto is cleared.
93 // kNextProtoNegotiated: *proto is set to the negotiated protocol. 100 // kNextProtoNegotiated: *proto is set to the negotiated protocol.
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 bool channel_id_sent_; 190 bool channel_id_sent_;
184 // True if SCTs were received via a TLS extension. 191 // True if SCTs were received via a TLS extension.
185 bool signed_cert_timestamps_received_; 192 bool signed_cert_timestamps_received_;
186 // True if a stapled OCSP response was received. 193 // True if a stapled OCSP response was received.
187 bool stapled_ocsp_response_received_; 194 bool stapled_ocsp_response_received_;
188 }; 195 };
189 196
190 } // namespace net 197 } // namespace net
191 198
192 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_ 199 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698