cleanup: Remove a couple of unnecessary misc_tools dependencies

These programs link against libsodium, which already provides bin-to-hex
and hex-to-bin conversion functions. Removing the misc_tools dependency
shaves ~30KiB (in some cases 10%) off Windows static binaries using it.

Author: nurupo

other/fun/CMakeLists.txt

@@ -35,11 +35,9 @@ target_link_sodium(create_savedata)
 target_link_toxcore(create_savedata)
 
 add_executable(sign sign.c)
-target_link_libraries(sign PRIVATE misc_tools)
 target_link_sodium(sign)
 
 add_executable(cracker_simple cracker_simple.c)
-target_link_libraries(cracker_simple PRIVATE misc_tools)
 target_link_sodium(cracker_simple)
 
 find_package(OpenMP)

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
@@ -40,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);

testing/misc_tools.h

@@ -1,7 +1,9 @@
 #ifndef C_TOXCORE_TESTING_MISC_TOOLS_H
 #define C_TOXCORE_TESTING_MISC_TOOLS_H
 
-#include "../toxcore/tox.h"
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -13,7 +15,6 @@ extern "C" {
 void c_sleep(uint32_t x);
 
 uint8_t *hex_string_to_bin(const char *hex_string);
-char *id_toa(const uint8_t *id);
 void to_hex(char *out, uint8_t *in, int size);
 int tox_strncasecmp(const char *s1, const char *s2, size_t n);
 int cmdline_parsefor_ipv46(int argc, char **argv, bool *ipv6enabled);