generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-04 19:13:30 +01:00
Code Issues Projects Releases Wiki Activity

openssl 1.1

Browse Source
This commit is contained in:
Alex Fabijanic 2017-09-22 18:29:30 -05:00
parent 9732441043
commit faa089e249
10 changed files with 140 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
CppUnit/CppUnit_x64_vs150.vcxproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="debug_shared|x64">
@ -32,7 +32,7 @@
<RootNamespace>CppUnit</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
@ -63,27 +63,27 @@
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
<ImportGroup Label="ExtensionSettings"/>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros"/>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>14.0.23107.0</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCppUnit64d</TargetName>
@ -132,7 +132,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
@ -163,9 +163,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/>
<DebugInformationFormat />
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
@ -184,7 +184,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -193,7 +193,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
<PrecompiledHeader />
<ProgramDataBaseFileName>..\lib64\PocoCppUnitmtd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -211,16 +211,16 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/>
<DebugInformationFormat />
<CompileAs>Default</CompileAs>
</ClCompile>
<Lib>
@ -231,7 +231,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -240,7 +240,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
<PrecompiledHeader />
<ProgramDataBaseFileName>..\lib64\PocoCppUnitmdd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -258,16 +258,16 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat/>
<DebugInformationFormat />
<CompileAs>Default</CompileAs>
</ClCompile>
<Lib>
@ -275,32 +275,32 @@
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\CppUnitException.cpp"/>
<ClCompile Include="src\TestCase.cpp"/>
<ClCompile Include="src\TestDecorator.cpp"/>
<ClCompile Include="src\TestFailure.cpp"/>
<ClCompile Include="src\TestResult.cpp"/>
<ClCompile Include="src\TestRunner.cpp"/>
<ClCompile Include="src\TestSuite.cpp"/>
<ClCompile Include="src\TextTestResult.cpp"/>
<ClCompile Include="src\CppUnitException.cpp" />
<ClCompile Include="src\TestCase.cpp" />
<ClCompile Include="src\TestDecorator.cpp" />
<ClCompile Include="src\TestFailure.cpp" />
<ClCompile Include="src\TestResult.cpp" />
<ClCompile Include="src\TestRunner.cpp" />
<ClCompile Include="src\TestSuite.cpp" />
<ClCompile Include="src\TextTestResult.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\Poco\CppUnit\CppUnitException.h"/>
<ClInclude Include="include\Poco\CppUnit\estring.h"/>
<ClInclude Include="include\Poco\CppUnit\Guards.h"/>
<ClInclude Include="include\Poco\CppUnit\Orthodox.h"/>
<ClInclude Include="include\Poco\CppUnit\RepeatedTest.h"/>
<ClInclude Include="include\Poco\CppUnit\Test.h"/>
<ClInclude Include="include\Poco\CppUnit\TestCaller.h"/>
<ClInclude Include="include\Poco\CppUnit\TestCase.h"/>
<ClInclude Include="include\Poco\CppUnit\TestDecorator.h"/>
<ClInclude Include="include\Poco\CppUnit\TestFailure.h"/>
<ClInclude Include="include\Poco\CppUnit\TestResult.h"/>
<ClInclude Include="include\Poco\CppUnit\TestRunner.h"/>
<ClInclude Include="include\Poco\CppUnit\TestSetup.h"/>
<ClInclude Include="include\Poco\CppUnit\TestSuite.h"/>
<ClInclude Include="include\Poco\CppUnit\TextTestResult.h"/>
<ClInclude Include="include\Poco\CppUnit\CppUnitException.h" />
<ClInclude Include="include\Poco\CppUnit\estring.h" />
<ClInclude Include="include\Poco\CppUnit\Guards.h" />
<ClInclude Include="include\Poco\CppUnit\Orthodox.h" />
<ClInclude Include="include\Poco\CppUnit\RepeatedTest.h" />
<ClInclude Include="include\Poco\CppUnit\Test.h" />
<ClInclude Include="include\Poco\CppUnit\TestCaller.h" />
<ClInclude Include="include\Poco\CppUnit\TestCase.h" />
<ClInclude Include="include\Poco\CppUnit\TestDecorator.h" />
<ClInclude Include="include\Poco\CppUnit\TestFailure.h" />
<ClInclude Include="include\Poco\CppUnit\TestResult.h" />
<ClInclude Include="include\Poco\CppUnit\TestRunner.h" />
<ClInclude Include="include\Poco\CppUnit\TestSetup.h" />
<ClInclude Include="include\Poco\CppUnit\TestSuite.h" />
<ClInclude Include="include\Poco\CppUnit\TextTestResult.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
<ImportGroup Label="ExtensionTargets"/>
</Project>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>

