shunf4 cherry-picking hash related commits from zstd. The following commits from 7-zip-zstd repository (https://github.com/mcmilk/7-Zip-zstd) is picked:

commit add56b5aed
Author: Tino Reichardt <milky-7zip@mcmilk.de>
Date:   Thu Nov 1 23:08:00 2018 +0100

    Add MD5 hash function

commit 36a17a5184
Author: Tino Reichardt <milky-7zip@mcmilk.de>
Date:   Sat Nov 3 00:18:33 2018 +0100

    Add some hash functions
    - new: md2, md4, md5, sha384, sha512, xxhash-32, xxhash-64
    - put Blake2sp hash stuff back to rar code
    - added the hashes to GUI and Explorer Menu code

commit 576c5df947
Author: Tino Reichardt <milky-7zip@mcmilk.de>
Date:   Tue Apr 6 19:35:46 2021 +0200

    Add BLAKE3 hash function

commit 6b2a151549
Author: Tino Reichardt <milky-7zip@mcmilk.de>
Date:   Tue Apr 6 19:51:01 2021 +0200

    Remove unneeded file HashesReg.cpp

commit dddf507557
Author: Tino Reichardt <milky-7zip@mcmilk.de>
Date:   Sun Jun 18 09:13:59 2023 +0200

    Add SHA3 hashing

    - added these variants: SHA3-256, SHA3-384, SHA3-512
    - reordered also the hashing id's
    - added some notes about them in DOC/Hashes.txt

    Signed-off-by: Tino Reichardt <milky-7zip@mcmilk.de>

The cherry-picking was a chaos; they're not applied in order, and some
commits even got cherry-picked twice (1->4->0->2->4->3). So subsequent fixes and
adjustments were applied to make it build.
This commit is contained in:
Tino Reichardt
2018-11-03 00:18:33 +01:00
committed by shunf4
parent cd0993fe9c
commit e19abb2958
36 changed files with 3253 additions and 31 deletions

38
CPP/Common/Blake3Reg.cpp Normal file
View File

@@ -0,0 +1,38 @@
// Blake3Reg.cpp /TR 2021-04-06
#include "StdAfx.h"
#include "../../C/CpuArch.h"
EXTERN_C_BEGIN
#include "../../C/hashes/blake3.h"
EXTERN_C_END
#include "../Common/MyCom.h"
#include "../7zip/Common/RegisterCodec.h"
// BLAKE3
Z7_CLASS_IMP_COM_1(CBLAKE3Hasher, IHasher)
blake3_hasher _ctx;
Byte mtDummy[1 << 7];
public:
CBLAKE3Hasher() { blake3_hasher_init(&_ctx); }
};
STDMETHODIMP_(void) CBLAKE3Hasher::Init() throw()
{
blake3_hasher_init(&_ctx);
}
STDMETHODIMP_(void) CBLAKE3Hasher::Update(const void *data, UInt32 size) throw()
{
blake3_hasher_update(&_ctx, data, size);
}
STDMETHODIMP_(void) CBLAKE3Hasher::Final(Byte *digest) throw()
{
blake3_hasher_finalize(&_ctx, digest, BLAKE3_OUT_LEN);
}
REGISTER_HASHER(CBLAKE3Hasher, 0x204, "BLAKE3", BLAKE3_OUT_LEN)

View File

@@ -52,4 +52,4 @@ Z7_COM7F_IMF2(void, CCksumHasher::Final(Byte *digest))
SetUi32(digest, val)
}
REGISTER_HASHER(CCksumHasher, 0x203, "CKSUM", 4)
REGISTER_HASHER(CCksumHasher, 0x202, "CKSUM", 4)

38
CPP/Common/Md2Reg.cpp Normal file
View File

