From a3e62d3bc6e7f75949726f9a8dafe03e757e869b Mon Sep 17 00:00:00 2001 From: Dennis Brentjes Date: Sun, 30 Oct 2016 13:38:49 +0100 Subject: Added the Preprocessing step for the Precomputation of CMix. --- client/cmixclient.cpp | 24 ++++++++++++------------ client/cmixclient.hpp | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'client') 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(ke.public_key().c_str()), ke.public_key().size(), reinterpret_cast(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: { diff --git a/client/cmixclient.hpp b/client/cmixclient.hpp index 8922f41..2df754b 100644 --- a/client/cmixclient.hpp +++ b/client/cmixclient.hpp @@ -51,13 +51,13 @@ class CMixClient { Api api; KeyPair keypair; - void key_exchange(int i); + void key_exchange(size_t node_id); void initialize_connections(); - void handle_key_exchange(int node_id, cmix_proto::KeyExchange const& ke); + void handle_key_exchange(size_t node_id, cmix_proto::KeyExchange const& ke); - void handle_message(int node_id, cmix_proto::CMixMessage message); + void handle_message(size_t node_id, cmix_proto::CMixMessage message); public: /*! -- cgit v1.2.3-70-g09d2