Squashed 'external/toxcore/c-toxcore/' changes from 11ab1d2a723..d9b8fa6098d
d9b8fa6098d fix: Fake broadcast address for 127.x.x.x aa649165a57 chore: Add code for future netprof TCP testing 9e5693de5ac chore: add to_string functions for netprof enums 52d915e6a90 cleanup: Heap allocate network profile objects 80fabd4a729 feat: Implement Tox network profiler 05abe083cb6 cleanup: Some random cleanups, mostly related to mem. 5cca24513b8 cleanup: Check that onion IP/Port packing worked. e092ecd1244 cleanup: Use tox memory allocator in some more places. 3cfe41c7587 fix: Avoid `memcpy`-ing structs into onion ping id data. e32ac001938 fix: Add more information on why the frame was not sent. ab887003687 fix: Allow TCP connections to fail `connect` calls. 7603170e663 refactor: Use tox memory in group connection allocations. 5bd8a85eb89 cleanup: Align internal logger with external on type of source line. e9bf524d9e1 cleanup: Add missing `#include` to sort_test.cc. d10c966b998 feat: Add `to_string` functions for toxencryptsave errors. 7bfd0dc8003 docs: Update the docs for group join functions 380dde9f2ae test: Add more logging to TCP connection constructor. 0f12f384c8c cleanup: Reduce stack frame sizes to below 4096 bytes. bc43cec0626 chore: Happy new year! fbe78f1702e cleanup: Add a `TOX_HIDE_DEPRECATED` check to hide deprecated symbols. 44d9da07e77 refactor: Use tox memory for group moderation/pack allocations. 7f26d520168 refactor: Use tox memory in group chats allocations. 2f62f3d0e77 refactor: Use tox Memory for group allocations. 8a968162041 chore: Add dispatch/events headers to bazel export. 2bbfb35abf6 docs: Output the error code string instead of int. in toxav logging d55d0e4eaef cleanup: Remove redundant code for checking if group exists 2a6dc643338 chore: Upgrade dependencies for websockify. fc0650601c1 fix: Allow peers to reconnect to group chats using a password git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: d9b8fa6098de6c074038b6664d2572627540b148
This commit is contained in:
@ -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"],
|
||||
)
|
||||
|
@ -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.
|
||||
*/
|
||||
|
||||
|
72
testing/decrypt_save.c
Normal file
72
testing/decrypt_save.c
Normal 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;
|
||||
}
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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.
|
||||
*/
|
||||
|
||||
|
Reference in New Issue
Block a user