ENGO150/WHY2
Template
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

saving shared client-server key
Some checks failed
Codacy Scan / Codacy Security Scan (push) Successful in 38s
Details
Test Project / test-project (./configure.sh, gdb -ex "run" -ex "quit" --batch, ubuntu-latest, ./test) (push) Failing after 2m4s
Details
Build WHY2-chat / test-why2 (./out/why2-chat-client, ./configure.sh, ubuntu-latest, ./out/why2-chat-server) (push) Failing after 2m10s
Details
Test WHY2-logger / test-why2 (why2-logger, ./configure.sh, gdb -ex "run" -ex "quit" --batch, ubuntu-latest, ./out/why2-logger-test, valgrind --leak-check=full --show-leak-kinds=reachable --track-origins=yes -s) (push) Failing after 2m26s
Details
Test WHY2-core / test-why2 (why2, ./configure.sh, gdb -ex "run" -ex "quit" --batch, ubuntu-latest, ./out/why2-core-test, valgrind --leak-check=full --show-leak-kinds=reachable --track-origins=yes -s) (push) Failing after 2m29s
Details

Browse Source
This commit is contained in:
Václav Šmejkal 2025-02-01 22:13:32 +01:00
parent 7b2f55e3ae
commit 35ec44ae68
Signed by: ENGO150
GPG Key ID: 4A57E86482968843
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/chat/misc.c
View File

@ -528,13 +528,16 @@ why2_bool perform_key_exchange_client(int connection)
server_pubkey = get_string_from_json_string(read, "message"); server_pubkey = get_string_from_json_string(read, "message");
why2_chat_set_client_server_key( why2_chat_ecc_shared_key(server_pubkey)); //CALCULATE SHARED KEY
//DEALLOCATION //DEALLOCATION
why2_deallocate(read); why2_deallocate(read);
why2_deallocate(server_pubkey);
return 0; return 0;
} }
why2_bool perform_key_exchange_server(int connection) why2_bool perform_key_exchange_server(int connection, char **key)
{ {
//VARIABLES //VARIABLES
char *server_pubkey; char *server_pubkey;
@ -563,8 +566,11 @@ why2_bool perform_key_exchange_server(int connection)
server_pubkey = why2_chat_ecc_serialize_public_key(); server_pubkey = why2_chat_ecc_serialize_public_key();
why2_send_socket_code(server_pubkey, NULL, connection, WHY2_CHAT_CODE_SERVER_CLIENT_KEY_EXCHANGE); why2_send_socket_code(server_pubkey, NULL, connection, WHY2_CHAT_CODE_SERVER_CLIENT_KEY_EXCHANGE);
*key = why2_chat_ecc_shared_key(client_pubkey);
//DEALLOCATION //DEALLOCATION
why2_deallocate(server_pubkey); why2_deallocate(server_pubkey);
why2_deallocate(client_pubkey);
why2_deallocate(read); why2_deallocate(read);
return 0; return 0;
@ -584,9 +590,10 @@ void why2_send_socket_code(char *params, char *username, int socket, char *code)
void *why2_communicate_thread(void *arg) void *why2_communicate_thread(void *arg)
{ {
int connection = *(int*) arg; int connection = *(int*) arg;
char *client_server_key = NULL;
//PERFORM KEY EXCHANGE //PERFORM KEY EXCHANGE
if (perform_key_exchange_server(connection)) if (perform_key_exchange_server(connection, &client_server_key))
{ {
close(connection); close(connection);
return NULL; return NULL;
@ -785,7 +792,7 @@ void *why2_communicate_thread(void *arg)
pthread_self(), pthread_self(),
why2_strdup(username), why2_strdup(username),
get_latest_id(), get_latest_id(),
why2_generate_key(why2_get_key_length()) client_server_key
}; };
why2_list_push(&connection_list, &node, sizeof(node)); //ADD TO LIST why2_list_push(&connection_list, &node, sizeof(node)); //ADD TO LIST