diff options
| author | lloyd <[email protected]> | 2012-09-09 21:02:52 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-09-09 21:02:52 +0000 |
| commit | 80c422df7eef20884b04adb5f0f24554622847b3 (patch) | |
| tree | 7d9ac3a9937ea1dbaa9dccf2090aa02419ffda8c | |
| parent | 580cc0149ca3f49a9e3d093847930633365815a8 (diff) | |
Rename function
| -rw-r--r-- | src/tls/tls_client.cpp | 20 | ||||
| -rw-r--r-- | src/tls/tls_client.h | 12 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/tls/tls_client.cpp b/src/tls/tls_client.cpp index a55b35eba..33e50fd84 100644 --- a/src/tls/tls_client.cpp +++ b/src/tls/tls_client.cpp @@ -68,7 +68,7 @@ Client::Client(std::function<void (const byte[], size_t)> output_fn, const Protocol_Version version = m_policy.pref_version(); Handshake_State& state = create_handshake_state(version); - initiate_handshake(state, false, version, srp_identifier, next_protocol); + send_client_hello(state, false, version, srp_identifier, next_protocol); } Handshake_State* Client::new_handshake_state(Handshake_IO* io) @@ -90,21 +90,21 @@ Client::get_peer_cert_chain(const Handshake_State& state) const void Client::initiate_handshake(Handshake_State& state, bool force_full_renegotiation) { - initiate_handshake(state, - force_full_renegotiation, - state.version()); + send_client_hello(state, + force_full_renegotiation, + state.version()); } -void Client::initiate_handshake(Handshake_State& state_base, - bool force_full_renegotiation, - Protocol_Version version, - const std::string& srp_identifier, - std::function<std::string (std::vector<std::string>)> next_protocol) +void Client::send_client_hello(Handshake_State& state_base, + bool force_full_renegotiation, + Protocol_Version version, + const std::string& srp_identifier, + std::function<std::string (std::vector<std::string>)> next_protocol) { Client_Handshake_State& state = dynamic_cast<Client_Handshake_State&>(state_base); if(state.version().is_datagram_protocol()) - state.set_expected_next(HELLO_VERIFY_REQUEST); + state.set_expected_next(HELLO_VERIFY_REQUEST); // optional state.set_expected_next(SERVER_HELLO); state.client_npn_cb = next_protocol; diff --git a/src/tls/tls_client.h b/src/tls/tls_client.h index a2b32cadd..d7f17f878 100644 --- a/src/tls/tls_client.h +++ b/src/tls/tls_client.h @@ -72,12 +72,12 @@ class BOTAN_DLL Client : public Channel void initiate_handshake(Handshake_State& state, bool force_full_renegotiation) override; - void initiate_handshake(Handshake_State& state, - bool force_full_renegotiation, - Protocol_Version version, - const std::string& srp_identifier = "", - std::function<std::string (std::vector<std::string>)> next_protocol = - std::function<std::string (std::vector<std::string>)>()); + void send_client_hello(Handshake_State& state, + bool force_full_renegotiation, + Protocol_Version version, + const std::string& srp_identifier = "", + std::function<std::string (std::vector<std::string>)> next_protocol = + std::function<std::string (std::vector<std::string>)>()); void process_handshake_msg(const Handshake_State* active_state, Handshake_State& pending_state, |