additional crypto files added to xrCore/crypto

OpenXRay · Nov 8, 2015 · cb4b496 · cb4b496
1 parent 94002ef
commit cb4b496
Show file tree

Hide file tree

Showing 25 changed files with 30 additions and 237 deletions.
diff --git a/src/utils/mp_configs_verifyer/configs_dump_verifyer.h b/src/utils/mp_configs_verifyer/configs_dump_verifyer.h
@@ -2,7 +2,7 @@
 #define CONFIGS_DUMP_VERIFYER
 
 #include "mp_config_sections.h"
-#include "xr_dsa_verifyer.h"
+#include "xrCore/crypto/xr_dsa_verifyer.h"
 
 namespace mp_anticheat
 {

diff --git a/src/utils/mp_configs_verifyer/mp_configs_verifyer.vcxproj b/src/utils/mp_configs_verifyer/mp_configs_verifyer.vcxproj
@@ -100,14 +100,12 @@
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="xr_dsa_verifyer.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="configs_common.h" />
     <ClInclude Include="configs_dump_verifyer.h" />
     <ClInclude Include="mp_config_sections.h" />
     <ClInclude Include="pch.h" />
-    <ClInclude Include="xr_dsa_verifyer.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">

diff --git a/src/utils/mp_configs_verifyer/mp_configs_verifyer.vcxproj.filters b/src/utils/mp_configs_verifyer/mp_configs_verifyer.vcxproj.filters
@@ -13,7 +13,6 @@
     <ClCompile Include="configs_dump_verifyer.cpp" />
     <ClCompile Include="entry_point.cpp" />
     <ClCompile Include="mp_config_sections.cpp" />
-    <ClCompile Include="xr_dsa_verifyer.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h">
@@ -22,6 +21,5 @@
     <ClInclude Include="configs_common.h" />
     <ClInclude Include="configs_dump_verifyer.h" />
     <ClInclude Include="mp_config_sections.h" />
-    <ClInclude Include="xr_dsa_verifyer.h" />
   </ItemGroup>
 </Project>
diff --git a/src/utils/mp_configs_verifyer/xr_dsa_verifyer.cpp b/src/utils/mp_configs_verifyer/xr_dsa_verifyer.cpp
diff --git a/src/utils/mp_configs_verifyer/xr_dsa_verifyer.h b/src/utils/mp_configs_verifyer/xr_dsa_verifyer.h
diff --git a/src/utils/mp_screenshots_info/mp_screenshots_info.vcxproj b/src/utils/mp_screenshots_info/mp_screenshots_info.vcxproj
@@ -109,10 +109,6 @@
     <ClCompile Include="screenshots_writer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="xr_dsa_signer.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="xr_dsa_verifyer.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
@@ -121,10 +117,6 @@
     <CustomBuild Include="screenshots_writer.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </CustomBuild>
-    <CustomBuild Include="xr_dsa_signer.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-    </CustomBuild>
-    <ClInclude Include="xr_dsa_verifyer.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">

diff --git a/src/utils/mp_screenshots_info/mp_screenshots_info.vcxproj.filters b/src/utils/mp_screenshots_info/mp_screenshots_info.vcxproj.filters
@@ -13,19 +13,15 @@
     <ClCompile Include="screenshots_common.cpp" />
     <ClCompile Include="screenshots_reader.cpp" />
     <ClCompile Include="screenshots_writer.cpp" />
-    <ClCompile Include="xr_dsa_signer.cpp" />
-    <ClCompile Include="xr_dsa_verifyer.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h">
       <Filter>core</Filter>
     </ClInclude>
     <ClInclude Include="screenshots_common.h" />
     <ClInclude Include="screenshots_reader.h" />
-    <ClInclude Include="xr_dsa_verifyer.h" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="screenshots_writer.h" />
-    <CustomBuild Include="xr_dsa_signer.h" />
   </ItemGroup>
 </Project>
diff --git a/src/utils/mp_screenshots_info/screenshots_reader.h b/src/utils/mp_screenshots_info/screenshots_reader.h
@@ -1,7 +1,7 @@
 #ifndef SCREENSHOT_READER_INCLUDED
 #define SCREENSHOT_READER_INCLUDED
 
-#include "xr_dsa_verifyer.h"
+#include "xrCore/crypto/xr_dsa_verifyer.h"
 
 namespace screenshots
 {

diff --git a/src/utils/mp_screenshots_info/screenshots_writer.h b/src/utils/mp_screenshots_info/screenshots_writer.h
@@ -1,7 +1,7 @@
 #ifndef SCREENSHOT_WRITER_INCLUDED
 #define SCREENSHOT_WRITER_INCLUDED
 
-#include "xr_dsa_signer.h"
+#include "xrCore/crypto/xr_dsa_signer.h"
 
 namespace screenshots
 {

diff --git a/src/utils/mp_screenshots_info/xr_dsa_signer.cpp b/src/utils/mp_screenshots_info/xr_dsa_signer.cpp
diff --git a/src/utils/mp_screenshots_info/xr_dsa_signer.h b/src/utils/mp_screenshots_info/xr_dsa_signer.h
diff --git a/src/utils/mp_screenshots_info/xr_dsa_verifyer.cpp b/src/utils/mp_screenshots_info/xr_dsa_verifyer.cpp
diff --git a/src/utils/mp_screenshots_info/xr_dsa_verifyer.h b/src/utils/mp_screenshots_info/xr_dsa_verifyer.h
diff --git a/src/xrGame/xr_dsa_signer.cpp → src/xrCore/crypto/xr_dsa_signer.cpp b/src/xrGame/xr_dsa_signer.cpp → src/xrCore/crypto/xr_dsa_signer.cpp
diff --git a/src/xrGame/xr_dsa_signer.h → src/xrCore/crypto/xr_dsa_signer.h b/src/xrGame/xr_dsa_signer.h → src/xrCore/crypto/xr_dsa_signer.h
@@ -1,11 +1,11 @@
 #ifndef XR_DSA_SIGNER_INCLUDED
 #define XR_DSA_SIGNER_INCLUDED
 
-#include "xrCore/Crypto/crypto.h"
+#include "crypto.h"
 
 typedef fastdelegate::FastDelegate1< long >	sha_process_yielder;
 
-class xr_dsa_signer
+class CRYPTO_API xr_dsa_signer
 {
 public:
 						xr_dsa_signer			(u8 const p_number[crypto::xr_dsa::public_key_length],
@@ -28,6 +28,6 @@ class xr_dsa_signer
 
 }; //xr_dsa_signer
 
-char const * current_time(string64 & dest_time);
+CRYPTO_API char const * current_time(string64 & dest_time);
 
 #endif //#ifndef XR_DSA_SIGNER_INCLUDED
diff --git a/src/xrGame/xr_dsa_verifyer.cpp → src/xrCore/crypto/xr_dsa_verifyer.cpp b/src/xrGame/xr_dsa_verifyer.cpp → src/xrCore/crypto/xr_dsa_verifyer.cpp
diff --git a/src/xrGame/xr_dsa_verifyer.h → src/xrCore/crypto/xr_dsa_verifyer.h b/src/xrGame/xr_dsa_verifyer.h → src/xrCore/crypto/xr_dsa_verifyer.h
@@ -1,9 +1,9 @@
 #ifndef XR_DSA_VERIFYER_INCLUDED
 #define XR_DSA_VERIFYER_INCLUDED
 
-#include "xrCore/Crypto/crypto.h"
+#include "crypto.h"
 
-class xr_dsa_verifyer
+class CRYPTO_API xr_dsa_verifyer
 {
 public:
 	xr_dsa_verifyer				(u8 const p_number[crypto::xr_dsa::public_key_length],

diff --git a/src/xrCore/xrCore.vcxproj b/src/xrCore/xrCore.vcxproj
@@ -294,6 +294,8 @@
     <ClCompile Include="crc32.cpp" />
     <ClCompile Include="crypto\crypto.cpp" />
     <ClCompile Include="crypto\xr_dsa.cpp" />
+    <ClCompile Include="crypto\xr_dsa_signer.cpp" />
+    <ClCompile Include="crypto\xr_dsa_verifyer.cpp" />
     <ClCompile Include="crypto\xr_sha.cpp" />
     <ClCompile Include="Debug\dxerr.cpp" />
     <ClCompile Include="doug_lea_allocator.cpp" />
@@ -442,6 +444,8 @@
     <ClInclude Include="Crypto\crypto.h" />
     <ClInclude Include="Crypto\crypto_api_def.h" />
     <ClInclude Include="Crypto\xr_dsa.h" />
+    <ClInclude Include="crypto\xr_dsa_signer.h" />
+    <ClInclude Include="crypto\xr_dsa_verifyer.h" />
     <ClInclude Include="Crypto\xr_sha.h" />
     <ClInclude Include="Debug\dxerr.h" />
     <ClInclude Include="Debug\DXGetErrorDescription.inl">

diff --git a/src/xrCore/xrCore.vcxproj.filters b/src/xrCore/xrCore.vcxproj.filters
@@ -381,6 +381,12 @@
     <ClCompile Include="Crypto\xr_sha.cpp">
       <Filter>Crypto</Filter>
     </ClCompile>
+    <ClCompile Include="crypto\xr_dsa_signer.cpp">
+      <Filter>Crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="crypto\xr_dsa_verifyer.cpp">
+      <Filter>Crypto</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="FTimer.h">
@@ -803,6 +809,12 @@
     <ClInclude Include="crypto\xr_sha.h">
       <Filter>crypto</Filter>
     </ClInclude>
+    <ClInclude Include="crypto\xr_dsa_signer.h">
+      <Filter>Crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="crypto\xr_dsa_verifyer.h">
+      <Filter>Crypto</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="xrCore.rc">

diff --git a/src/xrGame/configs_dump_verifyer.h b/src/xrGame/configs_dump_verifyer.h
@@ -2,7 +2,7 @@
 #define CONFIGS_DUMP_VERIFYER
 
 #include "mp_config_sections.h"
-#include "xr_dsa_verifyer.h"
+#include "xrCore/crypto/xr_dsa_verifyer.h"
 
 namespace mp_anticheat
 {

diff --git a/src/xrGame/configs_dumper.h b/src/xrGame/configs_dumper.h
@@ -1,7 +1,7 @@
 #ifndef CONFIGS_DUMPER_INCLUDED
 #define CONFIGS_DUMPER_INCLUDED
 
-#include "xr_dsa_signer.h"
+#include "xrCore/crypto/xr_dsa_signer.h"
 #include "mp_config_sections.h"
 
 namespace mp_anticheat