forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from e2c01e457b..b03b571272
b03b571272 fix: flaky tcp test This only fixes the symptoms, not the real problem. Sometimes or consistently on some platforms a socket might need a moment before it can be written to.
32e67ab4c2 cleanup: use typedef for private message ID's in callback
7b1db6adc1 feat: add message IDs to private group messages
99e0bcc27d refactor: Observers/ignored peers can now send and receive custom packets
b3c3c49d26 fix: Disable IPv6 in Windows cross-compilation tests
e742deddff feat: Check hashes of Windows dependencies when cross-compiling
dfb9a0b02b fix: Test the current Windows Dockerfile, not an old Dockerhub image
14de93ccec chore: Use WineHQ's Wine as Debian Bookworm's crashes
ed37616249 docs: Update the Windows cross-compilation section
9bb79c174f cleanup: Remove a couple of unnecessary misc_tools dependencies
19475adb70 chore: Statically link OpenMP into the cracker fun util on Windows
1be311e51f feat: Build the fun utils when cross-compiling to Windows
88133f8446 chore: Strip Windows binaries
3cc0ae7535 refactor: Copy over all of the required static dependencies
c4fa8f7fb1 feat: Generate .def, .exp and .lib files when building for Windows
74bbac5363 feat: Let CMake create the dll instead of doing so ourselves
246642e9ae feat: Harden Windows cross-compilation
8d431c0d11 chore: Bump Windows build dependency versions
e519f7998b fix: Remove unnecessary wsock32 dependency on Windows
ed2b60c217 chore: Use a specific non-broken slimcc version.
d7f21010a1 chore: Update github actions.
e71a68b7f2 docs: Update the list of CMake options
77e08876ff chore: Remove mod and founder from group API naming scheme
12bc042767 docs: add the experimental api build option to INSTALL.md
e1fa5cae96 refactor: Rename Queries to Query to align with other enums.
be82a3ea30 fix: Correct type for conference offline peer numbers.
0627c36716 test: Add pkgsrc build.
92578afe4b test: Add FreeBSD VM action on GitHub.
52ece0f57b test: Build toxcore on NetBSD (VM).
3fe8ee2c11 chore: Only install tox_private.h on request.
9a8dfa06ab fix: save_compatibility_test failing on big-endian systems
86f5e55578 fix: Don't serve files from websockify.
710eb674a5 fix: Correctly pass extended public keys to group moderation code.
021db7031c refactor: Use `struct`s for extended public/secret keys.
a1e999fd80 chore: Compile libsodium reference implementation with compcert.
fbe3c19cf5 cleanup: correct a few nullable annotations
623e3ee5c3 cleanup: Don't use `memcpy` to cast arbitrary `struct`s to `uint8_t[]`.
c71567dc18 fix: Pass array, not array pointer, to `memcmp`.
9b46a08144 cleanup: Never pass `void*` directly to `memcpy`.
5d7b7a7bbc refactor: Use tox rng to seed the keypair generation.
961891d568 cleanup: Small improvements found by PVS Studio.
8201019f0d chore: Disable NGC saving by default, enable through Tox_Options.
5dd9ee3f65 cleanup: Replace pointer arithmetic with explicit `&arr[i]`.
ca4606d49d refactor: Use strong typedef for NGC peer id.
442213b722 cleanup: Simplify custom packet length check in NGC.
08d3393def fix: Correct a few potential null derefs in bootstrap daemon.
b9877b32b0 fix: Add missing memunlock of local variable when it goes out of scope.
dab5fe44b9 fix: Zero out stack-allocated secret key before return.
f058103299 refactor: Make prune_gc_sanctions_list more obviously correct.
3ba7a0dec9 docs: Add static analysis tool list to README.
8d0811a0f3 docs: Run prettier-markdown on markdown files.
969e3a2bfc refactor: Fix network test not using the strong typedef
93c83fbc7c refactor: Use strong typedef instead of struct for `Socket`.
9fe18b176f fix: Fix some false positive from PVS Studio.
7c44379ccb cleanup: Check that WINXP macro exists before comparing it.
5c93231bef refactor: Make tox mutex non-recursive.
aacff73939 docs: Fix up doxyfile.
d55fc85ff5 docs: Add more documentation to crypto_core.
5bdaaaedb6 refactor: Remove `Tox *` from `tox_dispatch`.
e202341e76 refactor: Don't rely on tox_dispatch passing tox in tests.
34df938f52 chore: Use C++ mode for clang-tidy.
8b05296a78 chore: Check that both gtest and gmock exist for tests.
42010660e1 test: Add slimcc compiler compatibility test.
b473630321 chore: Add some comments to the astyle config.
b7404f24f6 cleanup: Remove implicit bool conversions.
4e2dba4d9f chore: Reformat sources with astyle.
4359e3a6bc chore: Rename C++ headers to .hh suffixes.
0c05566e58 cleanup: Further `#include` cleanups.
8d29935b7a chore: Only check the bootstrap daemon checksum on release.
f70e588bc6 cleanup: Add more `const` where possible.
511bfe39c8 cleanup: Use Bazel modules to enforce proper `#include` hygiene.
1710a0d091 refactor: Move pack/unpack `IP_Port` from DHT into network module.
a975943564 chore: Really fix coverage docker image build.
c08409390f chore: Fix post-submit coverage image.
39aadf8922 fix: Don't use `memcmp` to compare `IP_Port`s.
d94246a906 fix: partially fix a bug that prevented group part messages from sending.
eeaa039222 chore: Fix rpm build; add a CI check for it.
8328449c1a chore: Speed up docker builds a bit by reducing layer count.
d6d67d56f3 cleanup: Add `const` where possible in auto tests.
6aa9e6850d cleanup: Minor cleanup of event unpack code.
bdf460a3a9 refactor: Rename `system_{memory,...}` to `os_{memory,...}`.
203e1af81e fix: a few off by one errors in group autotests
5c093c4888 cleanup: Remove all uses of `SIZEOF_VLA`.
662c2140f3 test: Add goblint static analyser.
8f07755834 cleanup: Use `memzero(x, s)` instead of `memset(x, 0, s)`.
a7258e40cf cleanup: Use explicit 0 instead of `PACKET_ID_PADDING`.
6370d0f15d cleanup: Expand the `Tox_Options` accessor macros.
14a1a0b9bd cleanup: Remove plan9 support.
a05dccad13 test: Add a simple new/delete test for Tox.
1cdcf938b9 cleanup: Add comment after every `#endif`.
ba99d4dc4b test: Fix comment I broke in the events test PR.
e07248debb refactor: Migrate auto_tests to new events API.
bdd42b5452 refactor: Add common msgpack array packer with callback.
3c659f5288 cleanup: Rename group to conference in groupav documentation.
89957be230 cleanup: Ensure handler params are named after callback params.
c650d9d345 refactor: Pass `this` pointer as first param to s11n callbacks.
e7fb91ddb8 refactor: Allow NULL pointers for byte arrays in events.
5e2c8cabc1 cleanup: make some improvements to group moderation test
259de4867e cleanup: Remove `bin_pack_{new,free}`.
21a8ff5895 cleanup: skip a do_gc iteration before removing peers marked for deletion
16809dc36e feat: Add dht_get_nodes_response event to the events system.
git-subtree-dir: external/toxcore/c-toxcore
git-subtree-split: b03b5712720de9a9901ea12fd741f177327a7021
This commit is contained in:
@ -16,6 +16,7 @@
|
||||
#include <time.h>
|
||||
|
||||
#include "DHT.h"
|
||||
#include "attributes.h"
|
||||
#include "ccompat.h"
|
||||
#include "crypto_core.h"
|
||||
#include "logger.h"
|
||||
@ -93,7 +94,7 @@ void mod_list_get_data_hash(uint8_t *hash, const uint8_t *packed_mod_list, uint1
|
||||
bool mod_list_make_hash(const Moderation *moderation, uint8_t *hash)
|
||||
{
|
||||
if (moderation->num_mods == 0) {
|
||||
memset(hash, 0, MOD_MODERATION_HASH_SIZE);
|
||||
memzero(hash, MOD_MODERATION_HASH_SIZE);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -235,15 +236,15 @@ uint16_t sanctions_creds_pack(const Mod_Sanction_Creds *creds, uint8_t *data)
|
||||
{
|
||||
uint16_t packed_len = 0;
|
||||
|
||||
net_pack_u32(data + packed_len, creds->version);
|
||||
net_pack_u32(&data[packed_len], creds->version);
|
||||
packed_len += sizeof(uint32_t);
|
||||
memcpy(data + packed_len, creds->hash, MOD_SANCTION_HASH_SIZE);
|
||||
memcpy(&data[packed_len], creds->hash, MOD_SANCTION_HASH_SIZE);
|
||||
packed_len += MOD_SANCTION_HASH_SIZE;
|
||||
net_pack_u16(data + packed_len, creds->checksum);
|
||||
net_pack_u16(&data[packed_len], creds->checksum);
|
||||
packed_len += sizeof(uint16_t);
|
||||
memcpy(data + packed_len, creds->sig_pk, SIG_PUBLIC_KEY_SIZE);
|
||||
memcpy(&data[packed_len], creds->sig_pk, SIG_PUBLIC_KEY_SIZE);
|
||||
packed_len += SIG_PUBLIC_KEY_SIZE;
|
||||
memcpy(data + packed_len, creds->sig, SIGNATURE_SIZE);
|
||||
memcpy(&data[packed_len], creds->sig, SIGNATURE_SIZE);
|
||||
packed_len += SIGNATURE_SIZE;
|
||||
|
||||
return packed_len;
|
||||
@ -267,11 +268,11 @@ int sanctions_list_pack(uint8_t *data, uint16_t length, const Mod_Sanction *sanc
|
||||
return -1;
|
||||
}
|
||||
|
||||
memcpy(data + packed_len, &sanctions[i].type, sizeof(uint8_t));
|
||||
memcpy(&data[packed_len], &sanctions[i].type, sizeof(uint8_t));
|
||||
packed_len += sizeof(uint8_t);
|
||||
memcpy(data + packed_len, sanctions[i].setter_public_sig_key, SIG_PUBLIC_KEY_SIZE);
|
||||
memcpy(&data[packed_len], sanctions[i].setter_public_sig_key, SIG_PUBLIC_KEY_SIZE);
|
||||
packed_len += SIG_PUBLIC_KEY_SIZE;
|
||||
net_pack_u64(data + packed_len, sanctions[i].time_set);
|
||||
net_pack_u64(&data[packed_len], sanctions[i].time_set);
|
||||
packed_len += TIME_STAMP_SIZE;
|
||||
|
||||
const uint8_t sanctions_type = sanctions[i].type;
|
||||
@ -281,7 +282,7 @@ int sanctions_list_pack(uint8_t *data, uint16_t length, const Mod_Sanction *sanc
|
||||
return -1;
|
||||
}
|
||||
|
||||
memcpy(data + packed_len, sanctions[i].target_public_enc_key, ENC_PUBLIC_KEY_SIZE);
|
||||
memcpy(&data[packed_len], sanctions[i].target_public_enc_key, ENC_PUBLIC_KEY_SIZE);
|
||||
packed_len += ENC_PUBLIC_KEY_SIZE;
|
||||
} else {
|
||||
return -1;
|
||||
@ -292,7 +293,7 @@ int sanctions_list_pack(uint8_t *data, uint16_t length, const Mod_Sanction *sanc
|
||||
}
|
||||
|
||||
/* Signature must be packed last */
|
||||
memcpy(data + packed_len, sanctions[i].signature, SIGNATURE_SIZE);
|
||||
memcpy(&data[packed_len], sanctions[i].signature, SIGNATURE_SIZE);
|
||||
packed_len += SIGNATURE_SIZE;
|
||||
}
|
||||
|
||||
@ -304,7 +305,7 @@ int sanctions_list_pack(uint8_t *data, uint16_t length, const Mod_Sanction *sanc
|
||||
return -1;
|
||||
}
|
||||
|
||||
const uint16_t cred_len = sanctions_creds_pack(creds, data + packed_len);
|
||||
const uint16_t cred_len = sanctions_creds_pack(creds, &data[packed_len]);
|
||||
|
||||
if (cred_len != MOD_SANCTIONS_CREDS_SIZE) {
|
||||
return -1;
|
||||
@ -317,15 +318,15 @@ uint16_t sanctions_creds_unpack(Mod_Sanction_Creds *creds, const uint8_t *data)
|
||||
{
|
||||
uint16_t len_processed = 0;
|
||||
|
||||
net_unpack_u32(data + len_processed, &creds->version);
|
||||
net_unpack_u32(&data[len_processed], &creds->version);
|
||||
len_processed += sizeof(uint32_t);
|
||||
memcpy(creds->hash, data + len_processed, MOD_SANCTION_HASH_SIZE);
|
||||
memcpy(creds->hash, &data[len_processed], MOD_SANCTION_HASH_SIZE);
|
||||
len_processed += MOD_SANCTION_HASH_SIZE;
|
||||
net_unpack_u16(data + len_processed, &creds->checksum);
|
||||
net_unpack_u16(&data[len_processed], &creds->checksum);
|
||||
len_processed += sizeof(uint16_t);
|
||||
memcpy(creds->sig_pk, data + len_processed, SIG_PUBLIC_KEY_SIZE);
|
||||
memcpy(creds->sig_pk, &data[len_processed], SIG_PUBLIC_KEY_SIZE);
|
||||
len_processed += SIG_PUBLIC_KEY_SIZE;
|
||||
memcpy(creds->sig, data + len_processed, SIGNATURE_SIZE);
|
||||
memcpy(creds->sig, &data[len_processed], SIGNATURE_SIZE);
|
||||
len_processed += SIGNATURE_SIZE;
|
||||
|
||||
return len_processed;
|
||||
@ -342,11 +343,11 @@ int sanctions_list_unpack(Mod_Sanction *sanctions, Mod_Sanction_Creds *creds, ui
|
||||
return -1;
|
||||
}
|
||||
|
||||
memcpy(&sanctions[num].type, data + len_processed, sizeof(uint8_t));
|
||||
memcpy(&sanctions[num].type, &data[len_processed], sizeof(uint8_t));
|
||||
len_processed += sizeof(uint8_t);
|
||||
memcpy(sanctions[num].setter_public_sig_key, data + len_processed, SIG_PUBLIC_KEY_SIZE);
|
||||
memcpy(sanctions[num].setter_public_sig_key, &data[len_processed], SIG_PUBLIC_KEY_SIZE);
|
||||
len_processed += SIG_PUBLIC_KEY_SIZE;
|
||||
net_unpack_u64(data + len_processed, &sanctions[num].time_set);
|
||||
net_unpack_u64(&data[len_processed], &sanctions[num].time_set);
|
||||
len_processed += TIME_STAMP_SIZE;
|
||||
|
||||
if (sanctions[num].type == SA_OBSERVER) {
|
||||
@ -354,7 +355,7 @@ int sanctions_list_unpack(Mod_Sanction *sanctions, Mod_Sanction_Creds *creds, ui
|
||||
return -1;
|
||||
}
|
||||
|
||||
memcpy(sanctions[num].target_public_enc_key, data + len_processed, ENC_PUBLIC_KEY_SIZE);
|
||||
memcpy(sanctions[num].target_public_enc_key, &data[len_processed], ENC_PUBLIC_KEY_SIZE);
|
||||
len_processed += ENC_PUBLIC_KEY_SIZE;
|
||||
} else {
|
||||
return -1;
|
||||
@ -364,7 +365,7 @@ int sanctions_list_unpack(Mod_Sanction *sanctions, Mod_Sanction_Creds *creds, ui
|
||||
return -1;
|
||||
}
|
||||
|
||||
memcpy(sanctions[num].signature, data + len_processed, SIGNATURE_SIZE);
|
||||
memcpy(sanctions[num].signature, &data[len_processed], SIGNATURE_SIZE);
|
||||
len_processed += SIGNATURE_SIZE;
|
||||
|
||||
++num;
|
||||
@ -382,7 +383,7 @@ int sanctions_list_unpack(Mod_Sanction *sanctions, Mod_Sanction_Creds *creds, ui
|
||||
return num;
|
||||
}
|
||||
|
||||
const uint16_t creds_len = sanctions_creds_unpack(creds, data + len_processed);
|
||||
const uint16_t creds_len = sanctions_creds_unpack(creds, &data[len_processed]);
|
||||
|
||||
if (creds_len != MOD_SANCTIONS_CREDS_SIZE) {
|
||||
return -1;
|
||||
@ -395,7 +396,6 @@ int sanctions_list_unpack(Mod_Sanction *sanctions, Mod_Sanction_Creds *creds, ui
|
||||
return num;
|
||||
}
|
||||
|
||||
|
||||
/** @brief Creates a new sanction list hash and puts it in hash.
|
||||
*
|
||||
* The hash is derived from the signature of all entries plus the version number.
|
||||
@ -410,7 +410,7 @@ static bool sanctions_list_make_hash(const Mod_Sanction *sanctions, uint32_t new
|
||||
uint8_t *hash)
|
||||
{
|
||||
if (num_sanctions == 0 || sanctions == nullptr) {
|
||||
memset(hash, 0, MOD_SANCTION_HASH_SIZE);
|
||||
memzero(hash, MOD_SANCTION_HASH_SIZE);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -864,9 +864,7 @@ uint16_t sanctions_list_replace_sig(Moderation *moderation, const uint8_t *publi
|
||||
|
||||
void sanctions_list_cleanup(Moderation *moderation)
|
||||
{
|
||||
if (moderation->sanctions != nullptr) {
|
||||
free(moderation->sanctions);
|
||||
}
|
||||
free(moderation->sanctions);
|
||||
|
||||
moderation->sanctions = nullptr;
|
||||
moderation->num_sanctions = 0;
|
||||
|
||||
Reference in New Issue
Block a user