xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-07 03:15:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

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:

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
CPP/7zip/7zip.mak
View File

@@ -27,6 +27,7 @@ OBJS = \
$(COMPRESS_OBJS) \
$(CRYPTO_OBJS) \
$(C_OBJS) \
$(HASHES_OBJS) \
$(ASM_OBJS) \
$O\resource.res \
@@ -234,6 +235,8 @@ $(C_OBJS): ../../../../C/$(*B).c
$(COMPLB_O2)
{../../../../C}.c{$O}.obj::
$(CCOMPLB)
{../../../../C/hashes}.c{$O}.obj::
$(COMPLB_O2)
!ENDIF

33
CPP/7zip/Archive/Rar/Rar5Handler.cpp
View File

@@ -2999,3 +2999,36 @@ Z7_COM7F_IMF2(void, CBlake2spHasher::Final(Byte *digest))
}
REGISTER_HASHER(CBlake2spHasher, 0x202, "BLAKE2sp", BLAKE2S_DIGEST_SIZE)
/*
class CBlake2spHasher:
public IHasher,
public CMyUnknownImp
{
CBlake2sp _blake;
Byte mtDummy[1 << 7];
public:
CBlake2spHasher() { Init(); }
MY_UNKNOWN_IMP
INTERFACE_IHasher(;)
};
STDMETHODIMP_(void) CBlake2spHasher::Init() throw()
{
Blake2sp_Init(&_blake);
}
STDMETHODIMP_(void) CBlake2spHasher::Update(const void *data, UInt32 size) throw()
{
Blake2sp_Update(&_blake, (const Byte *)data, size);
}
STDMETHODIMP_(void) CBlake2spHasher::Final(Byte *digest) throw()
{
Blake2sp_Final(&_blake, digest);
}
REGISTER_HASHER(CBlake2spHasher, 0x202, "BLAKE2sp", BLAKE2S_DIGEST_SIZE)
*/

19
CPP/7zip/Bundles/Format7zF/Arc.mak
View File

@@ -1,8 +1,12 @@
COMMON_OBJS = \
$O\Blake3Reg.obj \
$O\CRC.obj \
$O\CrcReg.obj \
$O\DynLimBuf.obj \
$O\IntToString.obj \
$O\Md2Reg.obj \
$O\Md4Reg.obj \
$O\Md5Reg.obj \
$O\LzFindPrepare.obj \
$O\MyMap.obj \
$O\MyString.obj \
@@ -11,10 +15,17 @@ COMMON_OBJS = \
$O\NewHandler.obj \
$O\Sha1Reg.obj \
$O\Sha256Reg.obj \
$O\Sha384Reg.obj \
$O\Sha512Reg.obj \
$O\Sha3-256Reg.obj \
$O\Sha3-384Reg.obj \
$O\Sha3-512Reg.obj \
$O\StringConvert.obj \
$O\StringToInt.obj \
$O\UTFConvert.obj \
$O\Wildcard.obj \
$O\XXH32Reg.obj \
$O\XXH64Reg.obj \
$O\XzCrc64Init.obj \
$O\XzCrc64Reg.obj \
@@ -250,6 +261,14 @@ CRYPTO_OBJS = \
$O\ZipCrypto.obj \
$O\ZipStrong.obj \
HASHES_OBJS = \
$O\blake3.obj \
$O\md2.obj \
$O\md4.obj \
$O\md5.obj \
$O\sha3.obj \
$O\sha512.obj \
C_OBJS = \
$O\7zBuf2.obj \
$O\7zStream.obj \

29
CPP/7zip/UI/Common/HashCalc.cpp
View File