24
Crypto/Crypto_vs140.vcxproj
View File

@ -121,8 +121,9 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\bin\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -156,8 +157,8 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -194,8 +195,8 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib\* 1>nul
xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win32\lib\debug\*.lib ..\lib\* 1>nul
xcopy /y ..\openssl\VS_120\win32\lib\debug\*.pdb ..\lib\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -222,7 +223,7 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win32\lib\release\*.lib ..\lib\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -250,8 +251,9 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\bin\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -278,8 +280,8 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>

24
Crypto/Crypto_vs150.vcxproj
View File

@ -121,8 +121,9 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\bin\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -156,8 +157,8 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -194,8 +195,8 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib\* 1>nul
xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win32\lib\debug\*.lib ..\lib\* 1>nul
xcopy /y ..\openssl\VS_120\win32\lib\debug\*.pdb ..\lib\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -222,7 +223,7 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win32\lib\release\*.lib ..\lib\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -250,8 +251,9 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\bin\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -278,8 +280,8 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1>nul
xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>

24
Crypto/Crypto_x64_vs140.vcxproj
View File

@ -121,8 +121,9 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\bin64\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -156,8 +157,8 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -194,8 +195,8 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.lib ..\lib64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.pdb ..\lib64\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win64\lib\debug\*.lib ..\lib64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\lib\debug\*.pdb ..\lib64\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -222,7 +223,7 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win64\lib\release\*64MT.lib ..\lib64\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win64\lib\release\*.lib ..\lib64\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -250,8 +251,9 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\bin64\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -278,8 +280,8 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1>nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>

26
Crypto/Crypto_x64_vs150.vcxproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="debug_shared|x64">
@ -121,8 +121,9 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1&gt;nul
xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1&gt;nul
xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\lib64\* 1&gt;nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -156,8 +157,8 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1&gt;nul
xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1&gt;nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -194,8 +195,8 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.lib ..\lib64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.pdb ..\lib64\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win64\lib\debug\*.lib ..\lib64\* 1&gt;nul
xcopy /y ..\openssl\VS_120\win64\lib\debug\*.pdb ..\lib64\* 1&gt;nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -222,7 +223,7 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win64\lib\release\*64MT.lib ..\lib64\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win64\lib\release\*.lib ..\lib64\* 1&gt;nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -250,8 +251,9 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1&gt;nul
xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1&gt;nul
xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\lib64\* 1&gt;nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>
@ -278,8 +280,8 @@ exit 0</Command>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
<PreBuildEvent>
<Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1>nul
xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1>nul
<Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1&gt;nul
xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1&gt;nul
exit 0</Command>
</PreBuildEvent>
<ClCompile>

21
Crypto/include/Poco/Crypto/Crypto.h
View File

@ -87,27 +87,10 @@ enum RSAPaddingMode
// Automatically link Crypto and OpenSSL libraries.
//
#if defined(_MSC_VER)
#if defined(_WIN64)
#define POCO_PLATFORM_BITS "64"
#else
#define POCO_PLATFORM_BITS "32"
#endif
#if defined (_DEBUG)
#define POCO_DEBUG_POSTFIX "d"
#else
#define POCO_DEBUG_POSTFIX ""
#endif
#if !defined(POCO_NO_AUTOMATIC_LIBS)
#if !defined(POCO_EXTERNAL_OPENSSL)
#if defined (_DLL)
#pragma comment(lib, "libeay" POCO_PLATFORM_BITS "MD" POCO_DEBUG_POSTFIX ".lib")
#pragma comment(lib, "ssleay" POCO_PLATFORM_BITS "MD" POCO_DEBUG_POSTFIX ".lib")
#else
#pragma comment(lib, "libeay" POCO_PLATFORM_BITS "MT" POCO_DEBUG_POSTFIX ".lib")
#pragma comment(lib, "ssleay" POCO_PLATFORM_BITS "MT" POCO_DEBUG_POSTFIX ".lib")
#endif
#pragma comment(lib, "libcrypto.lib")
#pragma comment(lib, "libssl.lib")
#endif // POCO_EXTERNAL_OPENSSL
#if !defined(Crypto_EXPORTS)
#pragma comment(lib, "PocoCrypto" POCO_LIB_SUFFIX)

