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

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

Issue 1131763002: Reject renegotiations in SSLClientSocket by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: NSS greediness... Created 5 years, 7 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/ssl_client_socket_nss.cc ('k') | net/socket/ssl_client_socket_openssl.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_OPENSSL_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 // SCTs are held in three separate vectors in ct_verify_result, each 182 // SCTs are held in three separate vectors in ct_verify_result, each
183 // vetor representing a particular verification state, this method associates 183 // vetor representing a particular verification state, this method associates
184 // each of the SCTs with the corresponding SCTVerifyStatus as it adds it to 184 // each of the SCTs with the corresponding SCTVerifyStatus as it adds it to
185 // the |ssl_info|.signed_certificate_timestamps list. 185 // the |ssl_info|.signed_certificate_timestamps list.
186 void AddSCTInfoToSSLInfo(SSLInfo* ssl_info) const; 186 void AddSCTInfoToSSLInfo(SSLInfo* ssl_info) const;
187 187
188 // Returns a unique key string for the SSL session cache for 188 // Returns a unique key string for the SSL session cache for
189 // this socket. 189 // this socket.
190 std::string GetSessionCacheKey() const; 190 std::string GetSessionCacheKey() const;
191 191
192 // Returns true if renegotiations are allowed.
193 bool IsRenegotiationAllowed() const;
194
192 bool transport_send_busy_; 195 bool transport_send_busy_;
193 bool transport_recv_busy_; 196 bool transport_recv_busy_;
194 197
195 // Buffers which are shared by BoringSSL and SSLClientSocketOpenSSL. 198 // Buffers which are shared by BoringSSL and SSLClientSocketOpenSSL.
196 // GrowableIOBuffer is used to keep ownership and setting offset. 199 // GrowableIOBuffer is used to keep ownership and setting offset.
197 scoped_refptr<GrowableIOBuffer> send_buffer_; 200 scoped_refptr<GrowableIOBuffer> send_buffer_;
198 scoped_refptr<GrowableIOBuffer> recv_buffer_; 201 scoped_refptr<GrowableIOBuffer> recv_buffer_;
199 202
200 CompletionCallback user_connect_callback_; 203 CompletionCallback user_connect_callback_;
201 CompletionCallback user_read_callback_; 204 CompletionCallback user_read_callback_;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 // pinning failure. It is a (somewhat) human-readable string. 311 // pinning failure. It is a (somewhat) human-readable string.
309 std::string pinning_failure_log_; 312 std::string pinning_failure_log_;
310 313
311 BoundNetLog net_log_; 314 BoundNetLog net_log_;
312 base::WeakPtrFactory<SSLClientSocketOpenSSL> weak_factory_; 315 base::WeakPtrFactory<SSLClientSocketOpenSSL> weak_factory_;
313 }; 316 };
314 317
315 } // namespace net 318 } // namespace net
316 319
317 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 320 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_nss.cc ('k') | net/socket/ssl_client_socket_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698