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

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

Issue 1360633002: Implement Token Binding negotiation TLS extension (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@test-server-flags
Patch Set: Rip out TB key lookup from SSLClientSocketOpenSSL; fold TokenBindingExtension class into SSLClientS… Created 5 years, 2 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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 void RecordNegotiationExtension(); 151 void RecordNegotiationExtension();
152 152
153 // Records histograms for channel id support during full handshakes - resumed 153 // Records histograms for channel id support during full handshakes - resumed
154 // handshakes are ignored. 154 // handshakes are ignored.
155 static void RecordChannelIDSupport( 155 static void RecordChannelIDSupport(
156 ChannelIDService* channel_id_service, 156 ChannelIDService* channel_id_service,
157 bool negotiated_channel_id, 157 bool negotiated_channel_id,
158 bool channel_id_enabled, 158 bool channel_id_enabled,
159 bool supports_ecc); 159 bool supports_ecc);
160 160
161 // Records histograms for token binding support during full handshakes.
162 static void RecordTokenBindingSupport(const SSLConfig& ssl_config,
163 ChannelIDService* channel_id_service,
164 bool negotiated_token_binding);
165
161 // Returns whether TLS channel ID is enabled. 166 // Returns whether TLS channel ID is enabled.
162 static bool IsChannelIDEnabled( 167 static bool IsChannelIDEnabled(
163 const SSLConfig& ssl_config, 168 const SSLConfig& ssl_config,
164 ChannelIDService* channel_id_service); 169 ChannelIDService* channel_id_service);
165 170
171 // Returns whether Token Binding is enabled.
172 static bool IsTokenBindingEnabled(const SSLConfig& ssl_config,
173 ChannelIDService* channel_id_service);
174
166 // Determine if there is at least one enabled cipher suite that satisfies 175 // Determine if there is at least one enabled cipher suite that satisfies
167 // Section 9.2 of the HTTP/2 specification. Note that the server might still 176 // Section 9.2 of the HTTP/2 specification. Note that the server might still
168 // pick an inadequate cipher suite. 177 // pick an inadequate cipher suite.
169 static bool HasCipherAdequateForHTTP2( 178 static bool HasCipherAdequateForHTTP2(
170 const std::vector<uint16>& cipher_suites); 179 const std::vector<uint16>& cipher_suites);
171 180
172 // Determine if the TLS version required by Section 9.2 of the HTTP/2 181 // Determine if the TLS version required by Section 9.2 of the HTTP/2
173 // specification is enabled. Note that the server might still pick an 182 // specification is enabled. Note that the server might still pick an
174 // inadequate TLS version. 183 // inadequate TLS version.
175 static bool IsTLSVersionAdequateForHTTP2(const SSLConfig& ssl_config); 184 static bool IsTLSVersionAdequateForHTTP2(const SSLConfig& ssl_config);
(...skipping 19 matching lines...) Expand all
195 bool signed_cert_timestamps_received_; 204 bool signed_cert_timestamps_received_;
196 // True if a stapled OCSP response was received. 205 // True if a stapled OCSP response was received.
197 bool stapled_ocsp_response_received_; 206 bool stapled_ocsp_response_received_;
198 // Protocol negotiation extension used. 207 // Protocol negotiation extension used.
199 SSLNegotiationExtension negotiation_extension_; 208 SSLNegotiationExtension negotiation_extension_;
200 }; 209 };
201 210
202 } // namespace net 211 } // namespace net
203 212
204 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_ 213 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698