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

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

Issue 2496953002: Revert of Unify enum NextProto and enum AlternateProtocol. (Closed)
Patch Set: Created 4 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
« no previous file with comments | « net/socket/next_proto.cc ('k') | net/socket/ssl_client_socket.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // 76 //
77 class NET_EXPORT SSLClientSocket : public SSLSocket { 77 class NET_EXPORT SSLClientSocket : public SSLSocket {
78 public: 78 public:
79 SSLClientSocket(); 79 SSLClientSocket();
80 80
81 // Gets the SSL CertificateRequest info of the socket after Connect failed 81 // Gets the SSL CertificateRequest info of the socket after Connect failed
82 // with ERR_SSL_CLIENT_AUTH_CERT_NEEDED. 82 // with ERR_SSL_CLIENT_AUTH_CERT_NEEDED.
83 virtual void GetSSLCertRequestInfo( 83 virtual void GetSSLCertRequestInfo(
84 SSLCertRequestInfo* cert_request_info) = 0; 84 SSLCertRequestInfo* cert_request_info) = 0;
85 85
86 static NextProto NextProtoFromString(base::StringPiece proto_string);
87
88 static const char* NextProtoToString(NextProto next_proto);
89
86 // Log SSL key material to |path| on |task_runner|. Must be called before any 90 // Log SSL key material to |path| on |task_runner|. Must be called before any
87 // SSLClientSockets are created. 91 // SSLClientSockets are created.
88 // 92 //
89 // TODO(davidben): Switch this to a parameter on the SSLClientSocketContext 93 // TODO(davidben): Switch this to a parameter on the SSLClientSocketContext
90 // once https://crbug.com/458365 is resolved. This will require splitting 94 // once https://crbug.com/458365 is resolved. This will require splitting
91 // SSLKeyLogger into an interface, built with OS_NACL and a non-NaCl 95 // SSLKeyLogger into an interface, built with OS_NACL and a non-NaCl
92 // SSLKeyLoggerImpl. 96 // SSLKeyLoggerImpl.
93 static void SetSSLKeyLogFile( 97 static void SetSSLKeyLogFile(
94 const base::FilePath& path, 98 const base::FilePath& path,
95 const scoped_refptr<base::SequencedTaskRunner>& task_runner); 99 const scoped_refptr<base::SequencedTaskRunner>& task_runner);
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 156
153 // True if SCTs were received via a TLS extension. 157 // True if SCTs were received via a TLS extension.
154 bool signed_cert_timestamps_received_; 158 bool signed_cert_timestamps_received_;
155 // True if a stapled OCSP response was received. 159 // True if a stapled OCSP response was received.
156 bool stapled_ocsp_response_received_; 160 bool stapled_ocsp_response_received_;
157 }; 161 };
158 162
159 } // namespace net 163 } // namespace net
160 164
161 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_ 165 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_
OLDNEW
« no previous file with comments | « net/socket/next_proto.cc ('k') | net/socket/ssl_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698