enabled more warnings
This commit is contained in:
parent
b662a85348
commit
083b247329
2
dependencies/tlibc
vendored
2
dependencies/tlibc
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 2c8e6fc601a868851d8ce50f77b391e6a9b7e656
|
Subproject commit 4cc226b57af3691b9c6062499ce0a18755047c59
|
||||||
@ -6,8 +6,17 @@ CMP_C="gcc"
|
|||||||
CMP_CPP="g++"
|
CMP_CPP="g++"
|
||||||
STD_C="c99"
|
STD_C="c99"
|
||||||
STD_CPP="c++11"
|
STD_CPP="c++11"
|
||||||
WARN_C="-Wall -Wextra -Werror=return-type -Werror=pointer-arith -Wno-unused-parameter"
|
WARN_C="-Wall -Wextra
|
||||||
WARN_CPP="-Wall -Wextra -Werror=return-type -Werror=pointer-arith -Wno-unused-parameter"
|
-Wduplicated-branches
|
||||||
|
-Wduplicated-cond
|
||||||
|
-Wformat=2
|
||||||
|
-Wmissing-include-dirs
|
||||||
|
-Wshadow
|
||||||
|
-Werror=return-type
|
||||||
|
-Werror=pointer-arith
|
||||||
|
-Werror=init-self
|
||||||
|
-Werror=incompatible-pointer-types"
|
||||||
|
WARN_CPP="$WARN_C"
|
||||||
SRC_C="$(find src -name '*.c')"
|
SRC_C="$(find src -name '*.c')"
|
||||||
#SRC_CPP="$(find src -name '*.cpp')"
|
#SRC_CPP="$(find src -name '*.cpp')"
|
||||||
|
|
||||||
|
|||||||
@ -29,12 +29,12 @@ Result(void) ClientCredentials_tryConstruct(ClientCredentials* cred,
|
|||||||
|
|
||||||
// lvl 1 hash - is used as AES key for user data
|
// lvl 1 hash - is used as AES key for user data
|
||||||
cred->user_data_key = Array_alloc(u8, PASSWORD_HASH_SIZE);
|
cred->user_data_key = Array_alloc(u8, PASSWORD_HASH_SIZE);
|
||||||
hash_password(List_castTo_Array(data_to_hash), cred->user_data_key.data, __PASSWORD_HASH_LVL_ROUNDS);
|
hash_password(List_castTo_Array(data_to_hash), cred->user_data_key.data, PASSWORD_HASH_LVL_ROUNDS);
|
||||||
// concat lvl 1 hash to data_to_hash
|
// concat lvl 1 hash to data_to_hash
|
||||||
List_push_size(&data_to_hash, cred->user_data_key.data, cred->user_data_key.size);
|
List_push_size(&data_to_hash, cred->user_data_key.data, cred->user_data_key.size);
|
||||||
// lvl 2 hash - is used for authentification
|
// lvl 2 hash - is used for authentification
|
||||||
cred->token = Array_alloc(u8, PASSWORD_HASH_SIZE);
|
cred->token = Array_alloc(u8, PASSWORD_HASH_SIZE);
|
||||||
hash_password(List_castTo_Array(data_to_hash), cred->token.data, __PASSWORD_HASH_LVL_ROUNDS);
|
hash_password(List_castTo_Array(data_to_hash), cred->token.data, PASSWORD_HASH_LVL_ROUNDS);
|
||||||
|
|
||||||
AESBlockEncryptor_construct(&cred->user_data_aes_enc, cred->user_data_key, AESBlockEncryptor_DEFAULT_CLASS);
|
AESBlockEncryptor_construct(&cred->user_data_aes_enc, cred->user_data_key, AESBlockEncryptor_DEFAULT_CLASS);
|
||||||
AESBlockDecryptor_construct(&cred->user_data_aes_dec, cred->user_data_key, AESBlockDecryptor_DEFAULT_CLASS);
|
AESBlockDecryptor_construct(&cred->user_data_aes_dec, cred->user_data_key, AESBlockDecryptor_DEFAULT_CLASS);
|
||||||
|
|||||||
@ -41,7 +41,7 @@ Result(void) ServerLink_parse(cstr server_link_cstr, EndpointIPv4* server_end_ou
|
|||||||
Return RESULT_VOID;
|
Return RESULT_VOID;
|
||||||
}
|
}
|
||||||
|
|
||||||
Result(ServerConnection*) ServerConnection_open(ClientCredentials* client_credentials, cstr server_link_cstr){
|
Result(ServerConnection*) ServerConnection_open(cstr server_link_cstr){
|
||||||
Deferral(16);
|
Deferral(16);
|
||||||
|
|
||||||
ServerConnection* conn = (ServerConnection*)malloc(sizeof(ServerConnection));
|
ServerConnection* conn = (ServerConnection*)malloc(sizeof(ServerConnection));
|
||||||
|
|||||||
@ -25,6 +25,8 @@ Result(void) Client_createFromConfig(cstr config_path){
|
|||||||
bool success = false;
|
bool success = false;
|
||||||
Defer(if(!success) Client_free(client));
|
Defer(if(!success) Client_free(client));
|
||||||
|
|
||||||
|
(void)config_path;
|
||||||
|
|
||||||
success = true;
|
success = true;
|
||||||
Return RESULT_VALUE(p, client);
|
Return RESULT_VALUE(p, client);
|
||||||
}
|
}
|
||||||
@ -152,7 +154,7 @@ static Result(void) commandExec(Client* client, str command, bool* stop){
|
|||||||
|
|
||||||
printf("connecting to server...\n");
|
printf("connecting to server...\n");
|
||||||
try(client->server_connection, p,
|
try(client->server_connection, p,
|
||||||
ServerConnection_open(&client->cred, new_server_link.data));
|
ServerConnection_open(new_server_link.data));
|
||||||
printf("connection established\n");
|
printf("connection established\n");
|
||||||
|
|
||||||
// TODO: request server info
|
// TODO: request server info
|
||||||
|
|||||||
@ -28,8 +28,7 @@ typedef struct ServerConnection {
|
|||||||
EncryptedSocketTCP sock;
|
EncryptedSocketTCP sock;
|
||||||
} ServerConnection;
|
} ServerConnection;
|
||||||
|
|
||||||
Result(ServerConnection*) ServerConnection_open(ClientCredentials* client_credentials,
|
Result(ServerConnection*) ServerConnection_open(cstr server_link_cstr);
|
||||||
cstr server_link_cstr);
|
|
||||||
|
|
||||||
void ServerConnection_close(ServerConnection* conn);
|
void ServerConnection_close(ServerConnection* conn);
|
||||||
|
|
||||||
|
|||||||
@ -4,6 +4,8 @@ Result(char*) __sendErrorMessage(ClientConnection* conn, PacketHeader* req_head,
|
|||||||
u32 msg_buf_size, cstr format, va_list argv)
|
u32 msg_buf_size, cstr format, va_list argv)
|
||||||
{
|
{
|
||||||
Deferral(4);
|
Deferral(4);
|
||||||
|
(void)req_head;
|
||||||
|
|
||||||
//TODO: limit ErrorMessage size to fit into EncryptedSocketTCP.internal_buffer_size
|
//TODO: limit ErrorMessage size to fit into EncryptedSocketTCP.internal_buffer_size
|
||||||
Array(u8) err_buf = Array_alloc(u8, msg_buf_size);
|
Array(u8) err_buf = Array_alloc(u8, msg_buf_size);
|
||||||
bool err_complete = false;
|
bool err_complete = false;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user