Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

update toxcore Merge commit '3b6bb15e867a5f3895773554b1cfa928fcfd3e8f'

Browse Source
This commit is contained in:
Green Sky
2025-01-18 15:53:06 +01:00
parent 5d779bb36c 3b6bb15e86
commit a61e84dfa4
213 changed files with 2341 additions and 758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
external/toxcore/c-toxcore/toxencryptsave/defines.h vendored
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-3.0-or-later
* Copyright © 2016-2021 The TokTok team.
* Copyright © 2016-2025 The TokTok team.
* Copyright © 2013 Tox project.
*/

62
external/toxcore/c-toxcore/toxencryptsave/toxencryptsave.c vendored
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-3.0-or-later
* Copyright © 2016-2018 The TokTok team.
* Copyright © 2016-2025 The TokTok team.
* Copyright © 2013 Tox project.
*/
@ -395,3 +395,63 @@ bool tox_is_data_encrypted(const uint8_t data[TOX_PASS_ENCRYPTION_EXTRA_LENGTH])
{
return memcmp(data, TOX_ENC_SAVE_MAGIC_NUMBER, TOX_ENC_SAVE_MAGIC_LENGTH) == 0;
}
const char *tox_err_key_derivation_to_string(Tox_Err_Key_Derivation error)
{
switch (error) {
case TOX_ERR_KEY_DERIVATION_OK:
return "TOX_ERR_KEY_DERIVATION_OK";
case TOX_ERR_KEY_DERIVATION_NULL:
return "TOX_ERR_KEY_DERIVATION_NULL";
case TOX_ERR_KEY_DERIVATION_FAILED:
return "TOX_ERR_KEY_DERIVATION_FAILED";
}
return "<invalid Tox_Err_Key_Derivation>";
}
const char *tox_err_encryption_to_string(Tox_Err_Encryption error)
{
switch (error) {
case TOX_ERR_ENCRYPTION_OK:
return "TOX_ERR_ENCRYPTION_OK";
case TOX_ERR_ENCRYPTION_NULL:
return "TOX_ERR_ENCRYPTION_NULL";
case TOX_ERR_ENCRYPTION_KEY_DERIVATION_FAILED:
return "TOX_ERR_ENCRYPTION_KEY_DERIVATION_FAILED";
case TOX_ERR_ENCRYPTION_FAILED:
return "TOX_ERR_ENCRYPTION_FAILED";
}
return "<invalid Tox_Err_Encryption>";
}
const char *tox_err_decryption_to_string(Tox_Err_Decryption error)
{
switch (error) {
case TOX_ERR_DECRYPTION_OK:
return "TOX_ERR_DECRYPTION_OK";
case TOX_ERR_DECRYPTION_NULL:
return "TOX_ERR_DECRYPTION_NULL";
case TOX_ERR_DECRYPTION_INVALID_LENGTH:
return "TOX_ERR_DECRYPTION_INVALID_LENGTH";
case TOX_ERR_DECRYPTION_BAD_FORMAT:
return "TOX_ERR_DECRYPTION_BAD_FORMAT";
case TOX_ERR_DECRYPTION_KEY_DERIVATION_FAILED:
return "TOX_ERR_DECRYPTION_KEY_DERIVATION_FAILED";
case TOX_ERR_DECRYPTION_FAILED:
return "TOX_ERR_DECRYPTION_FAILED";
}
return "<invalid Tox_Err_Decryption>";
}
const char *tox_err_get_salt_to_string(Tox_Err_Get_Salt error)
{
switch (error) {
case TOX_ERR_GET_SALT_OK:
return "TOX_ERR_GET_SALT_OK";
case TOX_ERR_GET_SALT_NULL:
return "TOX_ERR_GET_SALT_NULL";
case TOX_ERR_GET_SALT_BAD_FORMAT:
return "TOX_ERR_GET_SALT_BAD_FORMAT";
}
return "<invalid Tox_Err_Get_Salt>";
}

10
external/toxcore/c-toxcore/toxencryptsave/toxencryptsave.h vendored
View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-3.0-or-later
* Copyright © 2016-2024 The TokTok team.
* Copyright © 2016-2025 The TokTok team.
* Copyright © 2013-2016 Tox Developers.
*/
@ -88,6 +88,8 @@ typedef enum Tox_Err_Key_Derivation {
} Tox_Err_Key_Derivation;
const char *tox_err_key_derivation_to_string(Tox_Err_Key_Derivation error);
typedef enum Tox_Err_Encryption {
/**
@ -114,6 +116,8 @@ typedef enum Tox_Err_Encryption {
} Tox_Err_Encryption;
const char *tox_err_encryption_to_string(Tox_Err_Encryption error);
typedef enum Tox_Err_Decryption {
/**
@ -152,6 +156,8 @@ typedef enum Tox_Err_Decryption {
} Tox_Err_Decryption;
const char *tox_err_decryption_to_string(Tox_Err_Decryption error);
/*******************************************************************************
*
* BEGIN PART 1
@ -313,6 +319,8 @@ typedef enum Tox_Err_Get_Salt {
} Tox_Err_Get_Salt;
const char *tox_err_get_salt_to_string(Tox_Err_Get_Salt error);
/**
* Retrieves the salt used to encrypt the given data.
*