Migrate RHash from NanaZip.Core to NanaZip.Codecs.

NanaZip.Codecs/NanaZip.Codecs.def

@@ -15,3 +15,73 @@ sm3_finish
 MD2_Init
 MD2_Update
 MD2_Final
+
+bt_cleanup
+bt_final
+bt_init
+bt_update
+rhash_aich_cleanup
+rhash_aich_final
+rhash_aich_init
+rhash_aich_update
+rhash_blake2b_final
+rhash_blake2b_init
+rhash_blake2b_update
+rhash_ed2k_final
+rhash_ed2k_init
+rhash_ed2k_update
+rhash_edonr224_init
+rhash_edonr256_final
+rhash_edonr256_init
+rhash_edonr256_update
+rhash_edonr384_init
+rhash_edonr512_final
+rhash_edonr512_init
+rhash_edonr512_update
+rhash_gost12_256_init
+rhash_gost12_512_init
+rhash_gost12_final
+rhash_gost12_update
+rhash_gost94_cryptopro_init
+rhash_gost94_final
+rhash_gost94_init
+rhash_gost94_update
+rhash_has160_final
+rhash_has160_init
+rhash_has160_update
+rhash_md4_final
+rhash_md4_init
+rhash_md4_update
+rhash_md5_final
+rhash_md5_init
+rhash_md5_update
+rhash_ripemd160_final
+rhash_ripemd160_init
+rhash_ripemd160_update
+rhash_sha224_init
+rhash_sha256_final
+rhash_sha256_update
+rhash_sha3_224_init
+rhash_sha3_256_init
+rhash_sha3_384_init
+rhash_sha3_512_init
+rhash_sha3_final
+rhash_sha3_update
+rhash_sha384_init
+rhash_sha512_final
+rhash_sha512_init
+rhash_sha512_update
+rhash_snefru_final
+rhash_snefru_update
+rhash_snefru128_init
+rhash_snefru256_init
+rhash_tiger_final
+rhash_tiger_init
+rhash_tiger_update
+rhash_tiger2_init
+rhash_tth_final
+rhash_tth_init
+rhash_tth_update
+rhash_whirlpool_final
+rhash_whirlpool_init
+rhash_whirlpool_update

NanaZip.Codecs/NanaZip.Codecs.props

@@ -13,6 +13,7 @@
     <IncludePath>$(MSBuildThisFileDirectory)BLAKE3\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)GmSSL\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)Heimdal\;$(IncludePath)</IncludePath>
+    <IncludePath>$(MSBuildThisFileDirectory)RHash\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>

NanaZip.Codecs/NanaZip.Codecs.vcxproj

@@ -26,6 +26,7 @@
     <IncludePath>$(MSBuildThisFileDirectory)BLAKE3\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)GmSSL\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)Heimdal\;$(IncludePath)</IncludePath>
+    <IncludePath>$(MSBuildThisFileDirectory)RHash\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -41,6 +42,36 @@
     <None Include="NanaZip.Codecs.props" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="RHash\aich.c" />
+    <ClCompile Include="RHash\blake2b.c" />
+    <ClCompile Include="RHash\byte_order.c" />
+    <ClCompile Include="RHash\ed2k.c" />
+    <ClCompile Include="RHash\edonr.c" />
+    <ClCompile Include="RHash\gost12.c">
+      <DisableSpecificWarnings>4267;</DisableSpecificWarnings>
+    </ClCompile>
+    <ClCompile Include="RHash\gost94.c" />
+    <ClCompile Include="RHash\has160.c" />
+    <ClCompile Include="RHash\hex.c" />
+    <ClCompile Include="RHash\md4.c" />
+    <ClCompile Include="RHash\md5.c" />
+    <ClCompile Include="RHash\rhash_sha1.c" />
+    <ClCompile Include="RHash\rhash_sha256.c" />
+    <ClCompile Include="RHash\rhash_util.c" />
+    <ClCompile Include="RHash\ripemd-160.c" />
+    <ClCompile Include="RHash\sha3.c" />
+    <ClCompile Include="RHash\sha512.c" />
+    <ClCompile Include="RHash\snefru.c">
+      <DisableSpecificWarnings>4127;</DisableSpecificWarnings>
+    </ClCompile>
+    <ClCompile Include="RHash\tiger.c" />
+    <ClCompile Include="RHash\tiger_sbox.c" />
+    <ClCompile Include="RHash\torrent.c">
+      <DisableSpecificWarnings>4146;4200;</DisableSpecificWarnings>
+    </ClCompile>
+    <ClCompile Include="RHash\tth.c" />
+    <ClCompile Include="RHash\whirlpool.c" />
+    <ClCompile Include="RHash\whirlpool_sbox.c" />
     <ClCompile Include="Heimdal\md2.c">
       <DisableSpecificWarnings>4267;</DisableSpecificWarnings>
     </ClCompile>
