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

Unified Diff: net/base/ssl_client_socket_win.h

Issue 42526: Backport r12229 from the trunk.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/branches/169/src/
Patch Set: Upload before checkin Created 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/base/ssl_client_socket_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/ssl_client_socket_win.h
===================================================================
--- net/base/ssl_client_socket_win.h (revision 12304)
+++ net/base/ssl_client_socket_win.h (working copy)
@@ -67,8 +67,11 @@
int DoPayloadWrite();
int DoPayloadWriteComplete(int result);
+ int DidCallInitializeSecurityContext();
int DidCompleteHandshake();
void LogConnectionTypeMetrics() const;
+ void SetNextStateForRead();
+ void FreeSendBuffer();
CompletionCallbackImpl<SSLClientSocketWin> io_callback_;
scoped_ptr<ClientSocket> transport_;
@@ -106,7 +109,9 @@
CredHandle* creds_;
CtxtHandle ctxt_;
- SecBuffer send_buffer_;
+ SecBuffer in_buffers_[2]; // Input buffers for InitializeSecurityContext.
+ SecBuffer send_buffer_; // Output buffer for InitializeSecurityContext.
+ SECURITY_STATUS isc_status_; // Return value of InitializeSecurityContext.
scoped_array<char> payload_send_buffer_;
int payload_send_buffer_len_;
int bytes_sent_;
@@ -124,8 +129,13 @@
char* received_ptr_; // Points to the received ciphertext in recv_buffer_
int bytes_received_; // The number of bytes of received ciphertext.
+ // True if we're writing the first token (handshake message) to the server,
+ // false if we're writing a subsequent token. After we have written a token
+ // successfully, DoHandshakeWriteComplete checks this member to set the next
+ // state.
+ bool writing_first_token_;
+
bool completed_handshake_;
- bool complete_handshake_on_write_complete_;
// Only used in the STATE_HANDSHAKE_READ_COMPLETE and
// STATE_PAYLOAD_READ_COMPLETE states. True if a 'result' argument of OK
@@ -140,9 +150,11 @@
// True if the user has no client certificate.
bool no_client_cert_;
+
+ // Renegotiation is in progress.
+ bool renegotiating_;
};
} // namespace net
#endif // NET_BASE_SSL_CLIENT_SOCKET_WIN_H_
-
« no previous file with comments | « no previous file | net/base/ssl_client_socket_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698