Squashed 'external/toxcore/c-toxcore/' changes from 1828c5356..c9cdae001
c9cdae001 fix(toxav): remove extra copy of video frame on encode 4f6d4546b test: Improve the fake network library. a2581e700 refactor(toxcore): generate `Friend_Request` and `Dht_Nodes_Response` 2aaa11770 refactor(toxcore): use Tox_Memory in generated events 5c367452b test(toxcore): fix incorrect mutex in tox_scenario_get_time 8f92e710f perf: Add a timed limit of number of cookie requests. 695b6417a test: Add some more simulated network support. 815ae9ce9 test(toxcore): fix thread-safety in scenario framework 6d85c754e test(toxcore): add unit tests for net_crypto 9c22e79cc test(support): add SimulatedEnvironment for deterministic testing f34fcb195 chore: Update windows Dockerfile to debian stable (trixie). ece0e8980 fix(group_moderation): allow validating unsorted sanction list signatures a4fa754d7 refactor: rename struct Packet to struct Net_Packet d6f330f85 cleanup: Fix some warnings from coverity. e206bffa2 fix(group_chats): fix sync packets reverting topics 0e4715598 test: Add new scenario testing framework. 668291f44 refactor(toxcore): decouple Network_Funcs from sockaddr via IP_Port fc4396cef fix: potential division by zero in toxav and unsafe hex parsing 8e8b352ab refactor: Add nullable annotations to struct members. 7740bb421 refactor: decouple net_crypto from DHT 1936d4296 test: add benchmark for toxav audio and video 46bfdc2df fix: correct printf format specifiers for unsigned integers REVERT: 1828c5356 fix(toxav): remove extra copy of video frame on encode git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: c9cdae001341e701fca980c9bb9febfeb95d2902
This commit is contained in:
@@ -1,4 +1,7 @@
|
||||
// clang-format off
|
||||
#include "../testing/support/public/simulated_environment.hh"
|
||||
#include "crypto_core.h"
|
||||
// clang-format on
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
@@ -7,7 +10,6 @@
|
||||
#include <vector>
|
||||
|
||||
#include "crypto_core_test_util.hh"
|
||||
#include "mem_test_util.hh"
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -17,29 +19,31 @@ using SecretKey = std::array<uint8_t, CRYPTO_SECRET_KEY_SIZE>;
|
||||
using Signature = std::array<uint8_t, CRYPTO_SIGNATURE_SIZE>;
|
||||
using Nonce = std::array<uint8_t, CRYPTO_NONCE_SIZE>;
|
||||
|
||||
using tox::test::SimulatedEnvironment;
|
||||
|
||||
TEST(PkEqual, TwoRandomIdsAreNotEqual)
|
||||
{
|
||||
std::mt19937 rng;
|
||||
std::uniform_int_distribution<unsigned short> dist{0, UINT8_MAX};
|
||||
SimulatedEnvironment env;
|
||||
auto &rng = env.fake_random();
|
||||
|
||||
uint8_t pk1[CRYPTO_PUBLIC_KEY_SIZE];
|
||||
uint8_t pk2[CRYPTO_PUBLIC_KEY_SIZE];
|
||||
|
||||
std::generate(std::begin(pk1), std::end(pk1), [&]() { return dist(rng); });
|
||||
std::generate(std::begin(pk2), std::end(pk2), [&]() { return dist(rng); });
|
||||
rng.bytes(pk1, sizeof(pk1));
|
||||
rng.bytes(pk2, sizeof(pk2));
|
||||
|
||||
EXPECT_FALSE(pk_equal(pk1, pk2));
|
||||
}
|
||||
|
||||
TEST(PkEqual, IdCopyMakesKeysEqual)
|
||||
{
|
||||
std::mt19937 rng;
|
||||
std::uniform_int_distribution<unsigned short> dist{0, UINT8_MAX};
|
||||
SimulatedEnvironment env;
|
||||
auto &rng = env.fake_random();
|
||||
|
||||
uint8_t pk1[CRYPTO_PUBLIC_KEY_SIZE];
|
||||
uint8_t pk2[CRYPTO_PUBLIC_KEY_SIZE] = {0};
|
||||
|
||||
std::generate(std::begin(pk1), std::end(pk1), [&]() { return dist(rng); });
|
||||
rng.bytes(pk1, sizeof(pk1));
|
||||
|
||||
pk_copy(pk2, pk1);
|
||||
|
||||
@@ -48,20 +52,21 @@ TEST(PkEqual, IdCopyMakesKeysEqual)
|
||||
|
||||
TEST(CryptoCore, EncryptLargeData)
|
||||
{
|
||||
Test_Memory mem;
|
||||
Test_Random rng;
|
||||
SimulatedEnvironment env;
|
||||
auto c_mem = env.fake_memory().get_c_memory();
|
||||
auto c_rng = env.fake_random().get_c_random();
|
||||
|
||||
Nonce nonce{};
|
||||
PublicKey pk;
|
||||
SecretKey sk;
|
||||
crypto_new_keypair(rng, pk.data(), sk.data());
|
||||
crypto_new_keypair(&c_rng, pk.data(), sk.data());
|
||||
|
||||
// 100 MiB of data (all zeroes, doesn't matter what's inside).
|
||||
std::vector<uint8_t> plain(100 * 1024 * 1024);
|
||||
std::vector<uint8_t> encrypted(plain.size() + CRYPTO_MAC_SIZE);
|
||||
|
||||
encrypt_data(
|
||||
mem, pk.data(), sk.data(), nonce.data(), plain.data(), plain.size(), encrypted.data());
|
||||
&c_mem, pk.data(), sk.data(), nonce.data(), plain.data(), plain.size(), encrypted.data());
|
||||
}
|
||||
|
||||
TEST(CryptoCore, IncrementNonce)
|
||||
@@ -99,12 +104,13 @@ TEST(CryptoCore, IncrementNonceNumber)
|
||||
|
||||
TEST(CryptoCore, Signatures)
|
||||
{
|
||||
Test_Random rng;
|
||||
SimulatedEnvironment env;
|
||||
auto c_rng = env.fake_random().get_c_random();
|
||||
|
||||
Extended_Public_Key pk;
|
||||
Extended_Secret_Key sk;
|
||||
|
||||
EXPECT_TRUE(create_extended_keypair(&pk, &sk, rng));
|
||||
EXPECT_TRUE(create_extended_keypair(&pk, &sk, &c_rng));
|
||||
|
||||
std::vector<uint8_t> message{0};
|
||||
message.clear();
|
||||
@@ -117,16 +123,17 @@ TEST(CryptoCore, Signatures)
|
||||
EXPECT_TRUE(crypto_signature_verify(
|
||||
signature.data(), message.data(), message.size(), get_sig_pk(&pk)));
|
||||
|
||||
message.push_back(random_u08(rng));
|
||||
message.push_back(random_u08(&c_rng));
|
||||
}
|
||||
}
|
||||
|
||||
TEST(CryptoCore, Hmac)
|
||||
{
|
||||
Test_Random rng;
|
||||
SimulatedEnvironment env;
|
||||
auto c_rng = env.fake_random().get_c_random();
|
||||
|
||||
HmacKey sk;
|
||||
new_hmac_key(rng, sk.data());
|
||||
new_hmac_key(&c_rng, sk.data());
|
||||
|
||||
std::vector<uint8_t> message{0};
|
||||
message.clear();
|
||||
@@ -137,7 +144,7 @@ TEST(CryptoCore, Hmac)
|
||||
crypto_hmac(auth.data(), sk.data(), message.data(), message.size());
|
||||
EXPECT_TRUE(crypto_hmac_verify(auth.data(), sk.data(), message.data(), message.size()));
|
||||
|
||||
message.push_back(random_u08(rng));
|
||||
message.push_back(random_u08(&c_rng));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user