@@ -226,10 +226,9 @@ static void TestPoly1305(const std::string &hexmessage, const std::string &hexke
226
226
{
227
227
auto key = ParseHex<std::byte>(hexkey);
228
228
auto m = ParseHex<std::byte>(hexmessage);
229
- auto tag = ParseHex<std::byte>(hextag);
230
229
std::vector<std::byte> tagres (Poly1305::TAGLEN);
231
230
Poly1305{key}.Update (m).Finalize (tagres);
232
- BOOST_CHECK (tag == tagres);
231
+ BOOST_CHECK_EQUAL ( HexStr ( tagres), hextag );
233
232
234
233
// Test incremental interface
235
234
for (int splits = 0 ; splits < 10 ; ++splits) {
@@ -243,7 +242,7 @@ static void TestPoly1305(const std::string &hexmessage, const std::string &hexke
243
242
}
244
243
tagres.assign (Poly1305::TAGLEN, std::byte{});
245
244
poly1305.Update (data).Finalize (tagres);
246
- BOOST_CHECK (tag == tagres);
245
+ BOOST_CHECK_EQUAL ( HexStr ( tagres), hextag );
247
246
}
248
247
}
249
248
}
@@ -922,15 +921,15 @@ BOOST_AUTO_TEST_CASE(poly1305_testvector)
922
921
auto total_key = ParseHex<std::byte>(" 01020304050607fffefdfcfbfaf9ffffffffffffffffffffffffffff00000000" );
923
922
Poly1305 total_ctx (total_key);
924
923
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) });
927
926
std::array<std::byte, Poly1305::TAGLEN> tag;
928
927
Poly1305{key}.Update (msg).Finalize (tag);
929
928
total_ctx.Update (tag);
930
929
}
931
930
std::vector<std::byte> total_tag (Poly1305::TAGLEN);
932
931
total_ctx.Finalize (total_tag);
933
- BOOST_CHECK ( total_tag == ParseHex<std::byte>( " 64afe2e8d6ad7bbdd287f97c44623d39" ) );
932
+ BOOST_CHECK_EQUAL ( HexStr ( total_tag), " 64afe2e8d6ad7bbdd287f97c44623d39" );
934
933
}
935
934
936
935
// Tests with sparse messages and random keys.
0 commit comments