@@ -56,6 +87,29 @@
     <ClCompile Include="NanaZip.Codecs.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="RHash\aich.h" />
+    <ClInclude Include="RHash\blake2b.h" />
+    <ClInclude Include="RHash\byte_order.h" />
+    <ClInclude Include="RHash\ed2k.h" />
+    <ClInclude Include="RHash\edonr.h" />
+    <ClInclude Include="RHash\gost12.h" />
+    <ClInclude Include="RHash\gost94.h" />
+    <ClInclude Include="RHash\has160.h" />
+    <ClInclude Include="RHash\hex.h" />
+    <ClInclude Include="RHash\md4.h" />
+    <ClInclude Include="RHash\md5.h" />
+    <ClInclude Include="RHash\ripemd-160.h" />
+    <ClInclude Include="RHash\sha1.h" />
+    <ClInclude Include="RHash\sha256.h" />
+    <ClInclude Include="RHash\sha3.h" />
+    <ClInclude Include="RHash\sha512.h" />
+    <ClInclude Include="RHash\snefru.h" />
+    <ClInclude Include="RHash\tiger.h" />
+    <ClInclude Include="RHash\torrent.h" />
+    <ClInclude Include="RHash\tth.h" />
+    <ClInclude Include="RHash\ustd.h" />
+    <ClInclude Include="RHash\util.h" />
+    <ClInclude Include="RHash\whirlpool.h" />
     <ClInclude Include="Heimdal\md2.h" />
     <ClInclude Include="GmSSL\endian.h" />
     <ClInclude Include="GmSSL\sm3.h" />

NanaZip.Codecs/NanaZip.Codecs.vcxproj.filters

@@ -32,6 +32,78 @@
     <ClCompile Include="Heimdal\md2.c">
       <Filter>Heimdal</Filter>
     </ClCompile>
+    <ClCompile Include="RHash\aich.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\blake2b.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\byte_order.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\ed2k.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\edonr.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\gost12.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\gost94.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\has160.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\hex.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\md4.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\md5.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\ripemd-160.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\rhash_sha1.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\rhash_sha256.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\sha3.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\sha512.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\snefru.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\tiger.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\tiger_sbox.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\torrent.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\tth.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\rhash_util.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\whirlpool.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
+    <ClCompile Include="RHash\whirlpool_sbox.c">
+      <Filter>RHash</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="NanaZip.Codecs.def" />
@@ -47,6 +119,9 @@
     <Filter Include="Heimdal">
       <UniqueIdentifier>{4641c110-c238-4da5-a120-e50ba45bca8c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="RHash">
+      <UniqueIdentifier>{c13ab0bc-bcc5-44ec-8b4b-8f3ee60c2ec1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="BLAKE3\blake3.h">
@@ -64,5 +139,74 @@
     <ClInclude Include="Heimdal\md2.h">
       <Filter>Heimdal</Filter>
     </ClInclude>
+    <ClInclude Include="RHash\aich.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\blake2b.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\byte_order.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\ed2k.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\edonr.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\gost12.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\gost94.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\has160.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\hex.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\md4.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\md5.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\ripemd-160.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\sha1.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\sha256.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\sha3.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\sha512.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\snefru.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\tiger.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\torrent.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\tth.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\ustd.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\util.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
+    <ClInclude Include="RHash\whirlpool.h">
+      <Filter>RHash</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

NanaZip.Core/NanaZip.Core.vcxproj

@@ -30,7 +30,6 @@
     <IncludePath>$(MSBuildThisFileDirectory)Lizard\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)LZ4\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)LZ5\;$(IncludePath)</IncludePath>
-    <IncludePath>$(MSBuildThisFileDirectory)RHash\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)FastLZMA2\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)ZSTDMT\;$(IncludePath)</IncludePath>
   </PropertyGroup>
@@ -141,30 +140,6 @@
     <ClCompile Include="FastLZMA2\radix_struct.c" />
     <ClCompile Include="FastLZMA2\range_enc.c" />
     <ClCompile Include="FastLZMA2\util.c" />
