diff options
Diffstat (limited to 'plugins/Dbx_tree/encryption')
| -rw-r--r-- | plugins/Dbx_tree/encryption/ARC4/ARC4.vcxproj (renamed from plugins/Dbx_tree/encryption/ARC4.vcxproj) | 14 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/ARC4/ARC4.vcxproj.filters (renamed from plugins/Dbx_tree/encryption/ARC4.vcxproj.filters) | 6 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/ARC4/src/ARC4.cpp (renamed from plugins/Dbx_tree/encryption/ARC4.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/ARC4/src/ARC4.h (renamed from plugins/Dbx_tree/encryption/ARC4.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/CAST128/Cast128.vcxproj (renamed from plugins/Dbx_tree/encryption/Cast128.vcxproj) | 16 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/CAST128/Cast128.vcxproj.filters (renamed from plugins/Dbx_tree/encryption/Cast128.vcxproj.filters) | 8 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/CAST128/src/CAST128.cpp (renamed from plugins/Dbx_tree/encryption/CAST128.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/CAST128/src/CAST128.h (renamed from plugins/Dbx_tree/encryption/CAST128.h) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/CAST128/src/CAST128.inc (renamed from plugins/Dbx_tree/encryption/CAST128.inc) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/Common/Cipher.h (renamed from plugins/Dbx_tree/encryption/Cipher.h) | 2 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/HC256/HC256.vcxproj (renamed from plugins/Dbx_tree/encryption/HC256.vcxproj) | 14 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/HC256/HC256.vcxproj.filters (renamed from plugins/Dbx_tree/encryption/HC256.vcxproj.filters) | 6 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/HC256/src/HC256.cpp (renamed from plugins/Dbx_tree/encryption/HC256.cpp) | 0 | ||||
| -rw-r--r-- | plugins/Dbx_tree/encryption/HC256/src/HC256.h (renamed from plugins/Dbx_tree/encryption/HC256.h) | 0 |
14 files changed, 45 insertions, 21 deletions
diff --git a/plugins/Dbx_tree/encryption/ARC4.vcxproj b/plugins/Dbx_tree/encryption/ARC4/ARC4.vcxproj index e8692710a2..3fcc596e3a 100644 --- a/plugins/Dbx_tree/encryption/ARC4.vcxproj +++ b/plugins/Dbx_tree/encryption/ARC4/ARC4.vcxproj @@ -59,6 +59,10 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
<IgnoreImportLibrary>true</IgnoreImportLibrary>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">ARC4</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ARC4</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ARC4</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ARC4</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -68,6 +72,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -88,6 +93,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -109,6 +115,7 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DBX_TREE_ENCRYPTION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -132,6 +139,7 @@ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;DBX_TREE_ENCRYPTION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -148,11 +156,11 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="ARC4.h" />
- <ClInclude Include="Cipher.h" />
+ <ClInclude Include="src\ARC4.h" />
+ <ClInclude Include="..\Common\Cipher.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="ARC4.cpp" />
+ <ClCompile Include="src\ARC4.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Dbx_tree/encryption/ARC4.vcxproj.filters b/plugins/Dbx_tree/encryption/ARC4/ARC4.vcxproj.filters index 513c5124c8..125c2ecc43 100644 --- a/plugins/Dbx_tree/encryption/ARC4.vcxproj.filters +++ b/plugins/Dbx_tree/encryption/ARC4/ARC4.vcxproj.filters @@ -15,15 +15,15 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="ARC4.h">
+ <ClInclude Include="src\ARC4.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Cipher.h">
+ <ClInclude Include="..\Common\Cipher.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="ARC4.cpp">
+ <ClCompile Include="src\ARC4.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
diff --git a/plugins/Dbx_tree/encryption/ARC4.cpp b/plugins/Dbx_tree/encryption/ARC4/src/ARC4.cpp index 7f3780e6a2..7f3780e6a2 100644 --- a/plugins/Dbx_tree/encryption/ARC4.cpp +++ b/plugins/Dbx_tree/encryption/ARC4/src/ARC4.cpp diff --git a/plugins/Dbx_tree/encryption/ARC4.h b/plugins/Dbx_tree/encryption/ARC4/src/ARC4.h index 48fdc35312..48fdc35312 100644 --- a/plugins/Dbx_tree/encryption/ARC4.h +++ b/plugins/Dbx_tree/encryption/ARC4/src/ARC4.h diff --git a/plugins/Dbx_tree/encryption/Cast128.vcxproj b/plugins/Dbx_tree/encryption/CAST128/Cast128.vcxproj index e9fbe2cd25..76acf68f31 100644 --- a/plugins/Dbx_tree/encryption/Cast128.vcxproj +++ b/plugins/Dbx_tree/encryption/CAST128/Cast128.vcxproj @@ -59,6 +59,10 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
<IgnoreImportLibrary>true</IgnoreImportLibrary>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Cast128</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Cast128</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Cast128</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Cast128</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -68,6 +72,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -88,6 +93,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -109,6 +115,7 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CAST128_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -132,6 +139,7 @@ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;CAST128_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -148,14 +156,14 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="CAST128.cpp" />
+ <ClCompile Include="src\CAST128.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="CAST128.h" />
- <ClInclude Include="Cipher.h" />
+ <ClInclude Include="src\CAST128.h" />
+ <ClInclude Include="..\Common\Cipher.h" />
</ItemGroup>
<ItemGroup>
- <None Include="CAST128.inc" />
+ <None Include="src\CAST128.inc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Dbx_tree/encryption/Cast128.vcxproj.filters b/plugins/Dbx_tree/encryption/CAST128/Cast128.vcxproj.filters index 5c3548e7f6..f23057e4ba 100644 --- a/plugins/Dbx_tree/encryption/Cast128.vcxproj.filters +++ b/plugins/Dbx_tree/encryption/CAST128/Cast128.vcxproj.filters @@ -15,20 +15,20 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="CAST128.cpp">
+ <ClCompile Include="src\CAST128.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="CAST128.h">
+ <ClInclude Include="src\CAST128.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Cipher.h">
+ <ClInclude Include="..\Common\Cipher.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="CAST128.inc">
+ <None Include="src\CAST128.inc">
<Filter>Header Files</Filter>
</None>
</ItemGroup>
diff --git a/plugins/Dbx_tree/encryption/CAST128.cpp b/plugins/Dbx_tree/encryption/CAST128/src/CAST128.cpp index 2814a4142b..2814a4142b 100644 --- a/plugins/Dbx_tree/encryption/CAST128.cpp +++ b/plugins/Dbx_tree/encryption/CAST128/src/CAST128.cpp diff --git a/plugins/Dbx_tree/encryption/CAST128.h b/plugins/Dbx_tree/encryption/CAST128/src/CAST128.h index 9477254986..9477254986 100644 --- a/plugins/Dbx_tree/encryption/CAST128.h +++ b/plugins/Dbx_tree/encryption/CAST128/src/CAST128.h diff --git a/plugins/Dbx_tree/encryption/CAST128.inc b/plugins/Dbx_tree/encryption/CAST128/src/CAST128.inc index 8389acc92c..8389acc92c 100644 --- a/plugins/Dbx_tree/encryption/CAST128.inc +++ b/plugins/Dbx_tree/encryption/CAST128/src/CAST128.inc diff --git a/plugins/Dbx_tree/encryption/Cipher.h b/plugins/Dbx_tree/encryption/Common/Cipher.h index 76d07e61a0..abdcbf06be 100644 --- a/plugins/Dbx_tree/encryption/Cipher.h +++ b/plugins/Dbx_tree/encryption/Common/Cipher.h @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #pragma once
#ifdef _MSC_VER
-#include "../stdint.h"
+#include "../../src/stdint.h"
#else
#include <stdint.h>
#endif
diff --git a/plugins/Dbx_tree/encryption/HC256.vcxproj b/plugins/Dbx_tree/encryption/HC256/HC256.vcxproj index f006b55725..2369cea095 100644 --- a/plugins/Dbx_tree/encryption/HC256.vcxproj +++ b/plugins/Dbx_tree/encryption/HC256/HC256.vcxproj @@ -59,6 +59,10 @@ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
<IgnoreImportLibrary>true</IgnoreImportLibrary>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">HC256</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">HC256</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">HC256</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">HC256</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -68,6 +72,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -88,6 +93,7 @@ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -109,6 +115,7 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HC256_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -132,6 +139,7 @@ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;HC256_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level3</WarningLevel>
+ <AdditionalIncludeDirectories>..\Common</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<FloatingPointModel>Fast</FloatingPointModel>
@@ -148,11 +156,11 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="Cipher.h" />
- <ClInclude Include="HC256.h" />
+ <ClInclude Include="..\Common\Cipher.h" />
+ <ClInclude Include="src\HC256.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="HC256.cpp" />
+ <ClCompile Include="src\HC256.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Dbx_tree/encryption/HC256.vcxproj.filters b/plugins/Dbx_tree/encryption/HC256/HC256.vcxproj.filters index 5d1e3ec0dd..abb4df92d0 100644 --- a/plugins/Dbx_tree/encryption/HC256.vcxproj.filters +++ b/plugins/Dbx_tree/encryption/HC256/HC256.vcxproj.filters @@ -15,15 +15,15 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="Cipher.h">
+ <ClInclude Include="..\Common\Cipher.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="HC256.h">
+ <ClInclude Include="src\HC256.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="HC256.cpp">
+ <ClCompile Include="src\HC256.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
diff --git a/plugins/Dbx_tree/encryption/HC256.cpp b/plugins/Dbx_tree/encryption/HC256/src/HC256.cpp index 056b4e4dae..056b4e4dae 100644 --- a/plugins/Dbx_tree/encryption/HC256.cpp +++ b/plugins/Dbx_tree/encryption/HC256/src/HC256.cpp diff --git a/plugins/Dbx_tree/encryption/HC256.h b/plugins/Dbx_tree/encryption/HC256/src/HC256.h index d4acb3195f..d4acb3195f 100644 --- a/plugins/Dbx_tree/encryption/HC256.h +++ b/plugins/Dbx_tree/encryption/HC256/src/HC256.h |