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

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

Issue 794563003: Change next_proto member type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix type in callback. Created 6 years 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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 static void RecordConnectionTypeMetrics(int ssl_version); 205 static void RecordConnectionTypeMetrics(int ssl_version);
206 206
207 // Returns whether TLS channel ID is enabled. 207 // Returns whether TLS channel ID is enabled.
208 static bool IsChannelIDEnabled( 208 static bool IsChannelIDEnabled(
209 const SSLConfig& ssl_config, 209 const SSLConfig& ssl_config,
210 ChannelIDService* channel_id_service); 210 ChannelIDService* channel_id_service);
211 211
212 // Serializes |next_protos| in the wire format for ALPN: protocols are listed 212 // Serializes |next_protos| in the wire format for ALPN: protocols are listed
213 // in order, each prefixed by a one-byte length. 213 // in order, each prefixed by a one-byte length.
214 static std::vector<uint8_t> SerializeNextProtos( 214 static std::vector<uint8_t> SerializeNextProtos(
215 const std::vector<std::string>& next_protos); 215 const NextProtoVector& next_protos);
Ryan Hamilton 2014/12/10 20:09:00 Can this fit on the previos line? (probably not)
Bence 2014/12/10 22:01:23 Unfortunately not.
216 216
217 // For unit testing only. 217 // For unit testing only.
218 // Returns the unverified certificate chain as presented by server. 218 // Returns the unverified certificate chain as presented by server.
219 // Note that chain may be different than the verified chain returned by 219 // Note that chain may be different than the verified chain returned by
220 // StreamSocket::GetSSLInfo(). 220 // StreamSocket::GetSSLInfo().
221 virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain() 221 virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain()
222 const = 0; 222 const = 0;
223 223
224 private: 224 private:
225 // For signed_cert_timestamps_received_ and stapled_ocsp_response_received_. 225 // For signed_cert_timestamps_received_ and stapled_ocsp_response_received_.
(...skipping 18 matching lines...) Expand all
244 bool signed_cert_timestamps_received_; 244 bool signed_cert_timestamps_received_;
245 // True if a stapled OCSP response was received. 245 // True if a stapled OCSP response was received.
246 bool stapled_ocsp_response_received_; 246 bool stapled_ocsp_response_received_;
247 // Protocol negotiation extension used. 247 // Protocol negotiation extension used.
248 SSLNegotiationExtension negotiation_extension_; 248 SSLNegotiationExtension negotiation_extension_;
249 }; 249 };
250 250
251 } // namespace net 251 } // namespace net
252 252
253 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_ 253 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698