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

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

Issue 1371263002: Refactor SSLClientSocket::SerializeNextProtos(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move DisableHTTP2 to next_protos. 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
« 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 // Section 9.2 of the HTTP/2 specification. Note that the server might still 171 // Section 9.2 of the HTTP/2 specification. Note that the server might still
172 // pick an inadequate cipher suite. 172 // pick an inadequate cipher suite.
173 static bool HasCipherAdequateForHTTP2( 173 static bool HasCipherAdequateForHTTP2(
174 const std::vector<uint16>& cipher_suites); 174 const std::vector<uint16>& cipher_suites);
175 175
176 // Determine if the TLS version required by Section 9.2 of the HTTP/2 176 // Determine if the TLS version required by Section 9.2 of the HTTP/2
177 // specification is enabled. Note that the server might still pick an 177 // specification is enabled. Note that the server might still pick an
178 // inadequate TLS version. 178 // inadequate TLS version.
179 static bool IsTLSVersionAdequateForHTTP2(const SSLConfig& ssl_config); 179 static bool IsTLSVersionAdequateForHTTP2(const SSLConfig& ssl_config);
180 180
181 // Serializes |next_protos| in the wire format for ALPN: protocols are listed 181 // Serialize |next_protos| in the wire format for ALPN and NPN: protocols are
182 // in order, each prefixed by a one-byte length. Any HTTP/2 protocols in 182 // listed in order, each prefixed by a one-byte length.
183 // |next_protos| are ignored if |can_advertise_http2| is false.
184 static std::vector<uint8_t> SerializeNextProtos( 183 static std::vector<uint8_t> SerializeNextProtos(
185 const NextProtoVector& next_protos, 184 const NextProtoVector& next_protos);
186 bool can_advertise_http2);
187 185
188 private: 186 private:
189 FRIEND_TEST_ALL_PREFIXES(SSLClientSocket, SerializeNextProtos); 187 FRIEND_TEST_ALL_PREFIXES(SSLClientSocket, SerializeNextProtos);
190 // For signed_cert_timestamps_received_ and stapled_ocsp_response_received_. 188 // For signed_cert_timestamps_received_ and stapled_ocsp_response_received_.
191 FRIEND_TEST_ALL_PREFIXES(SSLClientSocketTest, 189 FRIEND_TEST_ALL_PREFIXES(SSLClientSocketTest,
192 ConnectSignedCertTimestampsEnabledTLSExtension); 190 ConnectSignedCertTimestampsEnabledTLSExtension);
193 FRIEND_TEST_ALL_PREFIXES(SSLClientSocketTest, 191 FRIEND_TEST_ALL_PREFIXES(SSLClientSocketTest,
194 ConnectSignedCertTimestampsEnabledOCSP); 192 ConnectSignedCertTimestampsEnabledOCSP);
195 FRIEND_TEST_ALL_PREFIXES(SSLClientSocketTest, 193 FRIEND_TEST_ALL_PREFIXES(SSLClientSocketTest,
196 ConnectSignedCertTimestampsDisabled); 194 ConnectSignedCertTimestampsDisabled);
197 FRIEND_TEST_ALL_PREFIXES(SSLClientSocketTest, 195 FRIEND_TEST_ALL_PREFIXES(SSLClientSocketTest,
198 VerifyServerChainProperlyOrdered); 196 VerifyServerChainProperlyOrdered);
199 197
200 // True if SCTs were received via a TLS extension. 198 // True if SCTs were received via a TLS extension.
201 bool signed_cert_timestamps_received_; 199 bool signed_cert_timestamps_received_;
202 // True if a stapled OCSP response was received. 200 // True if a stapled OCSP response was received.
203 bool stapled_ocsp_response_received_; 201 bool stapled_ocsp_response_received_;
204 // Protocol negotiation extension used. 202 // Protocol negotiation extension used.
205 SSLNegotiationExtension negotiation_extension_; 203 SSLNegotiationExtension negotiation_extension_;
206 }; 204 };
207 205
208 } // namespace net 206 } // namespace net
209 207
210 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_ 208 #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