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

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

Issue 706203003: Update from https://crrev.com/303153 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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 <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 bool stapled_ocsp_response_received); 185 bool stapled_ocsp_response_received);
186 186
187 // Records histograms for channel id support during full handshakes - resumed 187 // Records histograms for channel id support during full handshakes - resumed
188 // handshakes are ignored. 188 // handshakes are ignored.
189 static void RecordChannelIDSupport( 189 static void RecordChannelIDSupport(
190 ChannelIDService* channel_id_service, 190 ChannelIDService* channel_id_service,
191 bool negotiated_channel_id, 191 bool negotiated_channel_id,
192 bool channel_id_enabled, 192 bool channel_id_enabled,
193 bool supports_ecc); 193 bool supports_ecc);
194 194
195 // Records ConnectionType histograms for a successful SSL connection.
196 static void RecordConnectionTypeMetrics(int ssl_version);
197
195 // Returns whether TLS channel ID is enabled. 198 // Returns whether TLS channel ID is enabled.
196 static bool IsChannelIDEnabled( 199 static bool IsChannelIDEnabled(
197 const SSLConfig& ssl_config, 200 const SSLConfig& ssl_config,
198 ChannelIDService* channel_id_service); 201 ChannelIDService* channel_id_service);
199 202
200 // Serializes |next_protos| in the wire format for ALPN: protocols are listed 203 // Serializes |next_protos| in the wire format for ALPN: protocols are listed
201 // in order, each prefixed by a one-byte length. 204 // in order, each prefixed by a one-byte length.
202 static std::vector<uint8_t> SerializeNextProtos( 205 static std::vector<uint8_t> SerializeNextProtos(
203 const std::vector<std::string>& next_protos); 206 const std::vector<std::string>& next_protos);
204 207
(...skipping 27 matching lines...) Expand all
232 bool signed_cert_timestamps_received_; 235 bool signed_cert_timestamps_received_;
233 // True if a stapled OCSP response was received. 236 // True if a stapled OCSP response was received.
234 bool stapled_ocsp_response_received_; 237 bool stapled_ocsp_response_received_;
235 // Protocol negotiation extension used. 238 // Protocol negotiation extension used.
236 SSLNegotiationExtension negotiation_extension_; 239 SSLNegotiationExtension negotiation_extension_;
237 }; 240 };
238 241
239 } // namespace net 242 } // namespace net
240 243
241 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_ 244 #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