diff --git a/Chaos/Hash/Hasher.hpp b/Chaos/Hash/Hasher.hpp index c3e651d..f28ca4a 100644 --- a/Chaos/Hash/Hasher.hpp +++ b/Chaos/Hash/Hasher.hpp @@ -15,8 +15,8 @@ concept Hasher = requires(T hasher, uint8_t * begin, uint8_t * end) { typename T::HashType; - requires std::unsigned_integral>; - typename std::integral_constant; + requires std::unsigned_integral>; + typename std::integral_constant; hasher.Reset(); hasher.Update(begin, end); diff --git a/Chaos/Hash/Md4.hpp b/Chaos/Hash/Md4.hpp index 64cd849..4ef3c4b 100644 --- a/Chaos/Hash/Md4.hpp +++ b/Chaos/Hash/Md4.hpp @@ -168,7 +168,7 @@ class Md4Hasher public: using HashType = Md4Hash; - static constexpr size_t BlockSizeBytes = 64; + static constexpr size_t BlockSize = 64; Md4Hasher() { diff --git a/Chaos/Hash/Md5.hpp b/Chaos/Hash/Md5.hpp index 59a8b12..08b8ce6 100644 --- a/Chaos/Hash/Md5.hpp +++ b/Chaos/Hash/Md5.hpp @@ -192,7 +192,7 @@ class Md5Hasher public: using HashType = Md5Hash; - static constexpr size_t BlockSizeBytes = 64; + static constexpr size_t BlockSize = 64; Md5Hasher() { diff --git a/Chaos/Hash/Sha1.hpp b/Chaos/Hash/Sha1.hpp index 799ef3e..a85c360 100644 --- a/Chaos/Hash/Sha1.hpp +++ b/Chaos/Hash/Sha1.hpp @@ -162,7 +162,7 @@ class Sha1Hasher public: using HashType = Sha1Hash; - static constexpr size_t BlockSizeBytes = 64; + static constexpr size_t BlockSize = 64; Sha1Hasher() { diff --git a/Chaos/Mac/Hmac.hpp b/Chaos/Mac/Hmac.hpp index 2c403db..9818852 100644 --- a/Chaos/Mac/Hmac.hpp +++ b/Chaos/Mac/Hmac.hpp @@ -53,7 +53,7 @@ public: } private: - using KeyType = std::array; + using KeyType = std::array; static constexpr uint8_t OPAD_BYTE = 0x5c; static constexpr uint8_t IPAD_BYTE = 0x36; @@ -94,7 +94,7 @@ private: keyHasher.Update(keyIt, keyEnd); auto digest = keyHasher.Finish().GetRawDigest(); - static_assert(digest.size() <= HasherImpl::BlockSizeBytes); + static_assert(digest.size() <= HasherImpl::BlockSize); key.fill(0); idx = 0;