From c4ddd78d5960257e9e41c9d7cec50a06d4c5a3fb Mon Sep 17 00:00:00 2001 From: hashlag <90853356+hashlag@users.noreply.github.com> Date: Sat, 9 Aug 2025 16:55:01 +0300 Subject: [PATCH] Introduce a distinct class name for the MD4 Hasher --- Chaos/Md4.hpp | 10 +++++----- ChaosTests/Md4HasherTests.cpp | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Chaos/Md4.hpp b/Chaos/Md4.hpp index fca65e0..2c82cf4 100644 --- a/Chaos/Md4.hpp +++ b/Chaos/Md4.hpp @@ -126,7 +126,7 @@ private: } }; -struct Hash +struct Md4Hash { std::string ToHexString() const { @@ -146,10 +146,10 @@ struct Hash std::array RawDigest; }; -class Hasher +class Md4Hasher { public: - Hasher() + Md4Hasher() : BlockSize_(0) , Word_(0) , WordBytesPacked_(0) @@ -164,7 +164,7 @@ public: MessageSizeBytes_ += UpdateImpl(begin, end); } - Hash Finish() + Md4Hash Finish() { uint64_t messageSizeBytesMod64 = MessageSizeBytes_ % 64; @@ -204,7 +204,7 @@ public: UpdateImpl(encodedMessageSizeBits, encodedMessageSizeBits + std::size(encodedMessageSizeBits)); - Hash result; + Md4Hash result; int_fast8_t i = 0; for (int_fast8_t reg = 0; reg < 4; ++reg) diff --git a/ChaosTests/Md4HasherTests.cpp b/ChaosTests/Md4HasherTests.cpp index cb72ab6..0595ebd 100644 --- a/ChaosTests/Md4HasherTests.cpp +++ b/ChaosTests/Md4HasherTests.cpp @@ -2,7 +2,7 @@ #include "Md4.hpp" -using namespace Chaos; +using namespace Chaos::Md4; TEST(Md4Tests, RFCTest) { @@ -10,7 +10,7 @@ TEST(Md4Tests, RFCTest) { std::string operator()(const char * in) const { - Md4::Hasher hasher; + Md4Hasher hasher; hasher.Update(in, in + strlen(in)); return hasher.Finish().ToHexString(); } @@ -31,7 +31,7 @@ TEST(Md4Tests, PartialUpdateTest) { { // "a" - Md4::Hasher hasher; + Md4Hasher hasher; { const char * in = "a"; @@ -48,7 +48,7 @@ TEST(Md4Tests, PartialUpdateTest) { // "abc" - Md4::Hasher hasher; + Md4Hasher hasher; { const char * in = "ab"; @@ -65,7 +65,7 @@ TEST(Md4Tests, PartialUpdateTest) { // "message digest" - Md4::Hasher hasher; + Md4Hasher hasher; { const char * in = "me"; @@ -92,7 +92,7 @@ TEST(Md4Tests, PartialUpdateTest) { // "12345678901234567890123456789012345678901234567890123456789012345678901234567890" - Md4::Hasher hasher; + Md4Hasher hasher; { const char * in = "12345678901234567890"; @@ -124,7 +124,7 @@ TEST(Md4Tests, LongInputTest) { std::string operator()(const char * in) const { - Md4::Hasher hasher; + Md4Hasher hasher; hasher.Update(in, in + strlen(in)); return hasher.Finish().ToHexString(); } @@ -143,7 +143,7 @@ TEST(Md4Tests, LongInputPartialUpdateTest) { { // 2500 zeros ('0'). - Md4::Hasher hasher; + Md4Hasher hasher; std::string in(750, '0'); @@ -159,7 +159,7 @@ TEST(Md4Tests, LongInputPartialUpdateTest) { // 1000 'a' followed by 1000 'b'. - Md4::Hasher hasher; + Md4Hasher hasher; std::string inA(1000, 'a'); std::string inB(1000, 'b');