mirror of
https://github.com/irungentoo/toxcore.git
synced 2024-03-22 13:30:51 +08:00
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
This commit is contained in:
commit
173101624c
|
@ -34,7 +34,7 @@ else()
|
|||
|
||||
include_directories(${SODIUM_INCLUDE_DIR})
|
||||
|
||||
set(LINK_CRYPTO_LIBRARY ${SODIUM_LIBRARY})
|
||||
set(LINK_CRYPTO_LIBRARY ${SODIUM_LIBRARIES})
|
||||
endif()
|
||||
|
||||
#MinGW prints more warnings for -Wall than gcc does, thus causing build to fail
|
||||
|
|
|
@ -54,8 +54,8 @@ endif()
|
|||
|
||||
find_library(SODIUM_LIBRARY
|
||||
NAMES
|
||||
${WIN32_LIBSODIUM_FILENAME}
|
||||
sodium
|
||||
${WIN32_LIBSODIUM_FILENAME}
|
||||
PATHS
|
||||
${SODIUM_ROOT_DIR}/lib
|
||||
)
|
||||
|
|
|
@ -33,7 +33,7 @@ uint8_t self_public_key[crypto_box_PUBLICKEYBYTES];
|
|||
return the number of peers it was routed through if it did not send it directly.*/
|
||||
int send_friendrequest(uint8_t * public_key, uint32_t nospam_num, uint8_t * data, uint32_t length)
|
||||
{
|
||||
if(length - sizeof(nospam_num) > MAX_DATA_SIZE)
|
||||
if(length + sizeof(nospam_num) > MAX_DATA_SIZE)
|
||||
return -1;
|
||||
|
||||
uint8_t temp[MAX_DATA_SIZE];
|
||||
|
|
Loading…
Reference in New Issue
Block a user