Skip to content

Commit da0ec62

Browse files
committed
tests: miscellaneous hex / std::byte improvements
1 parent bdcbc85 commit da0ec62

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/test/crypto_tests.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,9 @@ static void TestPoly1305(const std::string &hexmessage, const std::string &hexke
226226
{
227227
auto key = ParseHex<std::byte>(hexkey);
228228
auto m = ParseHex<std::byte>(hexmessage);
229-
auto tag = ParseHex<std::byte>(hextag);
230229
std::vector<std::byte> tagres(Poly1305::TAGLEN);
231230
Poly1305{key}.Update(m).Finalize(tagres);
232-
BOOST_CHECK(tag == tagres);
231+
BOOST_CHECK_EQUAL(HexStr(tagres), hextag);
233232

234233
// Test incremental interface
235234
for (int splits = 0; splits < 10; ++splits) {
@@ -243,7 +242,7 @@ static void TestPoly1305(const std::string &hexmessage, const std::string &hexke
243242
}
244243
tagres.assign(Poly1305::TAGLEN, std::byte{});
245244
poly1305.Update(data).Finalize(tagres);
246-
BOOST_CHECK(tag == tagres);
245+
BOOST_CHECK_EQUAL(HexStr(tagres), hextag);
247246
}
248247
}
249248
}
@@ -922,15 +921,15 @@ BOOST_AUTO_TEST_CASE(poly1305_testvector)
922921
auto total_key = ParseHex<std::byte>("01020304050607fffefdfcfbfaf9ffffffffffffffffffffffffffff00000000");
923922
Poly1305 total_ctx(total_key);
924923
for (unsigned i = 0; i < 256; ++i) {
925-
std::vector<std::byte> key(32, std::byte{(uint8_t)i});
926-
std::vector<std::byte> msg(i, std::byte{(uint8_t)i});
924+
std::vector<std::byte> key(32, std::byte{uint8_t(i)});
925+
std::vector<std::byte> msg(i, std::byte{uint8_t(i)});
927926
std::array<std::byte, Poly1305::TAGLEN> tag;
928927
Poly1305{key}.Update(msg).Finalize(tag);
929928
total_ctx.Update(tag);
930929
}
931930
std::vector<std::byte> total_tag(Poly1305::TAGLEN);
932931
total_ctx.Finalize(total_tag);
933-
BOOST_CHECK(total_tag == ParseHex<std::byte>("64afe2e8d6ad7bbdd287f97c44623d39"));
932+
BOOST_CHECK_EQUAL(HexStr(total_tag), "64afe2e8d6ad7bbdd287f97c44623d39");
934933
}
935934

936935
// Tests with sparse messages and random keys.

0 commit comments

Comments
 (0)