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:
@ -12,6 +12,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include "DHT.h"
|
||||
#include "attributes.h"
|
||||
#include "ccompat.h"
|
||||
#include "crypto_core.h"
|
||||
#include "logger.h"
|
||||
@ -19,6 +20,7 @@
|
||||
#include "mono_time.h"
|
||||
#include "network.h"
|
||||
#include "shared_key_cache.h"
|
||||
#include "util.h"
|
||||
|
||||
#define RETURN_1 ONION_RETURN_1
|
||||
#define RETURN_2 ONION_RETURN_2
|
||||
@ -31,7 +33,6 @@
|
||||
|
||||
#define KEY_REFRESH_INTERVAL (2 * 60 * 60)
|
||||
|
||||
|
||||
// Settings for the shared key cache
|
||||
#define MAX_KEYS_PER_SLOT 4
|
||||
#define KEYS_TIMEOUT 600
|
||||
@ -53,7 +54,7 @@ static void ip_pack_to_bytes(uint8_t *data, const IP *source)
|
||||
data[0] = source->family.value;
|
||||
|
||||
if (net_family_is_ipv4(source->family) || net_family_is_tox_tcp_ipv4(source->family)) {
|
||||
memset(data + 1, 0, SIZE_IP6);
|
||||
memzero(data + 1, SIZE_IP6);
|
||||
memcpy(data + 1, source->ip.v4.uint8, SIZE_IP4);
|
||||
} else {
|
||||
memcpy(data + 1, source->ip.v6.uint8, SIZE_IP6);
|
||||
@ -78,8 +79,8 @@ static int ip_unpack_from_bytes(IP *target, const uint8_t *data, unsigned int da
|
||||
}
|
||||
|
||||
const bool valid = disable_family_check ||
|
||||
net_family_is_ipv4(target->family) ||
|
||||
net_family_is_ipv6(target->family);
|
||||
net_family_is_ipv4(target->family) ||
|
||||
net_family_is_ipv6(target->family);
|
||||
|
||||
return valid ? 0 : -1;
|
||||
}
|
||||
@ -107,7 +108,6 @@ static int ipport_unpack(IP_Port *target, const uint8_t *data, unsigned int data
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/** @brief Create a new onion path.
|
||||
*
|
||||
* Create a new onion path out of nodes (nodes is a list of ONION_PATH_LENGTH nodes)
|
||||
@ -188,7 +188,8 @@ int create_onion_packet(const Random *rng, uint8_t *packet, uint16_t max_packet_
|
||||
return -1;
|
||||
}
|
||||
|
||||
VLA(uint8_t, step1, SIZE_IPPORT + length);
|
||||
const uint16_t step1_size = SIZE_IPPORT + length;
|
||||
VLA(uint8_t, step1, step1_size);
|
||||
|
||||
ipport_pack(step1, dest);
|
||||
memcpy(step1 + SIZE_IPPORT, data, length);
|
||||
@ -196,21 +197,23 @@ int create_onion_packet(const Random *rng, uint8_t *packet, uint16_t max_packet_
|
||||
uint8_t nonce[CRYPTO_NONCE_SIZE];
|
||||
random_nonce(rng, nonce);
|
||||
|
||||
VLA(uint8_t, step2, SIZE_IPPORT + SEND_BASE + length);
|
||||
const uint16_t step2_size = SIZE_IPPORT + SEND_BASE + length;
|
||||
VLA(uint8_t, step2, step2_size);
|
||||
ipport_pack(step2, &path->ip_port3);
|
||||
memcpy(step2 + SIZE_IPPORT, path->public_key3, CRYPTO_PUBLIC_KEY_SIZE);
|
||||
|
||||
int len = encrypt_data_symmetric(path->shared_key3, nonce, step1, SIZEOF_VLA(step1),
|
||||
int len = encrypt_data_symmetric(path->shared_key3, nonce, step1, step1_size,
|
||||
step2 + SIZE_IPPORT + CRYPTO_PUBLIC_KEY_SIZE);
|
||||
|
||||
if (len != SIZE_IPPORT + length + CRYPTO_MAC_SIZE) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
VLA(uint8_t, step3, SIZE_IPPORT + SEND_BASE * 2 + length);
|
||||
const uint16_t step3_size = SIZE_IPPORT + SEND_BASE * 2 + length;
|
||||
VLA(uint8_t, step3, step3_size);
|
||||
ipport_pack(step3, &path->ip_port2);
|
||||
memcpy(step3 + SIZE_IPPORT, path->public_key2, CRYPTO_PUBLIC_KEY_SIZE);
|
||||
len = encrypt_data_symmetric(path->shared_key2, nonce, step2, SIZEOF_VLA(step2),
|
||||
len = encrypt_data_symmetric(path->shared_key2, nonce, step2, step2_size,
|
||||
step3 + SIZE_IPPORT + CRYPTO_PUBLIC_KEY_SIZE);
|
||||
|
||||
if (len != SIZE_IPPORT + SEND_BASE + length + CRYPTO_MAC_SIZE) {
|
||||
@ -221,7 +224,7 @@ int create_onion_packet(const Random *rng, uint8_t *packet, uint16_t max_packet_
|
||||
memcpy(packet + 1, nonce, CRYPTO_NONCE_SIZE);
|
||||
memcpy(packet + 1 + CRYPTO_NONCE_SIZE, path->public_key1, CRYPTO_PUBLIC_KEY_SIZE);
|
||||
|
||||
len = encrypt_data_symmetric(path->shared_key1, nonce, step3, SIZEOF_VLA(step3),
|
||||
len = encrypt_data_symmetric(path->shared_key1, nonce, step3, step3_size,
|
||||
packet + 1 + CRYPTO_NONCE_SIZE + CRYPTO_PUBLIC_KEY_SIZE);
|
||||
|
||||
if (len != SIZE_IPPORT + SEND_BASE * 2 + length + CRYPTO_MAC_SIZE) {
|
||||
@ -248,7 +251,8 @@ int create_onion_packet_tcp(const Random *rng, uint8_t *packet, uint16_t max_pac
|
||||
return -1;
|
||||
}
|
||||
|
||||
VLA(uint8_t, step1, SIZE_IPPORT + length);
|
||||
const uint16_t step1_size = SIZE_IPPORT + length;
|
||||
VLA(uint8_t, step1, step1_size);
|
||||
|
||||
ipport_pack(step1, dest);
|
||||
memcpy(step1 + SIZE_IPPORT, data, length);
|
||||
@ -256,11 +260,12 @@ int create_onion_packet_tcp(const Random *rng, uint8_t *packet, uint16_t max_pac
|
||||
uint8_t nonce[CRYPTO_NONCE_SIZE];
|
||||
random_nonce(rng, nonce);
|
||||
|
||||
VLA(uint8_t, step2, SIZE_IPPORT + SEND_BASE + length);
|
||||
const uint16_t step2_size = SIZE_IPPORT + SEND_BASE + length;
|
||||
VLA(uint8_t, step2, step2_size);
|
||||
ipport_pack(step2, &path->ip_port3);
|
||||
memcpy(step2 + SIZE_IPPORT, path->public_key3, CRYPTO_PUBLIC_KEY_SIZE);
|
||||
|
||||
int len = encrypt_data_symmetric(path->shared_key3, nonce, step1, SIZEOF_VLA(step1),
|
||||
int len = encrypt_data_symmetric(path->shared_key3, nonce, step1, step1_size,
|
||||
step2 + SIZE_IPPORT + CRYPTO_PUBLIC_KEY_SIZE);
|
||||
|
||||
if (len != SIZE_IPPORT + length + CRYPTO_MAC_SIZE) {
|
||||
@ -269,7 +274,7 @@ int create_onion_packet_tcp(const Random *rng, uint8_t *packet, uint16_t max_pac
|
||||
|
||||
ipport_pack(packet + CRYPTO_NONCE_SIZE, &path->ip_port2);
|
||||
memcpy(packet + CRYPTO_NONCE_SIZE + SIZE_IPPORT, path->public_key2, CRYPTO_PUBLIC_KEY_SIZE);
|
||||
len = encrypt_data_symmetric(path->shared_key2, nonce, step2, SIZEOF_VLA(step2),
|
||||
len = encrypt_data_symmetric(path->shared_key2, nonce, step2, step2_size,
|
||||
packet + CRYPTO_NONCE_SIZE + SIZE_IPPORT + CRYPTO_PUBLIC_KEY_SIZE);
|
||||
|
||||
if (len != SIZE_IPPORT + SEND_BASE + length + CRYPTO_MAC_SIZE) {
|
||||
@ -350,7 +355,7 @@ static int handle_send_initial(void *object, const IP_Port *source, const uint8_
|
||||
}
|
||||
|
||||
const int len = decrypt_data_symmetric(
|
||||
shared_key, &packet[nonce_start], &packet[ciphertext_start], ciphertext_length, plain);
|
||||
shared_key, &packet[nonce_start], &packet[ciphertext_start], ciphertext_length, plain);
|
||||
|
||||
if (len != plaintext_length) {
|
||||
LOGGER_TRACE(onion->log, "decrypt failed: %d != %d", len, plaintext_length);
|
||||
@ -546,7 +551,6 @@ static int handle_send_2(void *object, const IP_Port *source, const uint8_t *pac
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
non_null()
|
||||
static int handle_recv_3(void *object, const IP_Port *source, const uint8_t *packet, uint16_t length, void *userdata)
|
||||
{
|
||||
@ -571,7 +575,7 @@ static int handle_recv_3(void *object, const IP_Port *source, const uint8_t *pac
|
||||
|
||||
uint8_t plain[SIZE_IPPORT + RETURN_2];
|
||||
const int len = decrypt_data_symmetric(onion->secret_symmetric_key, packet + 1, packet + 1 + CRYPTO_NONCE_SIZE,
|
||||
SIZE_IPPORT + RETURN_2 + CRYPTO_MAC_SIZE, plain);
|
||||
SIZE_IPPORT + RETURN_2 + CRYPTO_MAC_SIZE, plain);
|
||||
|
||||
if ((uint32_t)len != sizeof(plain)) {
|
||||
return 1;
|
||||
@ -624,7 +628,7 @@ static int handle_recv_2(void *object, const IP_Port *source, const uint8_t *pac
|
||||
|
||||
uint8_t plain[SIZE_IPPORT + RETURN_1];
|
||||
const int len = decrypt_data_symmetric(onion->secret_symmetric_key, packet + 1, packet + 1 + CRYPTO_NONCE_SIZE,
|
||||
SIZE_IPPORT + RETURN_1 + CRYPTO_MAC_SIZE, plain);
|
||||
SIZE_IPPORT + RETURN_1 + CRYPTO_MAC_SIZE, plain);
|
||||
|
||||
if ((uint32_t)len != sizeof(plain)) {
|
||||
return 1;
|
||||
@ -676,7 +680,7 @@ static int handle_recv_1(void *object, const IP_Port *source, const uint8_t *pac
|
||||
|
||||
uint8_t plain[SIZE_IPPORT];
|
||||
const int len = decrypt_data_symmetric(onion->secret_symmetric_key, packet + 1, packet + 1 + CRYPTO_NONCE_SIZE,
|
||||
SIZE_IPPORT + CRYPTO_MAC_SIZE, plain);
|
||||
SIZE_IPPORT + CRYPTO_MAC_SIZE, plain);
|
||||
|
||||
if ((uint32_t)len != SIZE_IPPORT) {
|
||||
return 1;
|
||||
@ -737,14 +741,13 @@ Onion *new_onion(const Logger *log, const Memory *mem, const Mono_Time *mono_tim
|
||||
onion->shared_keys_3 = shared_key_cache_new(log, mono_time, mem, secret_key, KEYS_TIMEOUT, MAX_KEYS_PER_SLOT);
|
||||
|
||||
if (onion->shared_keys_1 == nullptr ||
|
||||
onion->shared_keys_2 == nullptr ||
|
||||
onion->shared_keys_3 == nullptr) {
|
||||
onion->shared_keys_2 == nullptr ||
|
||||
onion->shared_keys_3 == nullptr) {
|
||||
// cppcheck-suppress mismatchAllocDealloc
|
||||
kill_onion(onion);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
networking_registerhandler(onion->net, NET_PACKET_ONION_SEND_INITIAL, &handle_send_initial, onion);
|
||||
networking_registerhandler(onion->net, NET_PACKET_ONION_SEND_1, &handle_send_1, onion);
|
||||
networking_registerhandler(onion->net, NET_PACKET_ONION_SEND_2, &handle_send_2, onion);
|
||||
|
||||
Reference in New Issue
Block a user