lib: Switch to std::vector<std::uint8_t> for fingerprint data

This commit is contained in:
Povilas Kanapickas
2021-11-01 02:52:37 +02:00
parent ef08470286
commit cd7e731cb7
9 changed files with 21 additions and 22 deletions

View File

@@ -20,18 +20,18 @@
namespace barrier {
std::string generate_pseudo_random_bytes(std::size_t seed, std::size_t size)
std::vector<std::uint8_t> generate_pseudo_random_bytes(std::size_t seed, std::size_t size)
{
std::mt19937_64 engine{seed};
std::uniform_int_distribution<int> dist{0, 255};
std::vector<char> bytes;
std::vector<std::uint8_t> bytes;
bytes.reserve(size);
for (std::size_t i = 0; i < size; ++i) {
bytes.push_back(dist(engine));
}
return std::string{bytes.data(), bytes.size()};
return bytes;
}
} // namespace barrier

View File

@@ -19,11 +19,11 @@
#define BARRIER_TEST_GLOBAL_TEST_UTILS_H
#include <cstdint>
#include <string>
#include <vector>
namespace barrier {
std::string generate_pseudo_random_bytes(std::size_t seed, std::size_t size);
std::vector<std::uint8_t> generate_pseudo_random_bytes(std::size_t seed, std::size_t size);
} // namespace barrier

View File

@@ -56,7 +56,7 @@ TEST(StringTests, sprintf_formatWithArgument_formatedString)
TEST(StringTests, toHex_plaintext_hexString)
{
String subject = "foobar";
std::vector<std::uint8_t> subject{'f', 'o', 'o', 'b', 'a', 'r'};
int width = 2;
EXPECT_EQ("666f6f626172", string::to_hex(subject, width));

View File

@@ -24,8 +24,8 @@ namespace barrier {
TEST(SecureUtilsTest, FormatSslFingerprintHexWithSeparators)
{
std::string fingerprint = generate_pseudo_random_bytes(0, 32);
ASSERT_EQ(format_ssl_fingerprint(fingerprint, true, true),
auto fingerprint = generate_pseudo_random_bytes(0, 32);
ASSERT_EQ(format_ssl_fingerprint(fingerprint, true),
"28:FD:0A:98:8A:0E:A1:6C:D7:E8:6C:A7:EE:58:41:71:"
"CA:B2:8E:49:25:94:90:25:26:05:8D:AF:63:ED:2E:30");
}