update toxcore Merge commit '3b6bb15e867a5f3895773554b1cfa928fcfd3e8f'

This commit is contained in:
Green Sky
2025-01-18 15:53:06 +01:00
213 changed files with 2341 additions and 758 deletions

View File

@ -89,3 +89,10 @@ cc_binary(
"//c-toxcore/toxcore:mono_time",
],
)
cc_binary(
name = "decrypt_save",
testonly = 1,
srcs = ["decrypt_save.c"],
deps = ["//c-toxcore/toxencryptsave"],
)

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.
*/

View File

@ -0,0 +1,72 @@
/* SPDX-License-Identifier: GPL-3.0-or-later
* Copyright © 2025 The TokTok team.
*/
#include "../toxencryptsave/toxencryptsave.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
// ./decrypt_save <password> <encrypted input> <decrypted output>
int main(int argc, char *argv[])
{
if (argc != 4) {
printf("Usage: %s <password> <encrypted input> <decrypted output>\n", argv[0]);
return 1;
}
FILE *fp = fopen(argv[2], "rb");
if (!fp) {
printf("Could not open %s\n", argv[2]);
return 1;
}
fseek(fp, 0, SEEK_END);
size_t len = ftell(fp);
fseek(fp, 0, SEEK_SET);
uint8_t *data = (uint8_t *)malloc(len);
if (!data) {
printf("Could not allocate memory\n");
fclose(fp);
return 1;
}
if (fread(data, 1, len, fp) != len) {
printf("Could not read %s\n", argv[2]);
free(data);
fclose(fp);
return 1;
}
fclose(fp);
uint8_t *plaintext = (uint8_t *)malloc(len);
if (!plaintext) {
printf("Could not allocate memory\n");
free(data);
return 1;
}
Tox_Err_Decryption error;
if (!tox_pass_decrypt(data, len, (uint8_t *)argv[1], strlen(argv[1]), plaintext, &error)) {
printf("Could not decrypt: %s\n", tox_err_decryption_to_string(error));
free(data);
free(plaintext);
return 1;
}
fp = fopen(argv[3], "wb");
if (!fp) {
printf("Could not open %s\n", argv[3]);
free(data);
free(plaintext);
return 1;
}
if (fwrite(plaintext, 1, len - TOX_PASS_ENCRYPTION_EXTRA_LENGTH, fp) != len - TOX_PASS_ENCRYPTION_EXTRA_LENGTH) {
printf("Could not write %s\n", argv[3]);
free(data);
free(plaintext);
fclose(fp);
return 1;
}
free(data);
free(plaintext);
fclose(fp);
return 0;
}

View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-3.0-or-later
* Copyright © 2022 The TokTok team.
* Copyright © 2022-2025 The TokTok team.
*/
#ifndef C_TOXCORE_TESTING_FUZZING_FUNC_CONVERSION_H

View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-3.0-or-later
* Copyright © 2021-2022 The TokTok team.
* Copyright © 2021-2025 The TokTok team.
*/
#include "fuzz_support.hh"

View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-3.0-or-later
* Copyright © 2021-2022 The TokTok team.
* Copyright © 2021-2025 The TokTok team.
*/
#ifndef C_TOXCORE_TESTING_FUZZING_FUZZ_SUPPORT_H

View File

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-3.0-or-later
* Copyright © 2022-2024 The TokTok team.
* Copyright © 2022-2025 The TokTok team.
*/
#ifndef C_TOXCORE_TESTING_FUZZING_FUZZ_TOX_H

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.
*/