Add to_hex::buffer

This commit is contained in:
Lee *!* Clagett 2023-05-21 13:41:27 -04:00
parent 94e67bf96b
commit eb943562cb
3 changed files with 27 additions and 0 deletions

View File

@ -67,6 +67,9 @@ namespace epee
return out; return out;
} }
//! Write `src` as hex to `out`. `out` must be exactly 2x in size.
static bool buffer(span<char> out, const span<const std::uint8_t> src) noexcept;
//! Append `src` as hex to `out`. //! Append `src` as hex to `out`.
static void buffer(std::ostream& out, const span<const std::uint8_t> src); static void buffer(std::ostream& out, const span<const std::uint8_t> src);

View File

@ -69,6 +69,14 @@ namespace epee
std::string to_hex::string(const span<const std::uint8_t> src) { return convert<std::string>(src); } std::string to_hex::string(const span<const std::uint8_t> src) { return convert<std::string>(src); }
epee::wipeable_string to_hex::wipeable_string(const span<const std::uint8_t> src) { return convert<epee::wipeable_string>(src); } epee::wipeable_string to_hex::wipeable_string(const span<const std::uint8_t> src) { return convert<epee::wipeable_string>(src); }
bool to_hex::buffer(span<char> out, const span<const std::uint8_t> src) noexcept
{
if (out.size() % 2 != 0 || out.size() / 2 != src.size())
return false;
to_hex::buffer_unchecked(out.data(), src);
return true;
}
void to_hex::buffer(std::ostream& out, const span<const std::uint8_t> src) void to_hex::buffer(std::ostream& out, const span<const std::uint8_t> src)
{ {
write_hex(std::ostreambuf_iterator<char>{out}, src); write_hex(std::ostreambuf_iterator<char>{out}, src);

View File

@ -1241,6 +1241,22 @@ TEST(ToHex, ArrayFromPod)
); );
} }
TEST(ToHex, Buffer)
{
static constexpr const std::uint8_t source[] = {0xFF, 0x00, 0xAB, 0x01};
const std::vector<char> expected{'f', 'f', '0', '0', 'a', 'b', '0', '1'};
std::vector<char> buffer;
buffer.resize(expected.size());
EXPECT_TRUE(epee::to_hex::buffer(epee::to_mut_span(buffer), source));
EXPECT_EQ(expected, buffer);
buffer.pop_back();
EXPECT_FALSE(epee::to_hex::buffer(epee::to_mut_span(buffer), source));
buffer.pop_back();
EXPECT_FALSE(epee::to_hex::buffer(epee::to_mut_span(buffer), source));
}
TEST(ToHex, Ostream) TEST(ToHex, Ostream)
{ {
std::stringstream out; std::stringstream out;