@@ -795,18 +795,10 @@ static const char *SkipWhite(const char *s)
static const char * const k_CsumMethodNames[] =
{
"sha256"
, "sha224"
// , "sha512/224"
// , "sha512/256"
, "sha512"
, "sha384"
, "sha1"
, "md5"
, "blake2b"
, "crc64"
, "crc32"
, "cksum"
"sha3-512", "sha3-384", "sha3-256",
"sha512", "sha384", "sha256", "sha224",
"sha1", "md5", "blake2b",
"crc32", "crc64" , "cksum"
};
static UString GetMethod_from_FileName(const UString &name)
@@ -1409,7 +1401,8 @@ static bool CheckDigests(const Byte *a, const Byte *b, size_t size)
static void AddDefaultMethod(UStringVector &methods, unsigned size)
{
const char *m = NULL;
if (size == 32) m = "sha256";
if (size == 64) m = "sha512";
else if (size == 32) m = "sha256";
else if (size == 20) m = "sha1";
else if (size == 16) m = "md5";
else if (size == 8) m = "crc64";
@@ -2090,11 +2083,11 @@ void Codecs_AddHashArcHandler(CCodecs *codecs)
// ubuntu uses "SHA256SUMS" file
item.AddExts(UString (
"sha256 sha512 sha224 sha384 sha1 sha md5"
// "b2sum"
" crc32 crc64"
" asc"
" cksum"
"sha3-512 sha3-384 sha3-256 "
"sha512 sha384 sha256 sha224 "
"sha1 sha md5 "
"crc32 crc64 "
"asc cksum"
),
UString());

40
CPP/7zip/UI/Explorer/ContextMenu.cpp
View File

@@ -293,16 +293,30 @@ struct CHashCommand
static const CHashCommand g_HashCommands[] =
{
{ CZipContextMenu::kHash_CRC32, "CRC-32", "CRC32" },
{ CZipContextMenu::kHash_CRC64, "CRC-64", "CRC64" },
{ CZipContextMenu::kHash_SHA1, "SHA-1", "SHA1" },
{ CZipContextMenu::kHash_SHA256, "SHA-256", "SHA256" },
{ CZipContextMenu::kHash_CRC32, "CRC-32", "CRC32" },
{ CZipContextMenu::kHash_CRC64, "CRC-64", "CRC64" },
{ CZipContextMenu::kHash_XXH32, "XXH-32 (NOT WORKING)", "XXH32 (NOT WORKING)" },
{ CZipContextMenu::kHash_XXH64, "XXH-64 (NOT WORKING)", "XXH64 (NOT WORKING)" },
{ CZipContextMenu::kHash_MD5, "MD2", "MD2" },
{ CZipContextMenu::kHash_MD5, "MD4", "MD4" },
{ CZipContextMenu::kHash_MD5, "MD5", "MD5" },
{ CZipContextMenu::kHash_SHA1, "SHA-1", "SHA1" },
{ CZipContextMenu::kHash_SHA256, "SHA2-256", "SHA256" },
{ CZipContextMenu::kHash_SHA384, "SHA2-384", "SHA384" },
{ CZipContextMenu::kHash_SHA512, "SHA2-512", "SHA512" },
{ CZipContextMenu::kHash_BLAKE2sp, "BLAKE2sp", "BLAKE2sp" },
{ CZipContextMenu::kHash_SHA256, "SHA3-256", "SHA3-256" },
{ CZipContextMenu::kHash_SHA384, "SHA3-384", "SHA3-384" },
{ CZipContextMenu::kHash_SHA512, "SHA3-512", "SHA3-512" },
{ CZipContextMenu::kHash_BLAKE3, "BLAKE3", "BLAKE3" },
{ CZipContextMenu::kHash_SHA256, "SHA3-256", "SHA3-256" },
{ CZipContextMenu::kHash_SHA384, "SHA3-384", "SHA3-384" },
{ CZipContextMenu::kHash_SHA512, "SHA3-512", "SHA3-512" },
{ CZipContextMenu::kHash_All, "*", "*" },
{ CZipContextMenu::kHash_Generate_SHA256, "SHA-256 -> file.sha256", "SHA256" },
{ CZipContextMenu::kHash_Generate_SHA256, "SHA2-256 -> file.sha256", "SHA256" },
{ CZipContextMenu::kHash_TestArc, "Checksum : Test", "Hash" }
};
static int FindCommand(CZipContextMenu::enum_CommandInternalID &id)
{
for (unsigned i = 0; i < Z7_ARRAY_SIZE(g_Commands); i++)
@@ -1104,7 +1118,7 @@ Z7_COMWF_B CZipContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu,
showName += ".sha256";
cmi.Folder = fs2us(folderPrefix);
cmi.ArcName = name;
s = "SHA-256 -> ";
s = "SHA2-256 -> ";
s += showName;
}
else if (hc.CommandInternalID == kHash_TestArc)
@@ -1332,8 +1346,20 @@ HRESULT CZipContextMenu::InvokeCommandCommon(const CCommandMapItem &cmi)
case kHash_CRC32:
case kHash_CRC64:
case kHash_XXH32:
case kHash_XXH64:
case kHash_MD2:
case kHash_MD4:
case kHash_MD5:
case kHash_SHA1:
case kHash_SHA256:
case kHash_SHA384:
case kHash_SHA512:
case kHash_BLAKE2sp:
case kHash_SHA3_256:
case kHash_SHA3_384:
case kHash_SHA3_512:
case kHash_BLAKE3:
case kHash_All:
case kHash_Generate_SHA256:
case kHash_TestArc:

16
CPP/7zip/UI/Explorer/ContextMenu.h
View File

@@ -87,13 +87,25 @@ public:
kCompressToZipEmail,
kHash_CRC32,
kHash_CRC64,
kHash_XXH32,
kHash_XXH64,
kHash_MD2,
kHash_MD4,
kHash_MD5,
kHash_SHA1,
kHash_SHA256,
kHash_SHA384,
kHash_SHA512,
kHash_BLAKE2sp,
kHash_BLAKE3,
kHash_SHA3_256,
kHash_SHA3_384,
kHash_SHA3_512,
kHash_All,
kHash_Generate_SHA256,
kHash_TestArc
};
public:
void Init_For_7zFM()
{
@@ -103,6 +115,8 @@ public:
void LoadItems(IShellItemArray *psiItemArray);
HRESULT InitContextMenu(const wchar_t *folder, const wchar_t * const *names, unsigned numFiles);
CZipContextMenu();
~CZipContextMenu();

13
CPP/7zip/UI/FileManager/MyLoadMenu.cpp
View File

@@ -742,9 +742,18 @@ bool ExecuteFileCommand(unsigned id)
case IDM_HASH_ALL: g_App.CalculateCrc("*"); break;
case IDM_CRC32: g_App.CalculateCrc("CRC32"); break;
case IDM_CRC64: g_App.CalculateCrc("CRC64"); break;
case IDM_SHA1: g_App.CalculateCrc("SHA1"); break;
case IDM_XXH32: g_App.CalculateCrc("XXH32 (NOT WORKING)"); break;
case IDM_XXH64: g_App.CalculateCrc("XXH64 (NOT WORKING)"); break;
case IDM_MD2: g_App.CalculateCrc("MD2"); break;
case IDM_MD4: g_App.CalculateCrc("MD4"); break;
case IDM_MD5: g_App.CalculateCrc("MD5"); break;
case IDM_SHA1: g_App.CalculateCrc("SHA1"); break;
case IDM_SHA256: g_App.CalculateCrc("SHA256"); break;
case IDM_SHA384: g_App.CalculateCrc("SHA384"); break;
case IDM_SHA512: g_App.CalculateCrc("SHA512"); break;
case IDM_BLAKE2sp: g_App.CalculateCrc("BLAKE2sp"); break;
case IDM_BLAKE3: g_App.CalculateCrc("BLAKE3"); break;
case IDM_DIFF: g_App.DiffFiles(); break;
case IDM_VER_EDIT:

16
CPP/7zip/UI/FileManager/resource.h
View File

@@ -23,8 +23,20 @@
#define IDM_HASH_ALL 101
#define IDM_CRC32 102
#define IDM_CRC64 103
#define IDM_SHA1 104
#define IDM_SHA256 105
#define IDM_XXH32 104
#define IDM_XXH64 105
#define IDM_MD2 106
#define IDM_MD4 107
#define IDM_MD5 108
#define IDM_SHA1 109
#define IDM_SHA256 110
// orig
// #define IDM_SHA1 104
// #define IDM_SHA256 105
#define IDM_SHA384 111
#define IDM_SHA512 112
#define IDM_BLAKE2sp 113
#define IDM_BLAKE3 114
#define IDM_FILE 500

9
CPP/7zip/UI/FileManager/resource.rc
View File

@@ -57,8 +57,17 @@ BEGIN
BEGIN
MENUITEM "CRC-32", IDM_CRC32
MENUITEM "CRC-64", IDM_CRC64
MENUITEM "xxHash-32 (Not Working)", IDM_XXH32
MENUITEM "xxHash-64 (Not Working)", IDM_XXH64
MENUITEM "MD2", IDM_MD2
MENUITEM "MD4", IDM_MD4
MENUITEM "MD5", IDM_MD5
MENUITEM "SHA-1", IDM_SHA1
MENUITEM "SHA-256", IDM_SHA256
MENUITEM "SHA-384", IDM_SHA384
MENUITEM "SHA-512", IDM_SHA512
MENUITEM "Blake2sp", IDM_BLAKE2sp
MENUITEM "Blake3", IDM_BLAKE3
MENUITEM "*", IDM_HASH_ALL
END
MENUITEM "Di&ff", IDM_DIFF

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)

2
CPP/Common/CksumReg.cpp
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)

38
CPP/Common/Sha3-256Reg.cpp Normal file
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)

38
CPP/Common/Sha3-384Reg.cpp Normal file
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)

38
CPP/Common/Sha3-512Reg.cpp Normal file
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)