@@ -0,0 +1,38 @@
// Md2Reg.cpp /TR 2018-11-02
#include "StdAfx.h"
#include "../../C/CpuArch.h"
EXTERN_C_BEGIN
#include "../../C/hashes/md2.h"
EXTERN_C_END
#include "../Common/MyCom.h"
#include "../7zip/Common/RegisterCodec.h"
// MD2
Z7_CLASS_IMP_COM_1(CMD2Hasher, IHasher)
MD2_CTX _ctx;
Byte mtDummy[1 << 7];
public:
CMD2Hasher() { MD2_Init(&_ctx); }
};
STDMETHODIMP_(void) CMD2Hasher::Init() throw()
{
MD2_Init(&_ctx);
}
STDMETHODIMP_(void) CMD2Hasher::Update(const void *data, UInt32 size) throw()
{
MD2_Update(&_ctx, (const Byte *)data, size);
}
STDMETHODIMP_(void) CMD2Hasher::Final(Byte *digest) throw()
{
MD2_Final(digest, &_ctx);
}
REGISTER_HASHER(CMD2Hasher, 0x205, "MD2", MD2_DIGEST_LENGTH)

38
CPP/Common/Md4Reg.cpp Normal file
View File

@@ -0,0 +1,38 @@
// Md4Reg.cpp /TR 2018-11-02
#include "StdAfx.h"
#include "../../C/CpuArch.h"
EXTERN_C_BEGIN
#include "../../C/hashes/md4.h"
EXTERN_C_END
#include "../Common/MyCom.h"
#include "../7zip/Common/RegisterCodec.h"
// MD4
Z7_CLASS_IMP_COM_1(CMD4Hasher, IHasher)
MD4_CTX _ctx;
Byte mtDummy[1 << 7];
public:
CMD4Hasher() { MD4_Init(&_ctx); }
};
STDMETHODIMP_(void) CMD4Hasher::Init() throw()
{
MD4_Init(&_ctx);
}
STDMETHODIMP_(void) CMD4Hasher::Update(const void *data, UInt32 size) throw()
{
MD4_Update(&_ctx, (const Byte *)data, size);
}
STDMETHODIMP_(void) CMD4Hasher::Final(Byte *digest) throw()
{
MD4_Final(digest, &_ctx);
}
REGISTER_HASHER(CMD4Hasher, 0x206, "MD4", MD4_DIGEST_LENGTH)

39
CPP/Common/Md5Reg.cpp Normal file
View File

@@ -0,0 +1,39 @@
// MD5Reg.cpp
#include "StdAfx.h"
#include "../../C/CpuArch.h"
EXTERN_C_BEGIN
#include "../../C/hashes/md5.h"
EXTERN_C_END
#include "../Common/MyCom.h"
#include "../7zip/Common/RegisterCodec.h"
// MD5
Z7_CLASS_IMP_COM_1(CMD5Hasher, IHasher)
MD5_CTX _ctx;
Byte mtDummy[1 << 7];
public:
CMD5Hasher() { MD5_Init(&_ctx); }
};
STDMETHODIMP_(void) CMD5Hasher::Init() throw()
{
MD5_Init(&_ctx);
}
STDMETHODIMP_(void) CMD5Hasher::Update(const void *data, UInt32 size) throw()
{
MD5_Update(&_ctx, (const Byte *)data, size);
}
STDMETHODIMP_(void) CMD5Hasher::Final(Byte *digest) throw()
{
MD5_Final(digest, &_ctx);
}
REGISTER_HASHER(CMD5Hasher, 0x207, "MD5", MD5_DIGEST_LENGTH)

View File

@@ -0,0 +1,38 @@
// Sha3-256Reg.cpp /TR 2023-06-18
#include "StdAfx.h"
#include "../../C/CpuArch.h"
EXTERN_C_BEGIN
#include "../../C/hashes/sha3.h"
EXTERN_C_END
#include "../Common/MyCom.h"
#include "../7zip/Common/RegisterCodec.h"
// SHA3-256
Z7_CLASS_IMP_COM_1(CSHA3_256Hasher, IHasher)
SHA3_CTX _ctx;
Byte mtDummy[1 << 7];
public:
CSHA3_256Hasher() { SHA3_Init(&_ctx, 256); }
};
STDMETHODIMP_(void) CSHA3_256Hasher::Init() throw()
{
SHA3_Init(&_ctx, 256);
}
STDMETHODIMP_(void) CSHA3_256Hasher::Update(const void *data, UInt32 size) throw()
{
SHA3_Update(&_ctx, (const Byte *)data, size);
}
STDMETHODIMP_(void) CSHA3_256Hasher::Final(Byte *digest) throw()
{
SHA3_Final(digest, &_ctx);
}
REGISTER_HASHER(CSHA3_256Hasher, 0x20a, "SHA3-256", SHA3_256_DIGEST_LENGTH)

