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

Side by Side Diff: net/base/ssl_client_socket_win.h

Issue 123025: Merge 17919 - We don't handle certificate errors during SSL renegotiation.... (Closed) Base URL: svn://chrome-svn/chrome/branches/172/src/
Patch Set: Created 11 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « net/base/net_error_list.h ('k') | net/base/ssl_client_socket_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/net/base/ssl_client_socket_win.h:r17919
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_BASE_SSL_CLIENT_SOCKET_WIN_H_ 5 #ifndef NET_BASE_SSL_CLIENT_SOCKET_WIN_H_
6 #define NET_BASE_SSL_CLIENT_SOCKET_WIN_H_ 6 #define NET_BASE_SSL_CLIENT_SOCKET_WIN_H_
7 7
8 #define SECURITY_WIN32 // Needs to be defined before including security.h 8 #define SECURITY_WIN32 // Needs to be defined before including security.h
9 9
10 #include <windows.h> 10 #include <windows.h>
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 int DoVerifyCert(); 61 int DoVerifyCert();
62 int DoVerifyCertComplete(int result); 62 int DoVerifyCertComplete(int result);
63 int DoPayloadRead(); 63 int DoPayloadRead();
64 int DoPayloadReadComplete(int result); 64 int DoPayloadReadComplete(int result);
65 int DoPayloadEncrypt(); 65 int DoPayloadEncrypt();
66 int DoPayloadWrite(); 66 int DoPayloadWrite();
67 int DoPayloadWriteComplete(int result); 67 int DoPayloadWriteComplete(int result);
68 68
69 int DidCallInitializeSecurityContext(); 69 int DidCallInitializeSecurityContext();
70 int DidCompleteHandshake(); 70 int DidCompleteHandshake();
71 void DidCompleteRenegotiation(int result);
71 void LogConnectionTypeMetrics() const; 72 void LogConnectionTypeMetrics() const;
72 void SetNextStateForRead(); 73 void SetNextStateForRead();
73 void FreeSendBuffer(); 74 void FreeSendBuffer();
74 75
75 CompletionCallbackImpl<SSLClientSocketWin> io_callback_; 76 CompletionCallbackImpl<SSLClientSocketWin> io_callback_;
76 scoped_ptr<ClientSocket> transport_; 77 scoped_ptr<ClientSocket> transport_;
77 std::string hostname_; 78 std::string hostname_;
78 SSLConfig ssl_config_; 79 SSLConfig ssl_config_;
79 80
80 CompletionCallback* user_callback_; 81 CompletionCallback* user_callback_;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 // True if the user has no client certificate. 151 // True if the user has no client certificate.
151 bool no_client_cert_; 152 bool no_client_cert_;
152 153
153 // Renegotiation is in progress. 154 // Renegotiation is in progress.
154 bool renegotiating_; 155 bool renegotiating_;
155 }; 156 };
156 157
157 } // namespace net 158 } // namespace net
158 159
159 #endif // NET_BASE_SSL_CLIENT_SOCKET_WIN_H_ 160 #endif // NET_BASE_SSL_CLIENT_SOCKET_WIN_H_
OLDNEW
« no previous file with comments | « net/base/net_error_list.h ('k') | net/base/ssl_client_socket_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698