forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from d9b8fa6098d..81b1e4f6348
81b1e4f6348 chore: Release v0.2.21-rc.1 9303e2e49a1 chore: Update the pkgsrc versions in the update-versions tool 71ec4b3b1e9 chore: Update the version-sync script to work in a post-tox.api.h world 66da842f753 chore: Add version update script compatible with ci-tools. 199878f7660 chore: Use new bazel script for circle ci. 8278e9cda46 chore: Add release issue template and workflow. a9bb3a1c4d1 chore: Fix alpine-s390x build. 6e0a641272e chore: Add a source tarball deploy workflow. 4adebe4d8b1 chore: Don't upload ios/macos variants in deploy workflows. 18f1d858ccb chore: Move one of the 3 freebsd builds to post-submit. 432ab60c002 feat: Add a Makefile for the single file deploy build. a86c0011fd5 chore: Add deploy job for single C file library. 2e7495e8f2a docs: Update changelog format to use the new clog-compatible way. a682da99e84 chore: Export wasmExports from the wasm binary. 12f34cdff27 chore: Add wasm to the nightly binary deploys. 1451029613f chore: Add strict-abi support for macOS/iOS. c53c30e09d9 chore: Add time option to manual fuzz trigger. 2ccecdc2a1a chore: Add remaining fuzz tests to cflite. 4626c2e230e test: Add a Net_Crypto fuzz test. b4a0e617c48 refactor: Use IP string length from ip_ntoa instead of strlen. b85b91f22f6 cleanup: rename getnodes/sendnodes to nodes request/response This change alignes the naming to be closer to the spec and make it less ambiguous. This change also changes the naming of some private/experimental marked APIs. - tox_callback_dht_nodes_response() - tox_dht_nodes_request() - Tox_Event_Dht_Get_Nodes_Response f1991aaa029 perf: Use stack allocation for strerror rendering. 3984211ccbf cleanup: remove kicked peers from saved peers list 26a991ed2be fix: ip to string function not accepting tcp families 712861f2e6d cleanup: Make websockify output qtox-compatible logging. 01932ea2f73 chore: Add opus and vpx to the toxcore wasm build. d29c42ef631 refactor: don't fully discard received DHT nodes. This is mostly forward thinking, where we might introduce other ip families, in addition to ipv4, ipv6, tcp_ipv4 etc. 21e2325934f chore: Fix xcframework tarball creation. b10c8b766ba chore: Fix xcframework checksum creation. 93787a9322e chore: Add ios/macos framework build. 9f723f891d3 fix: run do_gca also in bootstrap nodes 496cc703556 chore: Support arm64 iphone simulator. aa0e2a8e928 chore: Add support for more iOS architectures. 13ad8e81cbf chore: Add binary deploy workflows. c8344726378 refactor: Move tox_log_level out into its own file. 8799bea76c3 cleanup: Mark events/dispatch headers as experimental. d4164edb548 refactor: Remove tox_types.h; use `struct` tags instead. d408c982090 refactor: Move `Tox_Options` to `tox_options.h`. 5ab42d41209 chore: Move most cirrus jobs to circleci. 463eeae1144 cleanup: Avoid clashing with global define `DEBUG`. 92cc1e91747 refactor: Make Tox_Options own the passed proxy host and savedata. f276b397226 test: Add some more asserts for I/O and alloc to succeed. edb4dfc4869 fix: Don't crash on malloc failures in bin_unpack. be457d5d0b2 cleanup: Use tox memory for bin_unpack and net_strerror. git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 81b1e4f6348124784088591c4fe9ab41e273031d
This commit is contained in:
@ -13,11 +13,13 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "../testing/misc_tools.h"
|
||||
#include "../toxcore/ccompat.h"
|
||||
#include "../toxcore/tox.h"
|
||||
#include "auto_test_support.h"
|
||||
#include "check_compat.h"
|
||||
|
||||
#include "../toxcore/ccompat.h"
|
||||
#include "../toxcore/tox.h"
|
||||
#include "../toxencryptsave/toxencryptsave.h"
|
||||
|
||||
static const char *pphrase = "bar";
|
||||
@ -27,21 +29,26 @@ static const char *savefile = "./save";
|
||||
static void save_data_encrypted(void)
|
||||
{
|
||||
struct Tox_Options *options = tox_options_new(nullptr);
|
||||
ck_assert(options != nullptr);
|
||||
Tox *t = tox_new_log(options, nullptr, nullptr);
|
||||
ck_assert(t != nullptr);
|
||||
tox_options_free(options);
|
||||
|
||||
tox_self_set_name(t, (const uint8_t *)name, strlen(name), nullptr);
|
||||
|
||||
FILE *f = fopen(savefile, "wb");
|
||||
ck_assert(f != nullptr);
|
||||
|
||||
size_t size = tox_get_savedata_size(t);
|
||||
uint8_t *clear = (uint8_t *)malloc(size);
|
||||
ck_assert(clear != nullptr);
|
||||
|
||||
/*this function does not write any data at all*/
|
||||
tox_get_savedata(t, clear);
|
||||
|
||||
size += TOX_PASS_ENCRYPTION_EXTRA_LENGTH;
|
||||
uint8_t *cipher = (uint8_t *)malloc(size);
|
||||
ck_assert(cipher != nullptr);
|
||||
|
||||
Tox_Err_Encryption eerr;
|
||||
|
||||
@ -66,11 +73,12 @@ static void load_data_decrypted(void)
|
||||
int64_t size = ftell(f);
|
||||
fseek(f, 0, SEEK_SET);
|
||||
|
||||
ck_assert_msg(0 <= size && size <= UINT_MAX, "file size out of range");
|
||||
ck_assert_msg(TOX_PASS_ENCRYPTION_EXTRA_LENGTH <= size && size <= UINT_MAX, "file size out of range");
|
||||
|
||||
uint8_t *cipher = (uint8_t *)malloc(size);
|
||||
ck_assert(cipher != nullptr);
|
||||
uint8_t *clear = (uint8_t *)malloc(size - TOX_PASS_ENCRYPTION_EXTRA_LENGTH);
|
||||
const size_t clear_size = size - TOX_PASS_ENCRYPTION_EXTRA_LENGTH;
|
||||
uint8_t *clear = (uint8_t *)malloc(clear_size);
|
||||
ck_assert(clear != nullptr);
|
||||
size_t read_value = fread(cipher, sizeof(*cipher), size, f);
|
||||
printf("Read read_value = %u of %u\n", (unsigned)read_value, (unsigned)size);
|
||||
@ -78,23 +86,23 @@ static void load_data_decrypted(void)
|
||||
Tox_Err_Decryption derr;
|
||||
|
||||
ck_assert_msg(tox_pass_decrypt(cipher, size, (const uint8_t *)pphrase, strlen(pphrase), clear, &derr),
|
||||
"Could not decrypt, error code %d.", derr);
|
||||
"Could not decrypt, error code %s.", tox_err_decryption_to_string(derr));
|
||||
|
||||
struct Tox_Options *options = tox_options_new(nullptr);
|
||||
ck_assert(options != nullptr);
|
||||
|
||||
tox_options_set_experimental_owned_data(options, true);
|
||||
tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
|
||||
|
||||
tox_options_set_savedata_data(options, clear, size);
|
||||
ck_assert(tox_options_set_savedata_data(options, clear, clear_size));
|
||||
free(clear);
|
||||
|
||||
Tox_Err_New err;
|
||||
|
||||
Tox *t = tox_new_log(options, &err, nullptr);
|
||||
ck_assert_msg(t != nullptr, "tox_new returned the error value %s", tox_err_new_to_string(err));
|
||||
|
||||
tox_options_free(options);
|
||||
|
||||
ck_assert_msg(t != nullptr, "tox_new returned the error value %d", err);
|
||||
|
||||
uint8_t *readname = (uint8_t *)malloc(tox_self_get_name_size(t));
|
||||
ck_assert(readname != nullptr);
|
||||
tox_self_get_name(t, readname);
|
||||
@ -103,7 +111,6 @@ static void load_data_decrypted(void)
|
||||
"name returned by tox_self_get_name does not match expected result");
|
||||
|
||||
tox_kill(t);
|
||||
free(clear);
|
||||
free(cipher);
|
||||
free(readname);
|
||||
fclose(f);
|
||||
|
Reference in New Issue
Block a user