View File

@@ -0,0 +1,38 @@
// Sha3-384Reg.cpp /TR 2023-06-18
#include "StdAfx.h"
#include "../../C/CpuArch.h"
EXTERN_C_BEGIN
#include "../../C/hashes/sha3.h"
EXTERN_C_END
#include "../Common/MyCom.h"
#include "../7zip/Common/RegisterCodec.h"
// SHA3-384
Z7_CLASS_IMP_COM_1(CSHA3_384Hasher, IHasher)
SHA3_CTX _ctx;
Byte mtDummy[1 << 7];
public:
CSHA3_384Hasher() { SHA3_Init(&_ctx, 384); }
};
STDMETHODIMP_(void) CSHA3_384Hasher::Init() throw()
{
SHA3_Init(&_ctx, 384);
}
STDMETHODIMP_(void) CSHA3_384Hasher::Update(const void *data, UInt32 size) throw()
{
SHA3_Update(&_ctx, (const Byte *)data, size);
}
STDMETHODIMP_(void) CSHA3_384Hasher::Final(Byte *digest) throw()
{
SHA3_Final(digest, &_ctx);
}
REGISTER_HASHER(CSHA3_384Hasher, 0x20b, "SHA3-384", SHA3_384_DIGEST_LENGTH)

View File

@@ -0,0 +1,38 @@
// Sha3-512Reg.cpp /TR 2023-06-18
#include "StdAfx.h"
#include "../../C/CpuArch.h"
EXTERN_C_BEGIN
#include "../../C/hashes/sha3.h"
EXTERN_C_END
#include "../Common/MyCom.h"
#include "../7zip/Common/RegisterCodec.h"
// SHA3-512
Z7_CLASS_IMP_COM_1(CSHA3_512Hasher, IHasher)
SHA3_CTX _ctx;
Byte mtDummy[1 << 7];
public:
CSHA3_512Hasher() { SHA3_Init(&_ctx, 512); }
};
STDMETHODIMP_(void) CSHA3_512Hasher::Init() throw()
{
SHA3_Init(&_ctx, 512);
}
STDMETHODIMP_(void) CSHA3_512Hasher::Update(const void *data, UInt32 size) throw()
{
SHA3_Update(&_ctx, (const Byte *)data, size);
}
STDMETHODIMP_(void) CSHA3_512Hasher::Final(Byte *digest) throw()
{
SHA3_Final(digest, &_ctx);
}
REGISTER_HASHER(CSHA3_512Hasher, 0x20c, "SHA3-512", SHA3_512_DIGEST_LENGTH)

38
CPP/Common/Sha384Reg.cpp Normal file
View File

@@ -0,0 +1,38 @@
// Sha384Reg.cpp /TR 2018-11-02
#include "StdAfx.h"
#include "../../C/CpuArch.h"
EXTERN_C_BEGIN
#include "../../C/hashes/sha512.h"
EXTERN_C_END
#include "../Common/MyCom.h"
#include "../7zip/Common/RegisterCodec.h"
// SHA384
Z7_CLASS_IMP_COM_1(CSHA384Hasher, IHasher)
SHA384_CTX _ctx;
Byte mtDummy[1 << 7];
public:
CSHA384Hasher() { SHA384_Init(&_ctx); }
};
STDMETHODIMP_(void) CSHA384Hasher::Init() throw()
{
SHA384_Init(&_ctx);
}
STDMETHODIMP_(void) CSHA384Hasher::Update(const void *data, UInt32 size) throw()
{
SHA384_Update(&_ctx, (const Byte *)data, size);
}
STDMETHODIMP_(void) CSHA384Hasher::Final(Byte *digest) throw()
{
SHA384_Final(digest, &_ctx);
}
REGISTER_HASHER(CSHA384Hasher, 0x208, "SHA384", SHA384_DIGEST_LENGTH)

38
CPP/Common/Sha512Reg.cpp Normal file
View File

