From f2bc1bff7a47801b57f8f31e6dd4804f914637c0 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Mon, 17 Jul 2023 19:05:15 +0200 Subject: [PATCH] Update for latest nazarautils update --- include/Nazara/Core/Error.hpp | 8 +++---- include/Nazara/Core/Hash/CRC32.hpp | 6 ++--- include/Nazara/Core/Hash/CRC64.hpp | 6 ++--- include/Nazara/Core/Hash/Fletcher16.hpp | 6 ++--- include/Nazara/Core/Hash/MD5.hpp | 6 ++--- include/Nazara/Core/Hash/SHA1.hpp | 6 ++--- include/Nazara/Core/Hash/SHA224.hpp | 6 ++--- include/Nazara/Core/Hash/SHA256.hpp | 6 ++--- include/Nazara/Core/Hash/SHA384.hpp | 6 ++--- include/Nazara/Core/Hash/SHA512.hpp | 6 ++--- include/Nazara/Core/Hash/Whirlpool.hpp | 6 ++--- include/Nazara/Graphics/MaterialPipeline.inl | 1 + include/Nazara/Math/Vector2.inl | 10 ++------ include/Nazara/Math/Vector3.inl | 10 ++------ include/Nazara/Math/Vector4.inl | 12 ++-------- .../Nazara/OpenGLRenderer/OpenGLVaoCache.inl | 6 ++--- include/Nazara/Renderer/TextureSampler.inl | 23 ++++++++----------- src/Nazara/Core/AbstractHash.cpp | 20 ++++++++-------- src/Nazara/Core/Hash/CRC32.cpp | 14 +++++------ src/Nazara/Core/Hash/CRC64.cpp | 10 ++++---- src/Nazara/Core/Hash/Fletcher16.cpp | 10 ++++---- src/Nazara/Core/Hash/MD5.cpp | 12 +++++----- src/Nazara/Core/Hash/SHA1.cpp | 14 +++++------ src/Nazara/Core/Hash/SHA224.cpp | 14 +++++------ src/Nazara/Core/Hash/SHA256.cpp | 14 +++++------ src/Nazara/Core/Hash/SHA384.cpp | 14 +++++------ src/Nazara/Core/Hash/SHA512.cpp | 14 +++++------ src/Nazara/Core/Hash/Whirlpool.cpp | 12 +++++----- .../Engine/Core/AlgorithmCoreTest.cpp | 6 ----- .../Engine/Core/VirtualDirectoryTest.cpp | 4 ++-- 30 files changed, 129 insertions(+), 159 deletions(-) diff --git a/include/Nazara/Core/Error.hpp b/include/Nazara/Core/Error.hpp index 852da1f18..20e9d37ca 100644 --- a/include/Nazara/Core/Error.hpp +++ b/include/Nazara/Core/Error.hpp @@ -13,14 +13,14 @@ #include #if NAZARA_CORE_ENABLE_ASSERTS || defined(NAZARA_DEBUG) - #define NazaraAssert(a, err) if (!(a)) Nz::Error::Trigger(Nz::ErrorType::AssertFailed, err, __LINE__, __FILE__, NAZARA_FUNCTION) + #define NazaraAssert(a, err) if (!(a)) Nz::Error::Trigger(Nz::ErrorType::AssertFailed, err, __LINE__, __FILE__, NAZARA_PRETTY_FUNCTION) #else #define NazaraAssert(a, err) for (;;) break #endif -#define NazaraError(err) Nz::Error::Trigger(Nz::ErrorType::Normal, err, __LINE__, __FILE__, NAZARA_FUNCTION) -#define NazaraInternalError(err) Nz::Error::Trigger(Nz::ErrorType::Internal, err, __LINE__, __FILE__, NAZARA_FUNCTION) -#define NazaraWarning(err) Nz::Error::Trigger(Nz::ErrorType::Warning, err, __LINE__, __FILE__, NAZARA_FUNCTION) +#define NazaraError(err) Nz::Error::Trigger(Nz::ErrorType::Normal, err, __LINE__, __FILE__, NAZARA_PRETTY_FUNCTION) +#define NazaraInternalError(err) Nz::Error::Trigger(Nz::ErrorType::Internal, err, __LINE__, __FILE__, NAZARA_PRETTY_FUNCTION) +#define NazaraWarning(err) Nz::Error::Trigger(Nz::ErrorType::Warning, err, __LINE__, __FILE__, NAZARA_PRETTY_FUNCTION) namespace Nz { diff --git a/include/Nazara/Core/Hash/CRC32.hpp b/include/Nazara/Core/Hash/CRC32.hpp index 7430d061b..27d418e6a 100644 --- a/include/Nazara/Core/Hash/CRC32.hpp +++ b/include/Nazara/Core/Hash/CRC32.hpp @@ -13,11 +13,11 @@ namespace Nz { - class NAZARA_CORE_API CRC32Hash final : public AbstractHash + class NAZARA_CORE_API CRC32Hasher final : public AbstractHash { public: - CRC32Hash(UInt32 polynomial = DefaultPolynomial); - ~CRC32Hash(); + CRC32Hasher(UInt32 polynomial = DefaultPolynomial); + ~CRC32Hasher(); void Append(const UInt8* data, std::size_t len) override; void Begin() override; diff --git a/include/Nazara/Core/Hash/CRC64.hpp b/include/Nazara/Core/Hash/CRC64.hpp index 7a3b536c7..6e40df925 100644 --- a/include/Nazara/Core/Hash/CRC64.hpp +++ b/include/Nazara/Core/Hash/CRC64.hpp @@ -13,11 +13,11 @@ namespace Nz { - class NAZARA_CORE_API CRC64Hash final : public AbstractHash + class NAZARA_CORE_API CRC64Hasher final : public AbstractHash { public: - CRC64Hash() = default; - ~CRC64Hash() = default; + CRC64Hasher() = default; + ~CRC64Hasher() = default; void Append(const UInt8* data, std::size_t len) override; void Begin() override; diff --git a/include/Nazara/Core/Hash/Fletcher16.hpp b/include/Nazara/Core/Hash/Fletcher16.hpp index 11a97b6e3..30a68a919 100644 --- a/include/Nazara/Core/Hash/Fletcher16.hpp +++ b/include/Nazara/Core/Hash/Fletcher16.hpp @@ -13,11 +13,11 @@ namespace Nz { - class NAZARA_CORE_API Fletcher16Hash final : public AbstractHash + class NAZARA_CORE_API Fletcher16Hasher final : public AbstractHash { public: - Fletcher16Hash() = default; - ~Fletcher16Hash() = default; + Fletcher16Hasher() = default; + ~Fletcher16Hasher() = default; void Append(const UInt8* data, std::size_t len) override; void Begin() override; diff --git a/include/Nazara/Core/Hash/MD5.hpp b/include/Nazara/Core/Hash/MD5.hpp index 5197f0532..3f2dadfa8 100644 --- a/include/Nazara/Core/Hash/MD5.hpp +++ b/include/Nazara/Core/Hash/MD5.hpp @@ -13,11 +13,11 @@ namespace Nz { - class NAZARA_CORE_API MD5Hash final : public AbstractHash + class NAZARA_CORE_API MD5Hasher final : public AbstractHash { public: - MD5Hash() = default; - ~MD5Hash() = default; + MD5Hasher() = default; + ~MD5Hasher() = default; void Append(const UInt8* data, std::size_t len) override; void Begin() override; diff --git a/include/Nazara/Core/Hash/SHA1.hpp b/include/Nazara/Core/Hash/SHA1.hpp index 058d910a0..c9ef9a898 100644 --- a/include/Nazara/Core/Hash/SHA1.hpp +++ b/include/Nazara/Core/Hash/SHA1.hpp @@ -15,11 +15,11 @@ namespace Nz { union SHA_CTX; - class NAZARA_CORE_API SHA1Hash final : public AbstractHash + class NAZARA_CORE_API SHA1Hasher final : public AbstractHash { public: - SHA1Hash(); - ~SHA1Hash(); + SHA1Hasher(); + ~SHA1Hasher(); void Append(const UInt8* data, std::size_t len) override; void Begin() override; diff --git a/include/Nazara/Core/Hash/SHA224.hpp b/include/Nazara/Core/Hash/SHA224.hpp index c1f265874..abe456f9d 100644 --- a/include/Nazara/Core/Hash/SHA224.hpp +++ b/include/Nazara/Core/Hash/SHA224.hpp @@ -15,11 +15,11 @@ namespace Nz { union SHA_CTX; - class NAZARA_CORE_API SHA224Hash final : public AbstractHash + class NAZARA_CORE_API SHA224Hasher final : public AbstractHash { public: - SHA224Hash(); - ~SHA224Hash(); + SHA224Hasher(); + ~SHA224Hasher(); void Append(const UInt8* data, std::size_t len) override; void Begin() override; diff --git a/include/Nazara/Core/Hash/SHA256.hpp b/include/Nazara/Core/Hash/SHA256.hpp index 4a053b364..d20586120 100644 --- a/include/Nazara/Core/Hash/SHA256.hpp +++ b/include/Nazara/Core/Hash/SHA256.hpp @@ -15,11 +15,11 @@ namespace Nz { union SHA_CTX; - class NAZARA_CORE_API SHA256Hash final : public AbstractHash + class NAZARA_CORE_API SHA256Hasher final : public AbstractHash { public: - SHA256Hash(); - ~SHA256Hash(); + SHA256Hasher(); + ~SHA256Hasher(); void Append(const UInt8* data, std::size_t len) override; void Begin() override; diff --git a/include/Nazara/Core/Hash/SHA384.hpp b/include/Nazara/Core/Hash/SHA384.hpp index c4db6cada..2c595e2ce 100644 --- a/include/Nazara/Core/Hash/SHA384.hpp +++ b/include/Nazara/Core/Hash/SHA384.hpp @@ -15,11 +15,11 @@ namespace Nz { union SHA_CTX; - class NAZARA_CORE_API SHA384Hash final : public AbstractHash + class NAZARA_CORE_API SHA384Hasher final : public AbstractHash { public: - SHA384Hash(); - ~SHA384Hash(); + SHA384Hasher(); + ~SHA384Hasher(); void Append(const UInt8* data, std::size_t len) override; void Begin() override; diff --git a/include/Nazara/Core/Hash/SHA512.hpp b/include/Nazara/Core/Hash/SHA512.hpp index bc00722af..3bc779510 100644 --- a/include/Nazara/Core/Hash/SHA512.hpp +++ b/include/Nazara/Core/Hash/SHA512.hpp @@ -15,11 +15,11 @@ namespace Nz { union SHA_CTX; - class NAZARA_CORE_API SHA512Hash final : public AbstractHash + class NAZARA_CORE_API SHA512Hasher final : public AbstractHash { public: - SHA512Hash(); - ~SHA512Hash(); + SHA512Hasher(); + ~SHA512Hasher(); void Append(const UInt8* data, std::size_t len) override; void Begin() override; diff --git a/include/Nazara/Core/Hash/Whirlpool.hpp b/include/Nazara/Core/Hash/Whirlpool.hpp index 0c7195642..e80d2275c 100644 --- a/include/Nazara/Core/Hash/Whirlpool.hpp +++ b/include/Nazara/Core/Hash/Whirlpool.hpp @@ -13,11 +13,11 @@ namespace Nz { - class NAZARA_CORE_API WhirlpoolHash final : public AbstractHash + class NAZARA_CORE_API WhirlpoolHasher final : public AbstractHash { public: - WhirlpoolHash() = default; - ~WhirlpoolHash() = default; + WhirlpoolHasher() = default; + ~WhirlpoolHasher() = default; void Append(const UInt8* data, std::size_t len) override; void Begin() override; diff --git a/include/Nazara/Graphics/MaterialPipeline.inl b/include/Nazara/Graphics/MaterialPipeline.inl index fefde2aee..aef047929 100644 --- a/include/Nazara/Graphics/MaterialPipeline.inl +++ b/include/Nazara/Graphics/MaterialPipeline.inl @@ -3,6 +3,7 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include +#include #include #include diff --git a/include/Nazara/Math/Vector2.inl b/include/Nazara/Math/Vector2.inl index c92389bea..258293494 100644 --- a/include/Nazara/Math/Vector2.inl +++ b/include/Nazara/Math/Vector2.inl @@ -2,7 +2,7 @@ // This file is part of the "Nazara Engine - Math module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include #include #include @@ -774,15 +774,9 @@ namespace std */ std::size_t operator()(const Nz::Vector2& v) const { - std::size_t seed {}; - - Nz::HashCombine(seed, v.x); - Nz::HashCombine(seed, v.y); - - return seed; + return Nz::HashCombine(v.x, v.y); } }; } #include -#include "Vector2.hpp" diff --git a/include/Nazara/Math/Vector3.inl b/include/Nazara/Math/Vector3.inl index 7b77f9a37..b66c3cc4f 100644 --- a/include/Nazara/Math/Vector3.inl +++ b/include/Nazara/Math/Vector3.inl @@ -2,7 +2,7 @@ // This file is part of the "Nazara Engine - Math module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include #include #include @@ -990,13 +990,7 @@ namespace std std::size_t operator()(const Nz::Vector3& v) const { - std::size_t seed {}; - - Nz::HashCombine(seed, v.x); - Nz::HashCombine(seed, v.y); - Nz::HashCombine(seed, v.z); - - return seed; + return Nz::HashCombine(v.x, v.y, v.z); } }; } diff --git a/include/Nazara/Math/Vector4.inl b/include/Nazara/Math/Vector4.inl index c1d455913..ecc2203bb 100644 --- a/include/Nazara/Math/Vector4.inl +++ b/include/Nazara/Math/Vector4.inl @@ -2,7 +2,7 @@ // This file is part of the "Nazara Engine - Math module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include #include #include @@ -808,17 +808,9 @@ namespace std */ std::size_t operator()(const Nz::Vector4& v) const { - std::size_t seed {}; - - Nz::HashCombine(seed, v.x); - Nz::HashCombine(seed, v.y); - Nz::HashCombine(seed, v.z); - Nz::HashCombine(seed, v.w); - - return seed; + return Nz::HashCombine(v.x, v.y, v.z, v.w); } }; } #include -#include "Vector4.hpp" diff --git a/include/Nazara/OpenGLRenderer/OpenGLVaoCache.inl b/include/Nazara/OpenGLRenderer/OpenGLVaoCache.inl index 84b81443a..e932eff31 100644 --- a/include/Nazara/OpenGLRenderer/OpenGLVaoCache.inl +++ b/include/Nazara/OpenGLRenderer/OpenGLVaoCache.inl @@ -2,7 +2,7 @@ // This file is part of the "Nazara Engine - OpenGL renderer" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include namespace Nz::GL @@ -50,9 +50,7 @@ namespace Nz::GL inline std::size_t OpenGLVaoSetupHasher::operator()(const OpenGLVaoSetup& setup) const { - std::size_t seed = 0; - - HashCombine(seed, setup.indexBuffer); + std::size_t seed = std::hash{}(setup.indexBuffer); std::size_t bindingIndex = 0; for (const auto& attribOpt : setup.vertexAttribs) diff --git a/include/Nazara/Renderer/TextureSampler.inl b/include/Nazara/Renderer/TextureSampler.inl index 282766f75..0862e0fee 100644 --- a/include/Nazara/Renderer/TextureSampler.inl +++ b/include/Nazara/Renderer/TextureSampler.inl @@ -2,7 +2,7 @@ // This file is part of the "Nazara Engine - Renderer module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include namespace Nz @@ -50,18 +50,15 @@ struct std::hash { std::size_t operator()(const Nz::TextureSamplerInfo& sampler) const { - std::size_t seed = 0; - Nz::HashCombine(seed, sampler.anisotropyLevel); - Nz::HashCombine(seed, sampler.magFilter); - Nz::HashCombine(seed, sampler.minFilter); - Nz::HashCombine(seed, sampler.mipmapMode); - Nz::HashCombine(seed, sampler.wrapModeU); - Nz::HashCombine(seed, sampler.wrapModeV); - Nz::HashCombine(seed, sampler.wrapModeW); - Nz::HashCombine(seed, sampler.depthCompare); - Nz::HashCombine(seed, sampler.depthComparison); - - return seed; + return Nz::HashCombine(sampler.anisotropyLevel, + sampler.magFilter, + sampler.minFilter, + sampler.mipmapMode, + sampler.wrapModeU, + sampler.wrapModeV, + sampler.wrapModeW, + sampler.depthCompare, + sampler.depthComparison); } }; diff --git a/src/Nazara/Core/AbstractHash.cpp b/src/Nazara/Core/AbstractHash.cpp index 5fdefa029..b6a465e97 100644 --- a/src/Nazara/Core/AbstractHash.cpp +++ b/src/Nazara/Core/AbstractHash.cpp @@ -46,34 +46,34 @@ namespace Nz switch (type) { case HashType::Fletcher16: - return std::make_unique(); + return std::make_unique(); case HashType::CRC32: - return std::make_unique(); + return std::make_unique(); case HashType::CRC64: - return std::make_unique(); + return std::make_unique(); case HashType::MD5: - return std::make_unique(); + return std::make_unique(); case HashType::SHA1: - return std::make_unique(); + return std::make_unique(); case HashType::SHA224: - return std::make_unique(); + return std::make_unique(); case HashType::SHA256: - return std::make_unique(); + return std::make_unique(); case HashType::SHA384: - return std::make_unique(); + return std::make_unique(); case HashType::SHA512: - return std::make_unique(); + return std::make_unique(); case HashType::Whirlpool: - return std::make_unique(); + return std::make_unique(); } NazaraInternalError("Hash type not handled (0x" + NumberToString(UnderlyingCast(type), 16) + ')'); diff --git a/src/Nazara/Core/Hash/CRC32.cpp b/src/Nazara/Core/Hash/CRC32.cpp index ebc3064f1..8cde08245 100644 --- a/src/Nazara/Core/Hash/CRC32.cpp +++ b/src/Nazara/Core/Hash/CRC32.cpp @@ -61,7 +61,7 @@ namespace Nz }; } - CRC32Hash::CRC32Hash(UInt32 polynomial) + CRC32Hasher::CRC32Hasher(UInt32 polynomial) { NAZARA_USE_ANONYMOUS_NAMESPACE @@ -84,7 +84,7 @@ namespace Nz } } - CRC32Hash::~CRC32Hash() + CRC32Hasher::~CRC32Hasher() { NAZARA_USE_ANONYMOUS_NAMESPACE @@ -92,18 +92,18 @@ namespace Nz delete[] m_table; } - void CRC32Hash::Append(const UInt8* data, std::size_t len) + void CRC32Hasher::Append(const UInt8* data, std::size_t len) { while (len--) m_crc = m_table[(m_crc ^ *data++) & 0xFF] ^ (m_crc >> 8); } - void CRC32Hash::Begin() + void CRC32Hasher::Begin() { m_crc = 0xFFFFFFFF; } - ByteArray CRC32Hash::End() + ByteArray CRC32Hasher::End() { m_crc ^= 0xFFFFFFFF; @@ -114,12 +114,12 @@ namespace Nz return ByteArray(reinterpret_cast(&m_crc), 4); } - std::size_t CRC32Hash::GetDigestLength() const + std::size_t CRC32Hasher::GetDigestLength() const { return 4; } - const char* CRC32Hash::GetHashName() const + const char* CRC32Hasher::GetHashName() const { return "CRC32"; } diff --git a/src/Nazara/Core/Hash/CRC64.cpp b/src/Nazara/Core/Hash/CRC64.cpp index ea18359a1..87817d4ad 100644 --- a/src/Nazara/Core/Hash/CRC64.cpp +++ b/src/Nazara/Core/Hash/CRC64.cpp @@ -78,7 +78,7 @@ namespace Nz }; } - void CRC64Hash::Append(const UInt8* data, std::size_t len) + void CRC64Hasher::Append(const UInt8* data, std::size_t len) { NAZARA_USE_ANONYMOUS_NAMESPACE @@ -86,12 +86,12 @@ namespace Nz m_crc = (m_crc << 8) ^ crc64_table[((m_crc >> 56) ^ *data++) & 0xFF]; } - void CRC64Hash::Begin() + void CRC64Hasher::Begin() { m_crc = 0; } - ByteArray CRC64Hash::End() + ByteArray CRC64Hasher::End() { #ifdef NAZARA_LITTLE_ENDIAN SwapBytes(&m_crc, sizeof(UInt64)); @@ -100,12 +100,12 @@ namespace Nz return ByteArray(reinterpret_cast(&m_crc), 8); } - std::size_t CRC64Hash::GetDigestLength() const + std::size_t CRC64Hasher::GetDigestLength() const { return 8; } - const char* CRC64Hash::GetHashName() const + const char* CRC64Hasher::GetHashName() const { return "CRC64"; } diff --git a/src/Nazara/Core/Hash/Fletcher16.cpp b/src/Nazara/Core/Hash/Fletcher16.cpp index 7a567fbe3..8071ef2b3 100644 --- a/src/Nazara/Core/Hash/Fletcher16.cpp +++ b/src/Nazara/Core/Hash/Fletcher16.cpp @@ -8,7 +8,7 @@ namespace Nz { - void Fletcher16Hash::Append(const UInt8* data, std::size_t len) + void Fletcher16Hasher::Append(const UInt8* data, std::size_t len) { while (len > 0) { @@ -27,13 +27,13 @@ namespace Nz } } - void Fletcher16Hash::Begin() + void Fletcher16Hasher::Begin() { m_sum1 = 0xFF; m_sum2 = 0xFF; } - ByteArray Fletcher16Hash::End() + ByteArray Fletcher16Hasher::End() { m_sum1 = (m_sum1 & 0xFF) + (m_sum1 >> 8); m_sum2 = (m_sum2 & 0xFF) + (m_sum2 >> 8); @@ -47,12 +47,12 @@ namespace Nz return ByteArray(reinterpret_cast(&fletcher), 2); } - std::size_t Fletcher16Hash::GetDigestLength() const + std::size_t Fletcher16Hasher::GetDigestLength() const { return 2; } - const char* Fletcher16Hash::GetHashName() const + const char* Fletcher16Hasher::GetHashName() const { return "Fletcher16"; } diff --git a/src/Nazara/Core/Hash/MD5.cpp b/src/Nazara/Core/Hash/MD5.cpp index 086225978..4a0108308 100644 --- a/src/Nazara/Core/Hash/MD5.cpp +++ b/src/Nazara/Core/Hash/MD5.cpp @@ -99,7 +99,7 @@ namespace Nz { - void MD5Hash::Append(const UInt8* data, std::size_t len) + void MD5Hasher::Append(const UInt8* data, std::size_t len) { const UInt8 *p = data; std::size_t left = len; @@ -138,7 +138,7 @@ namespace Nz std::memcpy(m_buf, p, left); } - void MD5Hash::Begin() + void MD5Hasher::Begin() { m_count[0] = m_count[1] = 0; m_abcd[0] = 0x67452301; @@ -147,7 +147,7 @@ namespace Nz m_abcd[3] = 0x10325476; } - ByteArray MD5Hash::End() + ByteArray MD5Hasher::End() { static const unsigned char pad[64] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -174,17 +174,17 @@ namespace Nz return ByteArray(&digest[0], 16); } - std::size_t MD5Hash::GetDigestLength() const + std::size_t MD5Hasher::GetDigestLength() const { return 16; } - const char* MD5Hash::GetHashName() const + const char* MD5Hasher::GetHashName() const { return "MD5"; } - void MD5Hash::md5_process(const UInt8* data) + void MD5Hasher::md5_process(const UInt8* data) { UInt32 a = m_abcd[0]; UInt32 b = m_abcd[1]; diff --git a/src/Nazara/Core/Hash/SHA1.cpp b/src/Nazara/Core/Hash/SHA1.cpp index 43ab8deb0..f8c1100cf 100644 --- a/src/Nazara/Core/Hash/SHA1.cpp +++ b/src/Nazara/Core/Hash/SHA1.cpp @@ -8,27 +8,27 @@ namespace Nz { - SHA1Hash::SHA1Hash() + SHA1Hasher::SHA1Hasher() { m_state = new SHA_CTX; } - SHA1Hash::~SHA1Hash() + SHA1Hasher::~SHA1Hasher() { delete m_state; } - void SHA1Hash::Append(const UInt8* data, std::size_t len) + void SHA1Hasher::Append(const UInt8* data, std::size_t len) { SHA1_Update(m_state, data, len); } - void SHA1Hash::Begin() + void SHA1Hasher::Begin() { SHA1_Init(m_state); } - ByteArray SHA1Hash::End() + ByteArray SHA1Hasher::End() { UInt8 digest[SHA1_DIGEST_LENGTH]; @@ -37,12 +37,12 @@ namespace Nz return ByteArray(digest, SHA1_DIGEST_LENGTH); } - std::size_t SHA1Hash::GetDigestLength() const + std::size_t SHA1Hasher::GetDigestLength() const { return SHA1_DIGEST_LENGTH; } - const char* SHA1Hash::GetHashName() const + const char* SHA1Hasher::GetHashName() const { return "SHA1"; } diff --git a/src/Nazara/Core/Hash/SHA224.cpp b/src/Nazara/Core/Hash/SHA224.cpp index 7fb042d4d..1fcb08eea 100644 --- a/src/Nazara/Core/Hash/SHA224.cpp +++ b/src/Nazara/Core/Hash/SHA224.cpp @@ -8,27 +8,27 @@ namespace Nz { - SHA224Hash::SHA224Hash() + SHA224Hasher::SHA224Hasher() { m_state = new SHA_CTX; } - SHA224Hash::~SHA224Hash() + SHA224Hasher::~SHA224Hasher() { delete m_state; } - void SHA224Hash::Append(const UInt8* data, std::size_t len) + void SHA224Hasher::Append(const UInt8* data, std::size_t len) { SHA224_Update(m_state, data, len); } - void SHA224Hash::Begin() + void SHA224Hasher::Begin() { SHA224_Init(m_state); } - ByteArray SHA224Hash::End() + ByteArray SHA224Hasher::End() { UInt8 digest[SHA224_DIGEST_LENGTH]; @@ -37,12 +37,12 @@ namespace Nz return ByteArray(digest, SHA224_DIGEST_LENGTH); } - std::size_t SHA224Hash::GetDigestLength() const + std::size_t SHA224Hasher::GetDigestLength() const { return SHA224_DIGEST_LENGTH; } - const char* SHA224Hash::GetHashName() const + const char* SHA224Hasher::GetHashName() const { return "SHA224"; } diff --git a/src/Nazara/Core/Hash/SHA256.cpp b/src/Nazara/Core/Hash/SHA256.cpp index 69e5020dd..3e23feda4 100644 --- a/src/Nazara/Core/Hash/SHA256.cpp +++ b/src/Nazara/Core/Hash/SHA256.cpp @@ -8,27 +8,27 @@ namespace Nz { - SHA256Hash::SHA256Hash() + SHA256Hasher::SHA256Hasher() { m_state = new SHA_CTX; } - SHA256Hash::~SHA256Hash() + SHA256Hasher::~SHA256Hasher() { delete m_state; } - void SHA256Hash::Append(const UInt8* data, std::size_t len) + void SHA256Hasher::Append(const UInt8* data, std::size_t len) { SHA256_Update(m_state, data, len); } - void SHA256Hash::Begin() + void SHA256Hasher::Begin() { SHA256_Init(m_state); } - ByteArray SHA256Hash::End() + ByteArray SHA256Hasher::End() { UInt8 digest[SHA256_DIGEST_LENGTH]; @@ -37,12 +37,12 @@ namespace Nz return ByteArray(digest, SHA256_DIGEST_LENGTH); } - std::size_t SHA256Hash::GetDigestLength() const + std::size_t SHA256Hasher::GetDigestLength() const { return SHA256_DIGEST_LENGTH; } - const char* SHA256Hash::GetHashName() const + const char* SHA256Hasher::GetHashName() const { return "SHA256"; } diff --git a/src/Nazara/Core/Hash/SHA384.cpp b/src/Nazara/Core/Hash/SHA384.cpp index d7e04632c..2098ba957 100644 --- a/src/Nazara/Core/Hash/SHA384.cpp +++ b/src/Nazara/Core/Hash/SHA384.cpp @@ -8,27 +8,27 @@ namespace Nz { - SHA384Hash::SHA384Hash() + SHA384Hasher::SHA384Hasher() { m_state = new SHA_CTX; } - SHA384Hash::~SHA384Hash() + SHA384Hasher::~SHA384Hasher() { delete m_state; } - void SHA384Hash::Append(const UInt8* data, std::size_t len) + void SHA384Hasher::Append(const UInt8* data, std::size_t len) { SHA384_Update(m_state, data, len); } - void SHA384Hash::Begin() + void SHA384Hasher::Begin() { SHA384_Init(m_state); } - ByteArray SHA384Hash::End() + ByteArray SHA384Hasher::End() { UInt8 digest[SHA384_DIGEST_LENGTH]; @@ -37,12 +37,12 @@ namespace Nz return ByteArray(digest, SHA384_DIGEST_LENGTH); } - std::size_t SHA384Hash::GetDigestLength() const + std::size_t SHA384Hasher::GetDigestLength() const { return SHA384_DIGEST_LENGTH; } - const char* SHA384Hash::GetHashName() const + const char* SHA384Hasher::GetHashName() const { return "SHA384"; } diff --git a/src/Nazara/Core/Hash/SHA512.cpp b/src/Nazara/Core/Hash/SHA512.cpp index 403ac9960..0815f5c81 100644 --- a/src/Nazara/Core/Hash/SHA512.cpp +++ b/src/Nazara/Core/Hash/SHA512.cpp @@ -8,27 +8,27 @@ namespace Nz { - SHA512Hash::SHA512Hash() + SHA512Hasher::SHA512Hasher() { m_state = new SHA_CTX; } - SHA512Hash::~SHA512Hash() + SHA512Hasher::~SHA512Hasher() { delete m_state; } - void SHA512Hash::Append(const UInt8* data, std::size_t len) + void SHA512Hasher::Append(const UInt8* data, std::size_t len) { SHA512_Update(m_state, data, len); } - void SHA512Hash::Begin() + void SHA512Hasher::Begin() { SHA512_Init(m_state); } - ByteArray SHA512Hash::End() + ByteArray SHA512Hasher::End() { UInt8 digest[SHA512_DIGEST_LENGTH]; @@ -37,12 +37,12 @@ namespace Nz return ByteArray(digest, SHA512_DIGEST_LENGTH); } - std::size_t SHA512Hash::GetDigestLength() const + std::size_t SHA512Hasher::GetDigestLength() const { return SHA512_DIGEST_LENGTH; } - const char* SHA512Hash::GetHashName() const + const char* SHA512Hasher::GetHashName() const { return "SHA512"; } diff --git a/src/Nazara/Core/Hash/Whirlpool.cpp b/src/Nazara/Core/Hash/Whirlpool.cpp index d35fa49c3..ff0e6e111 100644 --- a/src/Nazara/Core/Hash/Whirlpool.cpp +++ b/src/Nazara/Core/Hash/Whirlpool.cpp @@ -626,7 +626,7 @@ namespace Nz }; } - void WhirlpoolHash::Append(const UInt8* data, std::size_t len) + void WhirlpoolHasher::Append(const UInt8* data, std::size_t len) { len *= 8; // Whirlpool works with bits @@ -713,7 +713,7 @@ namespace Nz m_bufferPos = bufferPos; } - void WhirlpoolHash::Begin() + void WhirlpoolHasher::Begin() { std::memset(m_bitLength, 0, 32); m_bufferBits = m_bufferPos = 0; @@ -722,7 +722,7 @@ namespace Nz m_hash[i] = 0L; // initial value } - ByteArray WhirlpoolHash::End() + ByteArray WhirlpoolHasher::End() { UInt8 result[64]; @@ -775,18 +775,18 @@ namespace Nz return ByteArray(&result[0], 64); } - std::size_t WhirlpoolHash::GetDigestLength() const + std::size_t WhirlpoolHasher::GetDigestLength() const { return 64; } - const char* WhirlpoolHash::GetHashName() const + const char* WhirlpoolHasher::GetHashName() const { return "Whirlpool"; } - void WhirlpoolHash::ProcessBuffer() + void WhirlpoolHasher::ProcessBuffer() { NAZARA_USE_ANONYMOUS_NAMESPACE diff --git a/tests/UnitTests/Engine/Core/AlgorithmCoreTest.cpp b/tests/UnitTests/Engine/Core/AlgorithmCoreTest.cpp index 5340ecb62..ca3411833 100644 --- a/tests/UnitTests/Engine/Core/AlgorithmCoreTest.cpp +++ b/tests/UnitTests/Engine/Core/AlgorithmCoreTest.cpp @@ -21,12 +21,6 @@ TEST_CASE("ComputeHash", "[CORE][ALGORITHM]") const char* expectedOutput; }; - static_assert(Nz::CRC32("Nazara Engine") == 0x8A2F5235); - static_assert(Nz::CRC32("The quick brown fox jumps over the lazy dog") == 0x414FA339); - - CHECK(Nz::CRC32("Nazara Engine") == 0x8A2F5235); - CHECK(Nz::CRC32("The quick brown fox jumps over the lazy dog") == 0x414FA339); - // https://defuse.ca/checksums.htm // https://toolslick.com/programming/hashing/crc-calculator diff --git a/tests/UnitTests/Engine/Core/VirtualDirectoryTest.cpp b/tests/UnitTests/Engine/Core/VirtualDirectoryTest.cpp index 81edf873b..05c7ae038 100644 --- a/tests/UnitTests/Engine/Core/VirtualDirectoryTest.cpp +++ b/tests/UnitTests/Engine/Core/VirtualDirectoryTest.cpp @@ -208,7 +208,7 @@ TEST_CASE("VirtualDirectory", "[Core][VirtualDirectory]") const auto& physFileEntry = std::get(entry); - Nz::SHA256Hash hash; + Nz::SHA256Hasher hash; WHEN("We compute " << hash.GetHashName() << " of " << physFileEntry.stream->GetPath() << " file") { CHECK(Nz::ToUpper(Nz::ComputeHash(hash, *physFileEntry.stream).ToHex()) == expectedHash); @@ -221,7 +221,7 @@ TEST_CASE("VirtualDirectory", "[Core][VirtualDirectory]") { return dir->GetFileContent(filepath, [&](const void* data, std::size_t size) { - Nz::SHA256Hash hash; + Nz::SHA256Hasher hash; WHEN("We compute " << hash.GetHashName() << " of " << filepath << " file") { hash.Begin();