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

other/fun/CMakeLists.txt

@@ -6,36 +6,46 @@ function(target_link_toxcore target)
   endif()
 endfunction()
 
+function(target_link_sodium target)
+  if(TARGET unofficial-sodium::sodium)
+    target_link_libraries(${target} PRIVATE unofficial-sodium::sodium)
+  else()
+    target_link_libraries(${target} PRIVATE ${LIBSODIUM_LIBRARIES})
+    target_link_directories(${target} PRIVATE ${LIBSODIUM_LIBRARY_DIRS})
+    target_include_directories(${target} SYSTEM PRIVATE ${LIBSODIUM_INCLUDE_DIRS})
+    target_compile_options(${target} PRIVATE ${LIBSODIUM_CFLAGS_OTHER})
+  endif()
+endfunction()
+
 add_executable(save-generator save-generator.c)
 target_link_libraries(save-generator PRIVATE misc_tools)
 target_link_toxcore(save-generator)
 
 add_executable(strkey strkey.c)
-target_link_libraries(strkey PRIVATE ${LIBSODIUM_LIBRARIES})
-target_link_toxcore(strkey)
+target_link_sodium(strkey)
 
 add_executable(create_bootstrap_keys create_bootstrap_keys.c)
-target_link_libraries(create_bootstrap_keys PRIVATE ${LIBSODIUM_LIBRARIES})
-target_link_toxcore(create_bootstrap_keys)
+target_link_sodium(create_bootstrap_keys)
 
 add_executable(create_minimal_savedata create_minimal_savedata.c)
-target_link_libraries(create_minimal_savedata PRIVATE ${LIBSODIUM_LIBRARIES})
+target_link_sodium(create_minimal_savedata)
 
 add_executable(create_savedata create_savedata.c)
-target_link_libraries(create_savedata PRIVATE ${LIBSODIUM_LIBRARIES})
+target_link_sodium(create_savedata)
 target_link_toxcore(create_savedata)
 
 add_executable(sign sign.c)
-target_link_libraries(sign PRIVATE ${LIBSODIUM_LIBRARIES} misc_tools)
+target_link_sodium(sign)
 
 add_executable(cracker_simple cracker_simple.c)
-target_link_libraries(cracker_simple ${LIBSODIUM_LIBRARIES} misc_tools)
+target_link_sodium(cracker_simple)
 
-# MSVC doesn't support OpenMP
-if(NOT MSVC)
-  find_package(OpenMP)
-  if(OpenMP_C_FOUND)
-    add_executable(cracker cracker.c)
-    target_link_libraries(cracker PRIVATE OpenMP::OpenMP_C ${LIBSODIUM_LIBRARIES})
-  endif()
+find_package(OpenMP)
+if(OpenMP_C_FOUND)
+  add_executable(cracker cracker.c)
+  target_link_libraries(cracker PRIVATE OpenMP::OpenMP_C)
+  target_link_sodium(cracker)
+else()
+  add_executable(cracker cracker.c)
+  target_link_sodium(cracker)
 endif()

other/fun/cracker.c

@@ -33,6 +33,7 @@
 #include <omp.h>
 #define NUM_THREADS() ((unsigned) omp_get_max_threads())
 #else
+#pragma message("Being built without OpenMP support -- the program will utilize a single thread only.")
 #define NUM_THREADS() (1U)
 #endif
 
