stephenseo/UDPConnection
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages 1 Wiki Activity Actions

Fixes for setting pub/sec keys

Browse source 
Added more to NetworkTest to test new changes.
This commit is contained in:
Stephen Seo 2019-11-21 15:15:05 +09:00
parent c24273ea65
commit 6b14d86822
2 changed files with 101 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/UDPConnection.cpp
View file

@ -163,7 +163,7 @@ rtt(std::chrono::steady_clock::duration::zero())
std::memcpy(this->sk, sk, crypto_sign_SECRETKEYBYTES);
std::memcpy(this->pk, pk, crypto_sign_PUBLICKEYBYTES);
} else {
crypto_sign_keypair(pk, sk);
crypto_sign_keypair(this->pk, this->sk);
}
flags.reset(5);
flags.set(6);
@ -307,6 +307,11 @@ void UDPC::Context::update_impl() {
newCon.verifyMessage = std::make_unique<char[]>(4 + timeString.size());
*((uint32_t*)newCon.verifyMessage.get()) = timeString.size();
std::memcpy(newCon.verifyMessage.get() + 4, timeString.c_str(), timeString.size());
#ifndef NDEBUG
UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_DEBUG,
"Client set up verification string \"",
timeString, "\"");
#endif
}
if(conMap.find(optE.value().conId) == conMap.end()) {
@ -387,6 +392,11 @@ void UDPC::Context::update_impl() {
newCon.verifyMessage = std::make_unique<char[]>(4 + timeString.size());
*((uint32_t*)newCon.verifyMessage.get()) = timeString.size();
std::memcpy(newCon.verifyMessage.get() + 4, timeString.c_str(), timeString.size());
#ifndef NDEBUG
UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_DEBUG,
"Client set up verification string \"",
timeString, "\"");
#endif
// set peer public key
std::memcpy(
@ -593,12 +603,15 @@ void UDPC::Context::update_impl() {
{
auto sendIter = cSendPkts.begin();
std::unordered_set<UDPC_ConnectionId, UDPC::ConnectionIdHasher> dropped;
std::unordered_set<UDPC_ConnectionId, UDPC::ConnectionIdHasher> notQueued;
while(true) {
auto next = sendIter.current();
if(next) {
if(auto iter = conMap.find(next.value().receiver);
iter != conMap.end()) {
if(iter->second.sendPkts.size() >= UDPC_QUEUED_PKTS_MAX_SIZE) {
if(notQueued.find(next.value().receiver) == notQueued.end()) {
notQueued.insert(next.value().receiver);
UDPC_CHECK_LOG(this,
UDPC_LoggingType::UDPC_DEBUG,
"Not queueing packet to ",
@ -607,6 +620,7 @@ void UDPC::Context::update_impl() {
", port = ",
next.value().receiver.port,
", connection's queue reached max size");
}
if(sendIter.next()) {
continue;
} else {
@ -686,7 +700,6 @@ void UDPC::Context::update_impl() {
buf.get() + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES + 4,
iter->second.verifyMessage.get() + 4,
*((uint32_t*)iter->second.verifyMessage.get()));
// TODO impl presetting a known pubkey of peer
#else
assert(!"libsodium is disabled, invalid state");
UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_ERROR,
@ -1165,6 +1178,7 @@ void UDPC::Context::update_impl() {
false,
sk, pk);
#endif
if(newConnection.flags.test(5)) {
UDPC_CHECK_LOG(this,
UDPC_LoggingType::UDPC_ERROR,
@ -1177,6 +1191,16 @@ void UDPC::Context::update_impl() {
}
if(pktType == 1 && flags.test(2)) {
#ifdef UDPC_LIBSODIUM_ENABLED
# ifndef NDEBUG
if(willLog(UDPC_LoggingType::UDPC_DEBUG)) {
std::string verificationString(
recvBuf + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES + 4,
ntohl(*((uint32_t*)(recvBuf + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES))));
log_impl(UDPC_LoggingType::UDPC_DEBUG,
"Server got verification string \"",
verificationString, "\"");
}
# endif
std::memcpy(
newConnection.peer_pk,
recvBuf + UDPC_MIN_HEADER_SIZE + 4,
@ -1186,7 +1210,8 @@ void UDPC::Context::update_impl() {
(unsigned char*)newConnection.verifyMessage.get(),
nullptr,
(unsigned char*)(recvBuf + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES + 4),
ntohl(*((uint32_t*)(recvBuf + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES))), newConnection.sk);
ntohl(*((uint32_t*)(recvBuf + UDPC_MIN_HEADER_SIZE + 4 + crypto_sign_PUBLICKEYBYTES))),
newConnection.sk);
#else
assert(!"libsodium disabled, invalid state");
UDPC_CHECK_LOG(this, UDPC_LoggingType::UDPC_ERROR,

65
src/test/UDPC_NetworkTest.c
View file

@ -3,6 +3,10 @@
#include <stdio.h>
#include <threads.h>
#ifdef UDPC_LIBSODIUM_ENABLED
#include <sodium.h>
#endif
#include <UDPConnection.h>
#define QUEUED_MAX_SIZE 32
@ -19,6 +23,8 @@ void usage() {
puts("-l (silent|error|warning|info|verbose|debug) - log level, default debug");
puts("-e - enable receiving events");
puts("-ls - enable libsodium");
puts("-ck <pubkey_file> - connect to server expecting this public key");
puts("-sk <pubkey> <seckey> - start with pub/sec key pair");
}
void sleep_seconds(unsigned int seconds) {
@ -45,6 +51,10 @@ int main(int argc, char **argv) {
UDPC_LoggingType logLevel = UDPC_DEBUG;
int isReceivingEvents = 0;
int isLibSodiumEnabled = 0;
const char *pubkey_file = NULL;
const char *seckey_file = NULL;
unsigned char pubkey[crypto_sign_PUBLICKEYBYTES];
unsigned char seckey[crypto_sign_SECRETKEYBYTES];
while(argc > 0) {
if(strcmp(argv[0], "-c") == 0) {
isClient = 1;
@ -95,6 +105,14 @@ int main(int argc, char **argv) {
} else if(strcmp(argv[0], "-ls") == 0) {
isLibSodiumEnabled = 1;
puts("Enabled libsodium");
} else if(strcmp(argv[0], "-ck") == 0 && argc > 1) {
--argc; ++argv;
pubkey_file = argv[0];
} else if(strcmp(argv[0], "-sk") == 0 && argc > 2) {
--argc; ++argv;
pubkey_file = argv[0];
--argc; ++argv;
seckey_file = argv[0];
} else {
printf("ERROR: invalid argument \"%s\"\n", argv[0]);
usage();
@ -106,6 +124,39 @@ int main(int argc, char **argv) {
if(isLibSodiumEnabled == 0) {
puts("Disabled libsodium");
} else {
if(pubkey_file) {
FILE *pubkey_f = fopen(pubkey_file, "r");
if(!pubkey_f) {
printf("ERROR: Failed to open pubkey_file \"%s\"\n", pubkey_file);
return 1;
}
size_t count = fread(pubkey, 1, crypto_sign_PUBLICKEYBYTES, pubkey_f);
if(count != crypto_sign_PUBLICKEYBYTES) {
fclose(pubkey_f);
printf("ERROR: Failed to read pubkey_file \"%s\"\n", pubkey_file);
return 1;
}
fclose(pubkey_f);
if(seckey_file) {
FILE *seckey_f = fopen(seckey_file, "r");
if(!seckey_f) {
printf("ERROR: Failed to open seckey_file \"%s\"\n", seckey_file);
return 1;
}
count = fread(seckey, 1, crypto_sign_SECRETKEYBYTES, seckey_f);
if(count != crypto_sign_SECRETKEYBYTES) {
fclose(seckey_f);
printf("ERROR: Failed to read seckey_file \"%s\"\n", seckey_file);
return 1;
}
fclose(seckey_f);
}
} else if(seckey_file) {
printf("ERROR: Invalid state (seckey_file defined but not pubkey_file)\n");
return 1;
}
}
if(!listenAddr) {
@ -132,13 +183,21 @@ int main(int argc, char **argv) {
if(isClient) {
connectionId = UDPC_create_id_easy(connectionAddr, atoi(connectionPort));
}
UDPC_HContext context = UDPC_init_threaded_update(listenId, isClient, isLibSodiumEnabled);
UDPC_HContext context = UDPC_init(listenId, isClient, isLibSodiumEnabled);
if(!context) {
puts("ERROR: context is NULL");
return 1;
}
UDPC_set_logging_type(context, logLevel);
UDPC_set_receiving_events(context, isReceivingEvents);
if(!isClient && pubkey_file && seckey_file) {
UDPC_set_libsodium_keys(context, seckey, pubkey);
puts("Set pubkey/seckey for server");
}
UDPC_enable_threaded_update(context);
unsigned int tick = 0;
unsigned int temp = 0;
unsigned int temp2, temp3;
@ -151,8 +210,12 @@ int main(int argc, char **argv) {
while(1) {
sleep_seconds(1);
if(isClient && UDPC_has_connection(context, connectionId) == 0) {
if(isLibSodiumEnabled && pubkey_file) {
UDPC_client_initiate_connection_pk(context, connectionId, pubkey);
} else {
UDPC_client_initiate_connection(context, connectionId, isLibSodiumEnabled);
}
}
if(!noPayload) {
list = UDPC_get_list_connected(context, &temp);
if(list) {