| 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_
|
| -
|
|
|