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

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

Issue 2728823002: Remove redundant 3-SHAKE mitigation. (Closed)
Patch Set: typo Created 3 years, 9 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_IMPL_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 void DoReadCallback(int result); 147 void DoReadCallback(int result);
148 void DoWriteCallback(int result); 148 void DoWriteCallback(int result);
149 149
150 int DoHandshake(); 150 int DoHandshake();
151 int DoHandshakeComplete(int result); 151 int DoHandshakeComplete(int result);
152 int DoChannelIDLookup(); 152 int DoChannelIDLookup();
153 int DoChannelIDLookupComplete(int result); 153 int DoChannelIDLookupComplete(int result);
154 int DoVerifyCert(int result); 154 int DoVerifyCert(int result);
155 int DoVerifyCertComplete(int result); 155 int DoVerifyCertComplete(int result);
156 void DoConnectCallback(int result); 156 void DoConnectCallback(int result);
157 void UpdateServerCert();
158 157
159 void OnHandshakeIOComplete(int result); 158 void OnHandshakeIOComplete(int result);
160 159
161 int DoHandshakeLoop(int last_io_result); 160 int DoHandshakeLoop(int last_io_result);
162 int DoPayloadRead(); 161 int DoPayloadRead();
163 int DoPayloadWrite(); 162 int DoPayloadWrite();
164 163
165 // Called when an asynchronous event completes which may have blocked the 164 // Called when an asynchronous event completes which may have blocked the
166 // pending Connect, Read or Write calls, if any. Retries all state machines 165 // pending Connect, Read or Write calls, if any. Retries all state machines
167 // and, if complete, runs the respective callbacks. 166 // and, if complete, runs the respective callbacks.
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 int pending_read_error_; 264 int pending_read_error_;
266 265
267 // If there is a pending read result, the OpenSSL result code (output of 266 // If there is a pending read result, the OpenSSL result code (output of
268 // SSL_get_error) associated with it. 267 // SSL_get_error) associated with it.
269 int pending_read_ssl_error_; 268 int pending_read_ssl_error_;
270 269
271 // If there is a pending read result, the OpenSSLErrorInfo associated with it. 270 // If there is a pending read result, the OpenSSLErrorInfo associated with it.
272 OpenSSLErrorInfo pending_read_error_info_; 271 OpenSSLErrorInfo pending_read_error_info_;
273 272
274 // Set when Connect finishes. 273 // Set when Connect finishes.
275 std::unique_ptr<PeerCertificateChain> server_cert_chain_;
276 scoped_refptr<X509Certificate> server_cert_; 274 scoped_refptr<X509Certificate> server_cert_;
277 CertVerifyResult server_cert_verify_result_; 275 CertVerifyResult server_cert_verify_result_;
278 bool completed_connect_; 276 bool completed_connect_;
279 277
280 // Set when Read() or Write() successfully reads or writes data to or from the 278 // Set when Read() or Write() successfully reads or writes data to or from the
281 // network. 279 // network.
282 bool was_ever_used_; 280 bool was_ever_used_;
283 281
284 CertVerifier* const cert_verifier_; 282 CertVerifier* const cert_verifier_;
285 std::unique_ptr<CertVerifier::Request> cert_verifier_request_; 283 std::unique_ptr<CertVerifier::Request> cert_verifier_request_;
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 // True if PKP is bypassed due to a local trust anchor. 350 // True if PKP is bypassed due to a local trust anchor.
353 bool pkp_bypassed_; 351 bool pkp_bypassed_;
354 352
355 NetLogWithSource net_log_; 353 NetLogWithSource net_log_;
356 base::WeakPtrFactory<SSLClientSocketImpl> weak_factory_; 354 base::WeakPtrFactory<SSLClientSocketImpl> weak_factory_;
357 }; 355 };
358 356
359 } // namespace net 357 } // namespace net
360 358
361 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_ 359 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | net/socket/ssl_client_socket_impl.cc » ('j') | net/socket/ssl_client_socket_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698