add sha2 for gostd signature

GOSTSec · Jun 6, 2019 · 1c14152 · 1c14152
1 parent 4efa648
commit 1c14152
Show file tree

Hide file tree

Showing 5 changed files with 644 additions and 3 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -21,7 +21,7 @@ ccminer_SOURCES	= elist.h miner.h compat.h \
 			  crc32.c cuda_checkhash.cu \
 			  ccminer.cpp pools.cpp util.cpp bench.cpp bignum.cpp \
 			  api.cpp hashlog.cpp nvml.cpp stats.cpp sysinfos.cpp cuda.cpp \
-			  nvsettings.cpp \
+			  nvsettings.cpp sph/sha2.c \
 			  sph/streebog.c gost/gost.cu gost/cuda_gosthash.cu
 
 

diff --git a/ccminer.vcxproj b/ccminer.vcxproj
@@ -39,7 +39,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 9.0.props" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 10.1.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -158,6 +158,7 @@
       <!--CodeGeneration>compute_30,sm_30;compute_35,sm_35</CodeGeneration-->
       <!--CodeGeneration>compute_50,sm_50;compute_52,sm_52</CodeGeneration-->
       <!--CodeGeneration>compute_61,sm_61</CodeGeneration-->
+      <!--CodeGeneration>compute_75,sm_75</CodeGeneration-->
       <CodeGeneration>compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_52,sm_52;compute_61,sm_61</CodeGeneration>
       <AdditionalOptions>--ptxas-options="-O2" --Wno-deprecated-gpu-targets %(AdditionalOptions)</AdditionalOptions>
       <Optimization>O3</Optimization>
@@ -205,6 +206,7 @@
       <!--CodeGeneration>compute_30,sm_30;compute_35,sm_35</CodeGeneration-->
       <!--CodeGeneration>compute_50,sm_50;compute_52,sm_52</CodeGeneration-->
       <!--CodeGeneration>compute_61,sm_61</CodeGeneration-->
+      <!--CodeGeneration>compute_75,sm_75</CodeGeneration-->
       <CodeGeneration>compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_52,sm_52;compute_61,sm_61</CodeGeneration>
       <Include>$(NVTOOLSEXT_PATH)\include</Include>
       <Optimization>O3</Optimization>
@@ -249,6 +251,7 @@
     <ClCompile Include="api.cpp" />
     <ClCompile Include="sysinfos.cpp" />
     <ClCompile Include="crc32.c" />
+    <ClCompile Include="sph\sha2.c" />
     <ClCompile Include="sph\streebog.c" />
   </ItemGroup>
   <ItemGroup>
@@ -300,7 +303,7 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 9.0.targets" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 10.1.targets" />
   </ImportGroup>
   <!-- Copy the required dlls -->
   <Target Name="AfterBuild">

diff --git a/ccminer.vcxproj.filters b/ccminer.vcxproj.filters
@@ -161,6 +161,9 @@
     <ClInclude Include="uint256.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClCompile Include="sph\sha2.c">
+      <Filter>Source Files\sph</Filter>
+    </ClCompile>
     <ClInclude Include="sph\sph_streebog.h">
       <Filter>Header Files\sph</Filter>
     </ClInclude>

diff --git a/miner.h b/miner.h
@@ -264,6 +264,7 @@ json_t * json_load_url(char* cfg_url, json_error_t *err);
 
 #define USER_AGENT PACKAGE_NAME "/" PACKAGE_VERSION
 
+void sha256d(unsigned char *hash, const unsigned char *data, int len);
 void gostd(void *output, const void *input, size_t len);
 
 #define HAVE_SHA256_4WAY 0