@@ -112,8 +113,9 @@ static size_t match_hex_prefix(const uint8_t *key, const uint8_t *prefix, size_t
 static void cracker_core(uint64_t range_start, uint64_t range_end, uint64_t range_offs, uint64_t priv_key_shadow[4],
                          uint32_t *longest_match, uint8_t hex_prefix[MAX_CRACK_BYTES], size_t prefix_chars_len)
 {
+#if defined(_OPENMP)
     #pragma omp parallel for firstprivate(priv_key_shadow) shared(longest_match, range_start, range_end, range_offs, hex_prefix, prefix_chars_len) schedule(static) default(none)
-
+#endif
     for (uint64_t batch = range_start; batch < range_end; ++batch) {
         uint8_t *priv_key = (uint8_t *) priv_key_shadow;
         /*
@@ -134,14 +136,19 @@ static void cracker_core(uint64_t range_start, uint64_t range_end, uint64_t rang
 
         // Global compare and update
         uint32_t l_longest_match;
+#if defined(_OPENMP)
         #pragma omp atomic read
+#endif
         l_longest_match = *longest_match;
 
         if (matching > l_longest_match) {
+#if defined(_OPENMP)
             #pragma omp atomic write
+#endif
             *longest_match = matching;
-
+#if defined(_OPENMP)
             #pragma omp critical
+#endif
             {
                 printf("%u chars matching: \n", matching);
                 printf("Public key: ");
@@ -198,7 +205,6 @@ int main(int argc, char *argv[])
     randombytes(priv_key, KEY_LEN);
     uint32_t longest_match = 0;
 
-
     // Finishes a batch every ~10s on my PC
     const uint64_t batch_size = (UINT64_C(1) << 18) * NUM_THREADS();
 
@@ -220,7 +226,6 @@ int main(int argc, char *argv[])
         return 0;
     }
 
-
     for (uint64_t tries = 0; tries < rem_start; tries += batch_size) {
         cracker_core(tries, tries + batch_size, 0, priv_key_shadow, &longest_match, hex_prefix, prefix_chars_len);
 

other/fun/cracker_simple.c

@@ -13,11 +13,8 @@
 #include <stdio.h>
 #include <string.h>
 
-/* Sodium includes*/
-#include <sodium/crypto_scalarmult_curve25519.h>
-#include <sodium/randombytes.h>
+#include <sodium.h>
 
-#include "../../testing/misc_tools.h"
 #include "../../toxcore/ccompat.h"
 
 // Secret key and public key length
@@ -30,7 +27,6 @@ static void print_key(const uint8_t *client_id)
     }
 }
 
-
 int main(int argc, char *argv[])
 {
     if (argc < 2) {
@@ -41,7 +37,13 @@ int main(int argc, char *argv[])
     long long unsigned int num_tries = 0;
 
     size_t len = strlen(argv[1]) / 2;
-    unsigned char *key = hex_string_to_bin(argv[1]);
+    unsigned char *key = (unsigned char *)malloc(len);
+    const char *hex_end = nullptr;
+    if (sodium_hex2bin(key, len, argv[1], strlen(argv[1]), nullptr, nullptr, &hex_end) != 0
+            || hex_end != argv[1] + strlen(argv[1])) {
+        printf("Invalid key provided\n");
+        return 1;
+    }
     uint8_t pub_key[KEY_LEN], priv_key[KEY_LEN], c_key[KEY_LEN];
 
     if (len > KEY_LEN) {

other/fun/sign.c

@@ -18,7 +18,6 @@
 #include <sodium.h>
 #include <string.h>
 
-#include "../../testing/misc_tools.h" // hex_string_to_bin
 #include "../../toxcore/ccompat.h"
 
 static int load_file(const char *filename, unsigned char **result)
@@ -70,7 +69,12 @@ int main(int argc, char *argv[])
     }
 
     if (argc == 5 && argv[1][0] == 's') {
-        unsigned char *secret_key = hex_string_to_bin(argv[2]);
+        const char *hex_end = nullptr;
+        if (sodium_hex2bin(sk, sizeof(sk), argv[2], strlen(argv[2]), nullptr, nullptr, &hex_end) != 0
+                || hex_end != argv[2] + strlen(argv[2])) {
+            printf("Invalid secret key provided.\n");
+            goto fail;
+        }
         unsigned char *data = nullptr;
         int size = load_file(argv[3], &data);
 
@@ -80,9 +84,8 @@ int main(int argc, char *argv[])
 
         unsigned long long smlen;
         unsigned char *sm = (unsigned char *)malloc(size + crypto_sign_ed25519_BYTES * 2);
-        crypto_sign_ed25519(sm, &smlen, data, size, secret_key);
+        crypto_sign_ed25519(sm, &smlen, data, size, sk);
         free(data);
-        free(secret_key);
 
         if (smlen - size != crypto_sign_ed25519_BYTES) {
             free(sm);
@@ -110,8 +113,13 @@ int main(int argc, char *argv[])
     }
 
     if (argc == 4 && argv[1][0] == 'c') {
-        unsigned char *public_key = hex_string_to_bin(argv[2]);
-        unsigned char *data;
+        const char *hex_end = nullptr;
+        if (sodium_hex2bin(pk, sizeof(pk), argv[2], strlen(argv[2]), nullptr, nullptr, &hex_end) != 0
+                || hex_end != argv[2] + strlen(argv[2])) {
+            printf("Invalid public key provided.\n");
+            goto fail;
+        }
+        unsigned char *data = nullptr;
         int size = load_file(argv[3], &data);
 
         if (size < 0) {
@@ -127,7 +135,7 @@ int main(int argc, char *argv[])
         unsigned char *m = (unsigned char *)malloc(size);
         unsigned long long mlen;
 
-        if (crypto_sign_ed25519_open(m, &mlen, signe, size, public_key) == -1) {
+        if (crypto_sign_ed25519_open(m, &mlen, signe, size, pk) == -1) {
             printf("Failed checking sig.\n");
             free(m);
             free(signe);