Core: Reworked hashes
-Removed HashDigest class (replaced by ByteArray) -Removed Hashable/Hash classes (replaced by ComputeHash function and Hashable template struct) -Fixed ByteArray operator<< -Renamed File::GetHash to File::ComputeHash Former-commit-id: cc5eaf2d4c88a556878190b8205e66713512e2d2
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <Nazara/Prerequesites.hpp>
|
||||
#include <Nazara/Core/AbstractHash.hpp>
|
||||
#include <Nazara/Core/HashDigest.hpp>
|
||||
#include <Nazara/Core/ByteArray.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
@@ -21,12 +21,12 @@ namespace Nz
|
||||
HashCRC32(UInt32 polynomial = 0x04c11db7);
|
||||
virtual ~HashCRC32();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len);
|
||||
void Begin();
|
||||
HashDigest End();
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
static unsigned int GetDigestLength();
|
||||
static String GetHashName();
|
||||
unsigned int GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
HashCRC32_state* m_state;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <Nazara/Prerequesites.hpp>
|
||||
#include <Nazara/Core/AbstractHash.hpp>
|
||||
#include <Nazara/Core/HashDigest.hpp>
|
||||
#include <Nazara/Core/ByteArray.hpp>
|
||||
#include <Nazara/Core/String.hpp>
|
||||
|
||||
namespace Nz
|
||||
@@ -22,12 +22,12 @@ namespace Nz
|
||||
HashFletcher16();
|
||||
virtual ~HashFletcher16();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len);
|
||||
void Begin();
|
||||
HashDigest End();
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
static unsigned int GetDigestLength();
|
||||
static String GetHashName();
|
||||
unsigned int GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
HashFletcher16_state* m_state;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <Nazara/Prerequesites.hpp>
|
||||
#include <Nazara/Core/AbstractHash.hpp>
|
||||
#include <Nazara/Core/HashDigest.hpp>
|
||||
#include <Nazara/Core/ByteArray.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
@@ -21,12 +21,12 @@ namespace Nz
|
||||
HashMD5();
|
||||
virtual ~HashMD5();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len);
|
||||
void Begin();
|
||||
HashDigest End();
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
static unsigned int GetDigestLength();
|
||||
static String GetHashName();
|
||||
unsigned int GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
HashMD5_state* m_state;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <Nazara/Prerequesites.hpp>
|
||||
#include <Nazara/Core/AbstractHash.hpp>
|
||||
#include <Nazara/Core/HashDigest.hpp>
|
||||
#include <Nazara/Core/ByteArray.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
@@ -21,12 +21,12 @@ namespace Nz
|
||||
HashSHA1();
|
||||
virtual ~HashSHA1();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len);
|
||||
void Begin();
|
||||
HashDigest End();
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
static unsigned int GetDigestLength();
|
||||
static String GetHashName();
|
||||
unsigned int GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
SHA_CTX* m_state;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <Nazara/Prerequesites.hpp>
|
||||
#include <Nazara/Core/AbstractHash.hpp>
|
||||
#include <Nazara/Core/HashDigest.hpp>
|
||||
#include <Nazara/Core/ByteArray.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
@@ -21,12 +21,12 @@ namespace Nz
|
||||
HashSHA224();
|
||||
virtual ~HashSHA224();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len);
|
||||
void Begin();
|
||||
HashDigest End();
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
static unsigned int GetDigestLength();
|
||||
static String GetHashName();
|
||||
unsigned int GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
SHA_CTX* m_state;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <Nazara/Prerequesites.hpp>
|
||||
#include <Nazara/Core/AbstractHash.hpp>
|
||||
#include <Nazara/Core/HashDigest.hpp>
|
||||
#include <Nazara/Core/ByteArray.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
@@ -21,12 +21,12 @@ namespace Nz
|
||||
HashSHA256();
|
||||
virtual ~HashSHA256();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len);
|
||||
void Begin();
|
||||
HashDigest End();
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
static unsigned int GetDigestLength();
|
||||
static String GetHashName();
|
||||
unsigned int GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
SHA_CTX* m_state;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <Nazara/Prerequesites.hpp>
|
||||
#include <Nazara/Core/AbstractHash.hpp>
|
||||
#include <Nazara/Core/HashDigest.hpp>
|
||||
#include <Nazara/Core/ByteArray.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
@@ -21,12 +21,12 @@ namespace Nz
|
||||
HashSHA384();
|
||||
virtual ~HashSHA384();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len);
|
||||
void Begin();
|
||||
HashDigest End();
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
static unsigned int GetDigestLength();
|
||||
static String GetHashName();
|
||||
unsigned int GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
SHA_CTX* m_state;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <Nazara/Prerequesites.hpp>
|
||||
#include <Nazara/Core/AbstractHash.hpp>
|
||||
#include <Nazara/Core/HashDigest.hpp>
|
||||
#include <Nazara/Core/ByteArray.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
@@ -21,12 +21,12 @@ namespace Nz
|
||||
HashSHA512();
|
||||
virtual ~HashSHA512();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len);
|
||||
void Begin();
|
||||
HashDigest End();
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
static unsigned int GetDigestLength();
|
||||
static String GetHashName();
|
||||
unsigned int GetDigestLength() const override;
|
||||
const char* GetHashName() const override;
|
||||
|
||||
private:
|
||||
SHA_CTX* m_state;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <Nazara/Prerequesites.hpp>
|
||||
#include <Nazara/Core/AbstractHash.hpp>
|
||||
#include <Nazara/Core/HashDigest.hpp>
|
||||
#include <Nazara/Core/ByteArray.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
@@ -19,12 +19,12 @@ namespace Nz
|
||||
HashWhirlpool();
|
||||
virtual ~HashWhirlpool();
|
||||
|
||||
void Append(const UInt8* data, unsigned int len);
|
||||
void Begin();
|
||||
HashDigest End();
|
||||
void Append(const UInt8* data, unsigned int len) override;
|
||||
void Begin() override;
|
||||
ByteArray End() override;
|
||||
|
||||
static unsigned int GetDigestLength();
|
||||
static String GetHashName();
|
||||
unsigned int GetDigestLength() const;
|
||||
const char* GetHashName() const;
|
||||
|
||||
private:
|
||||
HashWhirlpool_state* m_state;
|
||||
|
||||
Reference in New Issue
Block a user