aboutsummaryrefslogtreecommitdiff
path: root/client/cmixclient.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'client/cmixclient.cpp')
-rw-r--r--client/cmixclient.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/client/cmixclient.cpp b/client/cmixclient.cpp
index cc743db..f05b200 100644
--- a/client/cmixclient.cpp
+++ b/client/cmixclient.cpp
@@ -6,31 +6,31 @@
using namespace boost::asio::ip;
using namespace boost::asio;
-void CMixClient::key_exchange(int i) {
- BOOST_LOG_TRIVIAL(trace) << "Sending KeyExchange for node: " << i;
+void CMixClient::key_exchange(size_t node_id) {
+ BOOST_LOG_TRIVIAL(trace) << "Sending KeyExchange for node: " << node_id;
- char* buffer;
+ unsigned char* buffer;
size_t len;
- api.get_key_array(&buffer, &len, keypair.pub);
+ api.element_to_array(&buffer, &len, keypair.pub);
cmix_proto::KeyExchange ke;
ke.set_public_key(buffer, len);
free(buffer);
- data.at(i).secret_value = api.get_group_element(true);
- void* shared_value = api.get_key_exchange_value(data.at(i).secret_value);
+ data.at(node_id).secret_value = api.get_group_element(true);
+ void* shared_value = api.get_key_exchange_value(data.at(node_id).secret_value);
- api.get_key_array(&buffer, &len, shared_value);
+ api.element_to_array(&buffer, &len, shared_value);
ke.set_value(buffer, len);
free(buffer);
- network_connections.at(i).async_send(ke);
- network_connections.at(i).async_receive([i, this](cmix_proto::CMixMessage message) {
- handle_message(i, message);
+ network_connections.at(node_id).async_send(ke);
+ network_connections.at(node_id).async_receive([node_id, this](cmix_proto::CMixMessage message) {
+ handle_message(node_id, message);
});
}
@@ -55,7 +55,7 @@ void CMixClient::initialize_connections() {
}
}
-void CMixClient::handle_key_exchange(int node_id, cmix_proto::KeyExchange const& ke)
+void CMixClient::handle_key_exchange(size_t node_id, cmix_proto::KeyExchange const& ke)
{
data.at(node_id).shared_value = api.derive_shared_key(keypair, reinterpret_cast<uint8_t const*>(ke.public_key().c_str()), ke.public_key().size(), reinterpret_cast<uint8_t const*>(ke.value().c_str()), ke.value().size(), data.at(node_id).secret_value, false);
@@ -63,7 +63,7 @@ void CMixClient::handle_key_exchange(int node_id, cmix_proto::KeyExchange const&
network_connections.at(node_id).async_send(bye);
}
-void CMixClient::handle_message(int node_id, cmix_proto::CMixMessage message)
+void CMixClient::handle_message(size_t node_id, cmix_proto::CMixMessage message)
{
switch(message.contents_case()) {
case cmix_proto::CMixMessage::ContentsCase::kKeyexchange: {