13
Crypto/include/Poco/Crypto/EVPPKey.h
View File

@ -120,6 +120,7 @@ public:
/// Returns pointer to the OpenSSL EVP_PKEY structure.
private:
static int type(EVP_PKEY* pEVPPKey);
void newECKey(const char* group);
void duplicate(EVP_PKEY* pEVPPKey);
void setKey(ECKey* pKey);
@ -244,11 +245,17 @@ private:
// inlines
//
inline int EVPPKey::type(EVP_PKEY* pEVPPKey)
{
if (!pEVPPKey) return NID_undef;
return EVP_PKEY_type(EVP_PKEY_id(pEVPPKey));
}
inline int EVPPKey::type() const
{
if (!_pEVPPKey) return NID_undef;
return EVP_PKEY_type(_pEVPPKey->type);
return type(_pEVPPKey);
}

45
Crypto/src/EVPPKey.cpp
View File

@ -213,33 +213,34 @@ void EVPPKey::duplicate(EVP_PKEY* pEVPPKey)
if (!_pEVPPKey) throw NullPointerException("EVPPKey::duplicate(): "
"EVP_PKEY_new() returned null.");
switch (pEVPPKey->type)
int keyType = type(pEVPPKey);
switch (keyType)
{
case EVP_PKEY_RSA:
case EVP_PKEY_RSA:
{
RSA* pRSA = EVP_PKEY_get1_RSA(pEVPPKey);
if (pRSA)
{
RSA* pRSA = EVP_PKEY_get1_RSA(pEVPPKey);
if (pRSA)
{
EVP_PKEY_set1_RSA(_pEVPPKey, pRSA);
RSA_free(pRSA);
}
else throw OpenSSLException();
break;
EVP_PKEY_set1_RSA(_pEVPPKey, pRSA);
RSA_free(pRSA);
}
case EVP_PKEY_EC:
else throw OpenSSLException();
break;
}
case EVP_PKEY_EC:
{
EC_KEY* pEC = EVP_PKEY_get1_EC_KEY(pEVPPKey);
if (pEC)
{
EC_KEY* pEC = EVP_PKEY_get1_EC_KEY(pEVPPKey);
if (pEC)
{
EVP_PKEY_set1_EC_KEY(_pEVPPKey, pEC);
EC_KEY_free(pEC);
}
else throw OpenSSLException("EVPPKey:duplicate()");
break;
EVP_PKEY_set1_EC_KEY(_pEVPPKey, pEC);
EC_KEY_free(pEC);
}
default:
throw NotImplementedException("EVPPKey:duplicate(); Key type: " +
NumberFormatter::format(pEVPPKey->type));
else throw OpenSSLException();
break;
}
default:
throw NotImplementedException("EVPPKey:duplicate(); Key type: " +
NumberFormatter::format(keyType));
}
}

2
Crypto/src/PKCS12Container.cpp
View File

@ -99,7 +99,7 @@ void PKCS12Container::load(PKCS12* pPKCS12, const std::string& password)
if(pBuffer)
{
_pkcsFriendlyname = pBuffer;
CRYPTO_free(pBuffer);
OPENSSL_free(pBuffer);
}else _pkcsFriendlyname.clear();
if(pBags) sk_PKCS12_SAFEBAG_pop_free(pBags, PKCS12_SAFEBAG_free);
}

2
openssl

@ -1 +1 @@
Subproject commit 6dc14894cb5cb32d8079acca9cd7d2853ba425da
Subproject commit af3dfc6ca786061640f55618b022aa4a62dffb2e