-    <ClCompile Include="RHash\aich.c" />
-    <ClCompile Include="RHash\blake2b.c" />
-    <ClCompile Include="RHash\byte_order.c" />
-    <ClCompile Include="RHash\ed2k.c" />
-    <ClCompile Include="RHash\edonr.c" />
-    <ClCompile Include="RHash\gost12.c" />
-    <ClCompile Include="RHash\gost94.c" />
-    <ClCompile Include="RHash\has160.c" />
-    <ClCompile Include="RHash\hex.c" />
-    <ClCompile Include="RHash\md4.c" />
-    <ClCompile Include="RHash\md5.c" />
-    <ClCompile Include="RHash\ripemd-160.c" />
-    <ClCompile Include="RHash\rhash_sha1.c" />
-    <ClCompile Include="RHash\rhash_sha256.c" />
-    <ClCompile Include="RHash\sha3.c" />
-    <ClCompile Include="RHash\sha512.c" />
-    <ClCompile Include="RHash\snefru.c" />
-    <ClCompile Include="RHash\tiger.c" />
-    <ClCompile Include="RHash\tiger_sbox.c" />
-    <ClCompile Include="RHash\torrent.c" />
-    <ClCompile Include="RHash\tth.c" />
-    <ClCompile Include="RHash\rhash_util.c" />
-    <ClCompile Include="RHash\whirlpool.c" />
-    <ClCompile Include="RHash\whirlpool_sbox.c" />
     <ClCompile Include="LZ5\lz5.c" />
     <ClCompile Include="LZ5\lz5frame.c" />
     <ClCompile Include="LZ5\lz5hc.c" />
@@ -552,29 +527,6 @@
     <ClInclude Include="FastLZMA2\radix_mf.h" />
     <ClInclude Include="FastLZMA2\range_enc.h" />
     <ClInclude Include="FastLZMA2\util.h" />
-    <ClInclude Include="RHash\aich.h" />
-    <ClInclude Include="RHash\blake2b.h" />
-    <ClInclude Include="RHash\byte_order.h" />
-    <ClInclude Include="RHash\ed2k.h" />
-    <ClInclude Include="RHash\edonr.h" />
-    <ClInclude Include="RHash\gost12.h" />
-    <ClInclude Include="RHash\gost94.h" />
-    <ClInclude Include="RHash\has160.h" />
-    <ClInclude Include="RHash\hex.h" />
-    <ClInclude Include="RHash\md4.h" />
-    <ClInclude Include="RHash\md5.h" />
-    <ClInclude Include="RHash\ripemd-160.h" />
-    <ClInclude Include="RHash\sha1.h" />
-    <ClInclude Include="RHash\sha256.h" />
-    <ClInclude Include="RHash\sha3.h" />
-    <ClInclude Include="RHash\sha512.h" />
-    <ClInclude Include="RHash\snefru.h" />
-    <ClInclude Include="RHash\tiger.h" />
-    <ClInclude Include="RHash\torrent.h" />
-    <ClInclude Include="RHash\tth.h" />
-    <ClInclude Include="RHash\ustd.h" />
-    <ClInclude Include="RHash\util.h" />
-    <ClInclude Include="RHash\whirlpool.h" />
     <ClInclude Include="LZ5\lz5.h" />
     <ClInclude Include="LZ5\lz5common.h" />
     <ClInclude Include="LZ5\lz5frame.h" />

NanaZip.Core/NanaZip.Core.vcxproj.filters

@@ -118,9 +118,6 @@
     <Filter Include="LZ5">
       <UniqueIdentifier>{918fd1fb-4664-4f98-8a3b-2cfb349cdaa5}</UniqueIdentifier>
     </Filter>
-    <Filter Include="RHash">
-      <UniqueIdentifier>{5c013723-a643-4ac8-9fee-b2cdbcbf9af9}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Extensions">
       <UniqueIdentifier>{ad1ce36b-5416-4c51-bdd0-26e4d2afe6b5}</UniqueIdentifier>
     </Filter>
@@ -1229,78 +1226,6 @@
     <ClCompile Include="LZ5\lz5hc.c">
       <Filter>LZ5</Filter>
     </ClCompile>
-    <ClCompile Include="RHash\aich.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\blake2b.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\byte_order.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\ed2k.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\edonr.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\gost12.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\gost94.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\has160.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\hex.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\md4.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\md5.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\ripemd-160.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\rhash_sha1.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\rhash_sha256.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\sha3.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\sha512.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\snefru.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\tiger.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\tiger_sbox.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\torrent.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\tth.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\rhash_util.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\whirlpool.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
-    <ClCompile Include="RHash\whirlpool_sbox.c">
-      <Filter>RHash</Filter>
-    </ClCompile>
     <ClCompile Include="FastLZMA2\dict_buffer.c">
       <Filter>FastLZMA2</Filter>
     </ClCompile>
@@ -2686,75 +2611,6 @@
     <ClInclude Include="LZ5\mem.h">
       <Filter>LZ5</Filter>
     </ClInclude>
-    <ClInclude Include="RHash\aich.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\blake2b.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\byte_order.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\ed2k.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\edonr.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\gost12.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\gost94.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\has160.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\hex.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\md4.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\md5.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\ripemd-160.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\sha1.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\sha256.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\sha3.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\sha512.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\snefru.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\tiger.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\torrent.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\tth.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\ustd.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\util.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
-    <ClInclude Include="RHash\whirlpool.h">
-      <Filter>RHash</Filter>
-    </ClInclude>
     <ClInclude Include="FastLZMA2\atomic.h">
       <Filter>FastLZMA2</Filter>
     </ClInclude>