TeaSpeak/TeaSpeakLibrary
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some extra stuff

Browse Source
This commit is contained in:
WolverinDEV 2020-02-03 22:19:21 +01:00
parent 611aee7495
commit 3f57ad4678
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -200,6 +200,8 @@ endif ()
add_library(TeaSpeak STATIC ${SOURCE_FILES} ${HEADER_FILES}) add_library(TeaSpeak STATIC ${SOURCE_FILES} ${HEADER_FILES})
target_link_libraries(TeaSpeak PUBLIC threadpool::static jsoncpp_lib) target_link_libraries(TeaSpeak PUBLIC threadpool::static jsoncpp_lib)
target_compile_options(TeaSpeak PRIVATE "-Wall")
if (TEASPEAK_SERVER) if (TEASPEAK_SERVER)
target_link_libraries(TeaSpeak PUBLIC CXXTerminal::static) target_link_libraries(TeaSpeak PUBLIC CXXTerminal::static)
endif () endif ()

4
src/protocol/CryptHandler.cpp
View File

@ -296,6 +296,8 @@ bool CryptHandler::encrypt(
uint8_t tmp_buffer[tmp_buffer_size]; uint8_t tmp_buffer[tmp_buffer_size];
size_t tag_length{8}; size_t tag_length{8};
uint8_t tag_buffer[16]; uint8_t tag_buffer[16];
static_assert(sizeof(unsigned long) <= sizeof(tag_length));
auto err = eax_encrypt_authenticate_memory(find_cipher("rijndael"), auto err = eax_encrypt_authenticate_memory(find_cipher("rijndael"),
(uint8_t *) key.data(), /* the key */ (uint8_t *) key.data(), /* the key */
(unsigned long) key.size(), /* key is 16 bytes */ (unsigned long) key.size(), /* key is 16 bytes */
@ -309,7 +311,7 @@ bool CryptHandler::encrypt(
(uint8_t *) tag_buffer, (uint8_t *) tag_buffer,
(unsigned long *) &tag_length (unsigned long *) &tag_length
); );
//assert(tag_length == 8); assert(tag_length <= 16);
if(err != CRYPT_OK) { if(err != CRYPT_OK) {
error = "encrypt returned " + std::string{error_to_string(err)}; error = "encrypt returned " + std::string{error_to_string(err)};