@@ -0,0 +1,38 @@
// Sha512Reg.cpp /TR 2018-11-02
#include "StdAfx.h"
#include "../../C/CpuArch.h"
EXTERN_C_BEGIN
#include "../../C/hashes/sha512.h"
EXTERN_C_END
#include "../Common/MyCom.h"
#include "../7zip/Common/RegisterCodec.h"
// SHA512
Z7_CLASS_IMP_COM_1(CSHA512Hasher, IHasher)
SHA512_CTX _ctx;
Byte mtDummy[1 << 7];
public:
CSHA512Hasher() { SHA512_Init(&_ctx); }
};
STDMETHODIMP_(void) CSHA512Hasher::Init() throw()
{
SHA512_Init(&_ctx);
}
STDMETHODIMP_(void) CSHA512Hasher::Update(const void *data, UInt32 size) throw()
{
SHA512_Update(&_ctx, (const Byte *)data, size);
}
STDMETHODIMP_(void) CSHA512Hasher::Final(Byte *digest) throw()
{
SHA512_Final(digest, &_ctx);
}
REGISTER_HASHER(CSHA512Hasher, 0x209, "SHA512", SHA512_DIGEST_LENGTH)

47
CPP/Common/XXH32Reg.cpp Normal file
View File

@@ -0,0 +1,47 @@
// XXH32Reg.cpp /TR 2018-11-02
#include "StdAfx.h"
#include "../../C/CpuArch.h"
#define XXH_STATIC_LINKING_ONLY
// shunf4: no zstd, comment for now
// #include "../../C/zstd/xxhash.h"
#include "../Common/MyCom.h"
#include "../7zip/Common/RegisterCodec.h"
// XXH32
Z7_CLASS_IMP_COM_1(CXXH32Hasher, IHasher)
// XXH32_state_t *_ctx;
void *_ctx;
Byte mtDummy[1 << 7];
public:
// CXXH32Hasher() { _ctx = XXH32_createState(); }
CXXH32Hasher() { _ctx = NULL; }
// ~CXXH32Hasher() { XXH32_freeState(_ctx); }
~CXXH32Hasher() { }
};
STDMETHODIMP_(void) CXXH32Hasher::Init() throw()
{
// XXH32_reset(_ctx, 0);
}
STDMETHODIMP_(void) CXXH32Hasher::Update(const void *data, UInt32 size) throw()
{
(void)(data);
(void)(size);
// XXH32_update(_ctx, data, size);
}
STDMETHODIMP_(void) CXXH32Hasher::Final(Byte *digest) throw()
{
(void)(digest);
// UInt32 val = XXH32_digest(_ctx);
// SetUi32(digest, val);
}
REGISTER_HASHER(CXXH32Hasher, 0x20d, "XXH32 (NOT WORKING)", 4)

45
CPP/Common/XXH64Reg.cpp Normal file
View File

@@ -0,0 +1,45 @@
// XXH64Reg.cpp /TR 2018-11-02
#include "StdAfx.h"
#include "../../C/CpuArch.h"
#define XXH_STATIC_LINKING_ONLY
// #include "../../C/zstd/xxhash.h"
#include "../Common/MyCom.h"
#include "../7zip/Common/RegisterCodec.h"
// XXH64
Z7_CLASS_IMP_COM_1(CXXH64Hasher, IHasher)
// XXH64_state_t *_ctx;
void *_ctx;
Byte mtDummy[1 << 7];
public:
// CXXH64Hasher() { _ctx = XXH64_createState(); }
// ~CXXH64Hasher() { XXH64_freeState(_ctx); }
CXXH64Hasher() { _ctx = NULL; }
~CXXH64Hasher() { }
};
STDMETHODIMP_(void) CXXH64Hasher::Init() throw()
{
// XXH64_reset(_ctx, 0);
}
STDMETHODIMP_(void) CXXH64Hasher::Update(const void *data, UInt32 size) throw()
{
(void)(data);
(void)(size);
// XXH64_update(_ctx, data, size);
}
STDMETHODIMP_(void) CXXH64Hasher::Final(Byte *digest) throw()
{
(void)(digest);
// UInt64 val = XXH64_digest(_ctx);
// SetUi64(digest, val);
}
REGISTER_HASHER(CXXH64Hasher, 0x20e, "XXH64 (NOT WORKING)", 8)