diff --git a/Crypto/Crypto.progen b/Crypto/Crypto.progen index a7f3cfa5b..b8e6f5828 100644 --- a/Crypto/Crypto.progen +++ b/Crypto/Crypto.progen @@ -7,17 +7,22 @@ vc.project.outdir = ${vc.project.pocobase} vc.project.platforms = Win32, x64, WinCE vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\Foundation\\include +vc.project.compiler.include = ..\\Foundation\\include;..\\openssl\\out\\include vc.project.compiler.defines = vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib -vc.project.linker.dependencies.debug_shared = libeay32.lib ssleay32.lib -vc.project.linker.dependencies.release_shared = libeay32.lib ssleay32.lib -vc.project.linker.dependencies.debug_static_md = libeay32mdd.lib ssleay32mdd.lib Crypt32.lib -vc.project.linker.dependencies.release_static_md = libeay32md.lib ssleay32md.lib Crypt32.lib -vc.project.linker.dependencies.debug_static_mt = libeay32mtd.lib ssleay32mtd.lib Crypt32.lib -vc.project.linker.dependencies.release_static_mt = libeay32mt.lib ssleay32mt.lib Crypt32.lib +vc.project.linker.dependencies.debug_static_md = Crypt32.lib +vc.project.linker.dependencies.release_static_md = Crypt32.lib +vc.project.linker.dependencies.debug_static_mt = Crypt32.lib +vc.project.linker.dependencies.release_static_mt = Crypt32.lib +bits = ${vc.project.platform.bits} +vc.project.prebuild.debug_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${bits}\\* +vc.project.prebuild.debug_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${bits}\\* +vc.project.prebuild.debug_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.lib ..\\lib${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.pdb ..\\lib${bits}\\* +vc.project.prebuild.release_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${bits}\\* +vc.project.prebuild.release_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${bits}\\* +vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${bits}\\* vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/Crypto/Crypto_VS90.vcproj b/Crypto/Crypto_VS90.vcproj index 0a5cc669e..dde20d07f 100644 --- a/Crypto/Crypto_VS90.vcproj +++ b/Crypto/Crypto_VS90.vcproj @@ -1,37 +1,49 @@ + Keyword="Win32Proj" + TargetFrameworkVersion="0" + > + Name="Win32" + /> - + + + CharacterSet="2" + > + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.dll ..\bin xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.lib ..\lib " + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\out\win32\bin\release\*32MD.dll ..\bin xcopy /y ..\openssl\out\win32\bin\release\*32MD.lib ..\lib " + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\out\win32\lib\debug\*32MTd.lib ..\lib xcopy /y ..\openssl\out\win32\lib\debug\*32MTd.pdb ..\lib " + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + OutputFile="..\lib\PocoCryptomtd.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\out\win32\lib\release\*32MT.lib ..\lib" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + OutputFile="..\lib\PocoCryptomt.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.dll ..\bin xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.lib ..\lib " + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + OutputFile="..\lib\PocoCryptomdd.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\out\win32\bin\release\*32MD.dll ..\bin xcopy /y ..\openssl\out\win32\bin\release\*32MD.lib ..\lib " + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + OutputFile="..\lib\PocoCryptomd.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> - + + + Name="Cipher" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Crypto\Cipher.h" + > + + RelativePath=".\include\Poco\Crypto\CipherFactory.h" + > + + RelativePath=".\include\Poco\Crypto\CipherImpl.h" + > + + RelativePath=".\include\Poco\Crypto\CipherKey.h" + > + + RelativePath=".\include\Poco\Crypto\CipherKeyImpl.h" + > + + RelativePath=".\include\Poco\Crypto\CryptoStream.h" + > + + RelativePath=".\include\Poco\Crypto\CryptoTransform.h" + > + + Name="Source Files" + > + RelativePath=".\src\Cipher.cpp" + > + + RelativePath=".\src\CipherFactory.cpp" + > + + RelativePath=".\src\CipherImpl.cpp" + > + + RelativePath=".\src\CipherKey.cpp" + > + + RelativePath=".\src\CipherKeyImpl.cpp" + > + + RelativePath=".\src\CryptoStream.cpp" + > + + RelativePath=".\src\CryptoTransform.cpp" + > + + Name="RSA" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Crypto\RSACipherImpl.h" + > + + RelativePath=".\include\Poco\Crypto\RSADigestEngine.h" + > + + RelativePath=".\include\Poco\Crypto\RSAKey.h" + > + + RelativePath=".\include\Poco\Crypto\RSAKeyImpl.h" + > + + Name="Source Files" + > + RelativePath=".\src\RSACipherImpl.cpp" + > + + RelativePath=".\src\RSADigestEngine.cpp" + > + + RelativePath=".\src\RSAKey.cpp" + > + + RelativePath=".\src\RSAKeyImpl.cpp" + > + + Name="Certificate" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Crypto\X509Certificate.h" + > + + Name="Source Files" + > + RelativePath=".\src\X509Certificate.cpp" + > + + Name="CryptoCore" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Crypto\Crypto.h" + > + + RelativePath=".\include\Poco\Crypto\OpenSSLInitializer.h" + > + + Name="Source Files" + > + RelativePath=".\src\OpenSSLInitializer.cpp" + > + + Name="Digest" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Crypto\DigestEngine.h" + > + + Name="Source Files" + > + RelativePath=".\src\DigestEngine.cpp" + > + - - - - - - + RelativePath="..\DLLVersion.rc" + > + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> - + + diff --git a/Crypto/Crypto_WEC2013_vs110.vcxproj b/Crypto/Crypto_WEC2013_vs110.vcxproj index 9be13e6e6..9fa696818 100644 --- a/Crypto/Crypto_WEC2013_vs110.vcxproj +++ b/Crypto/Crypto_WEC2013_vs110.vcxproj @@ -1,264 +1,6 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - - Crypto - {EEEE7259-32E9-4D56-B023-C733940AB2A0} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V300 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 - PocoCryptod - PocoCryptomdd - PocoCryptomtd - PocoCrypto - PocoCryptomd - PocoCryptomt - - - ..\bin\$(Platform)\ - obj\Crypto\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\Crypto\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\Crypto\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Crypto\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Crypto\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Crypto\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Crypto_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoCryptod.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoCryptod.pdb - - - ..\lib\$(Platform)\PocoCryptod.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Crypto_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoCrypto.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoCrypto.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoCryptomtd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoCryptomtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoCryptomt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoCryptomdd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoCryptomdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoCryptomd.lib - - - @@ -275,6 +17,29 @@ + + Crypto + {EEEE7259-32E9-4D56-B023-C733940AB2A0} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V300 + CE800 + + + + + + + <_ProjectFileVersion>11.0.50727.1 + PocoCryptod + PocoCryptomdd + PocoCryptomtd + PocoCrypto + PocoCryptomd + PocoCryptomt + + @@ -292,12 +57,7 @@ - - true - true - true - true - + diff --git a/Crypto/Crypto_WEC2013_vs110.vcxproj.filters b/Crypto/Crypto_WEC2013_vs110.vcxproj.filters index 68a85bc72..6bf9ff19d 100644 --- a/Crypto/Crypto_WEC2013_vs110.vcxproj.filters +++ b/Crypto/Crypto_WEC2013_vs110.vcxproj.filters @@ -2,49 +2,49 @@ - {465e8121-9b16-441e-8fff-d92f3721b4d0} + {a4dc4d52-d5ea-464f-807a-da12c5c8d5f2} - {0b372042-6616-4556-a377-cf5597f26a22} + {03f8bf15-3d15-45dd-9bd5-248c46f93fcf} - {a7cbec0d-3734-48d6-b77d-a03c8aad3cdb} + {b56d419c-e235-40b7-bdc3-86cbeac4bc86} - {eda6b73c-7cd7-429d-b1fd-9f44963a27ff} + {45360a7b-6482-4e67-8fa3-15cd93b0d8ca} - {3bf2c33f-a2f0-4b1f-b306-ef838b20c511} + {1a4f5bb5-df95-45be-924b-29781cce5753} - {23cf9511-7c2e-4f6d-9f09-669611fab997} + {d8455f19-ac5b-4418-a531-7be68b4b9ca9} - {f53302cf-7071-41d4-ad8f-cd927d905ff9} + {8bf5dd41-b4fb-4f17-946b-8c618490ee61} - {c2907fe6-d7a4-46b6-8190-647ae0c8d8bf} + {8642e4a2-b280-41f3-9374-afac492a9d66} - {4dd73f14-b378-43c8-9ac0-d25831a87711} + {42c09dfe-437a-4e58-8371-acb150fd2eb9} - {de8a188c-d76a-420a-b447-b7dc2bd4ca00} + {74c17225-e97d-46a2-92ad-8f8025a18243} - {400fcfce-c402-4616-91b8-ee0951aad4b9} + {8754db20-520a-496b-b981-79bea5c99704} - {30aba583-f401-40de-9e6e-6681df14274a} + {d800e20e-c958-405d-891e-106585e1be9d} - {ab0bd4cd-7e6d-4f2d-8259-fa5b40a4cf5f} + {02ecf004-c84c-4f54-b6fa-5c37cbcc21b5} - {355bfe67-7d41-4573-82b3-4cdee3bb7953} + {bf8ce67d-0663-4db1-9817-44e4c6a1ba2f} - {bb72de48-9546-4d0d-9aee-7ee035c6301a} + {f52f8220-c517-4d3d-bee9-62d858737b86} diff --git a/Crypto/Crypto_WEC2013_vs120.vcxproj b/Crypto/Crypto_WEC2013_vs120.vcxproj index a43f387fb..e31020628 100644 --- a/Crypto/Crypto_WEC2013_vs120.vcxproj +++ b/Crypto/Crypto_WEC2013_vs120.vcxproj @@ -1,30 +1,21 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - + + + + + + + + + + + + + + + Crypto @@ -36,59 +27,11 @@ CE800 - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 PocoCryptod PocoCryptomdd PocoCryptomtd @@ -96,185 +39,7 @@ PocoCryptomd PocoCryptomt - - ..\bin\$(Platform)\ - obj\Crypto\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\Crypto\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\Crypto\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Crypto\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Crypto\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Crypto\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Crypto_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoCryptod.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoCryptod.pdb - - - ..\lib\$(Platform)\PocoCryptod.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Crypto_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoCrypto.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoCrypto.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoCryptomtd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoCryptomtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoCryptomt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoCryptomdd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoCryptomdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoCryptomd.lib - - - - - - - - - - - - - - - - - - - + @@ -283,21 +48,16 @@ - - + + - - true - true - true - true - + diff --git a/Crypto/Crypto_WEC2013_vs120.vcxproj.filters b/Crypto/Crypto_WEC2013_vs120.vcxproj.filters index cc51116aa..eb4c4b0e0 100644 --- a/Crypto/Crypto_WEC2013_vs120.vcxproj.filters +++ b/Crypto/Crypto_WEC2013_vs120.vcxproj.filters @@ -2,49 +2,49 @@ - {6507102d-dbe1-46e4-814e-4df296cf7086} + {23b2bf58-5aa8-4ed0-beca-1f324d657194} - {51f353a2-11de-4571-ad66-cb15c08410bc} + {4aee1126-49f3-44fd-8241-36f3aa435553} - {b01a2305-9b1e-420e-94a9-cce479bda006} + {1067fa5b-8654-40eb-b03e-ff6dd0280297} - {00891559-b515-48d9-825a-ca6df7c6d2e0} + {3eb09a30-4b79-48e0-b4a3-c5dbb49cf82a} - {47389051-5dab-4196-a869-097b36239271} + {c0df77cc-c88d-42e2-a3d1-63ca3683b780} - {d78cc93f-edbc-4f55-b923-16a90c950423} + {b690800f-d172-4d15-b087-2e4f3ab25108} - {dcc1dbe2-d6e6-47ea-8ba6-6bad761d8468} + {e0667afe-1ac4-4e08-bf2f-2f7c0d93a00f} - {39a85a47-5a6b-4fbf-ad4a-62c35e3ac316} + {17f7d34e-1634-408e-9bba-8368515a5ba1} - {129c8e5f-8f6c-4efc-ab97-f0c7ee690ffe} + {7228a9bb-e45b-43ea-8301-8cd6bc064c16} - {93d68f47-b703-4762-9978-666d42ac725c} + {288abc55-3a96-45b5-aa93-e5eefc9ef483} - {195c06ea-a61b-48e9-b8c4-353aa0573444} + {af5300c6-dd9a-4ddd-b163-a4833323936b} - {680dfb50-3603-48ee-8700-4e68152d3472} + {23cf0ff2-6810-4acf-b8c6-906f9ef2aff6} - {6ab2a0bb-5e20-477c-b23b-f7f96304f542} + {da731193-ec45-4bab-b3b8-7205a19dea93} - {ff396227-6c86-4b3d-8fb8-f28ebe2cdd2f} + {c84f0bac-d61e-44a0-95f2-614d60cabf77} - {8e8eb5d9-8618-4b6e-8209-06683de083b4} + {c4f03fa9-2fd1-4880-99d4-a72763f3f07f} diff --git a/Crypto/Crypto_vs100.vcxproj b/Crypto/Crypto_vs100.vcxproj index 64643462f..bb278196e 100644 --- a/Crypto/Crypto_vs100.vcxproj +++ b/Crypto/Crypto_vs100.vcxproj @@ -102,9 +102,13 @@ PocoCryptomt + + xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.dll ..\bin32 +xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.lib ..\lib32 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -122,7 +126,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoCryptod.dll true true @@ -135,13 +139,17 @@ + + xcopy /y ..\openssl\out\win32\bin\release\*32MD.dll ..\bin32 +xcopy /y ..\openssl\out\win32\bin\release\*32MD.lib ..\lib32 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +165,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoCrypto.dll true false @@ -171,9 +179,13 @@ + + xcopy /y ..\openssl\out\win32\lib\debug\*32MTd.lib ..\lib32 +xcopy /y ..\openssl\out\win32\lib\debug\*32MTd.pdb ..\lib32 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -196,13 +208,16 @@ + + xcopy /y ..\openssl\out\win32\lib\release\*32MT.lib ..\lib32 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -222,9 +237,13 @@ + + xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.dll ..\bin32 +xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.lib ..\lib32 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -247,13 +266,17 @@ + + xcopy /y ..\openssl\out\win32\bin\release\*32MD.dll ..\bin32 +xcopy /y ..\openssl\out\win32\bin\release\*32MD.lib ..\lib32 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -270,7 +293,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) ..\lib\PocoCryptomd.lib @@ -309,8 +332,10 @@ + true true true + true true true diff --git a/Crypto/Crypto_vs100.vcxproj.filters b/Crypto/Crypto_vs100.vcxproj.filters index a3c507014..0fc5026bf 100644 --- a/Crypto/Crypto_vs100.vcxproj.filters +++ b/Crypto/Crypto_vs100.vcxproj.filters @@ -2,49 +2,49 @@ - {71dc04c4-a3b2-4b6e-a4ef-73f5d4f1fe9d} + {985218e3-9b0b-4f03-9927-2be17883fb2e} - {3926ffdb-6848-40b6-af21-d12bbb732b3d} + {588dfb88-091f-49f3-b312-6b4721326d29} - {db2aa1d3-10c5-4761-9989-9174af2b53b0} + {1e1f8ff7-1565-4e4a-b0da-e8b6a07dd37c} - {0a923d97-8bf1-417a-890f-91e3b1dca98e} + {2b1cff1f-c1da-40b2-9460-275f54ff6ab4} - {4487ee33-7af3-49e4-97ee-0039b0e9291e} + {29f5b736-46b2-4b4c-a8e3-103ecc60a96a} - {ac3b6e25-c3d2-4dde-bbdd-82a7c5c77941} + {dfc786e9-a903-4122-94cd-4bb570a271be} - {e4b3fce1-2506-4607-8d68-2b6863f6f01c} + {f25bc4fe-d926-4d03-8505-df8b77c320b1} - {3a3cdc61-acd2-4e65-85e8-be288370c317} + {12618526-39a1-4f42-aae9-cfac6e26feed} - {bf8e3521-4a41-4482-8180-dddb89396035} + {8cc93e55-f1f4-421d-8323-92489175b5d3} - {fed0627f-5b88-433d-b3de-2d9820736a9f} + {9f39de9e-7000-4e49-9ed9-1f1e3df151ea} - {e37ad2dc-4e9f-4130-aee2-fecff255d480} + {fb94096d-c669-4ae9-95a8-f058881658dd} - {87fc1695-e12f-4d1a-a676-2ecc81bcca18} + {baaf5f44-fbe7-4aff-b003-5b291d837fa2} - {44ce7f91-0484-4921-b6b7-52842308dc44} + {41540ae2-232f-4e69-b1f6-7c54d88d8ebc} - {5b75c8e1-4b19-4bdb-a8da-0ee85c772344} + {64251b82-45f4-4bc3-ae5b-489c322a9196} - {855c5194-1d8f-44f4-93f4-19e142493c05} + {fcedb94c-e492-4196-a428-4849c77eb67e} diff --git a/Crypto/Crypto_vs110.vcxproj b/Crypto/Crypto_vs110.vcxproj index 6f09c2bc1..900c12d5b 100644 --- a/Crypto/Crypto_vs110.vcxproj +++ b/Crypto/Crypto_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoCryptod PocoCryptomdd PocoCryptomtd @@ -120,9 +120,13 @@ obj\Crypto\$(Configuration)\ + + xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.dll ..\bin32 +xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.lib ..\lib32 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoCryptod.dll true true @@ -150,13 +154,17 @@ + + xcopy /y ..\openssl\out\win32\bin\release\*32MD.dll ..\bin32 +xcopy /y ..\openssl\out\win32\bin\release\*32MD.lib ..\lib32 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +178,7 @@ Default - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoCrypto.dll true false @@ -183,9 +191,13 @@ + + xcopy /y ..\openssl\out\win32\lib\debug\*32MTd.lib ..\lib32 +xcopy /y ..\openssl\out\win32\lib\debug\*32MTd.pdb ..\lib32 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +218,16 @@ + + xcopy /y ..\openssl\out\win32\lib\release\*32MT.lib ..\lib32 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +245,13 @@ + + xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.dll ..\bin32 +xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.lib ..\lib32 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +272,17 @@ + + xcopy /y ..\openssl\out\win32\bin\release\*32MD.dll ..\bin32 +xcopy /y ..\openssl\out\win32\bin\release\*32MD.lib ..\lib32 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -274,7 +297,7 @@ Default - ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) ..\lib\PocoCryptomd.lib @@ -313,8 +336,10 @@ + true true true + true true true diff --git a/Crypto/Crypto_vs110.vcxproj.filters b/Crypto/Crypto_vs110.vcxproj.filters index c1ba693d5..c19e2d2ac 100644 --- a/Crypto/Crypto_vs110.vcxproj.filters +++ b/Crypto/Crypto_vs110.vcxproj.filters @@ -2,49 +2,49 @@ - {7180e1e7-f8d9-4098-85e6-8f0e25a5f2ae} + {ba039a9f-9193-48e5-9375-76a246807613} - {3329478c-3eee-4efa-921e-dc33abd0c8ac} + {1b60ca20-d8fd-4102-9638-0eb8579ced7a} - {1491f39b-290c-483a-af10-39c8f3c1b8f0} + {046567e4-7fa8-4c67-9ca1-ab1fb983c7b6} - {4448fec3-5a6a-4a9a-b403-dd4aea9f5fbd} + {5b8abe6d-90e5-42e0-b2fd-095ef2244403} - {976240fb-dd22-40aa-9985-c82e361a6045} + {8c79e49a-d8a0-44c5-9ac6-c2631abd1ad2} - {1e1b8265-5a56-4a67-973b-cacf5f5b7aa7} + {964b1601-e1fc-4437-9340-1496aa91b5ea} - {35f35313-371e-4f3d-8fc6-29cc5fb9d5f6} + {c9e82f47-7956-4b4b-956d-c834d0e57ba2} - {a0afac60-127f-4faf-960f-b8701343f3b9} + {b6a3e2a7-62e6-43be-9a3e-232cb7f7d64d} - {8334d7a1-be41-412e-8f57-162fe5a00de5} + {31bd57eb-de95-4cc0-b1a7-46aab739dfee} - {deb3127d-d211-4964-bbbe-df28cb245d4d} + {3a6eea1a-789c-4e55-8ff9-e00c276ae4c8} - {3c255391-d9cf-46a6-9b03-82c187852b85} + {bd957b66-7e31-45ef-9330-cd41b68b6e8e} - {8bdea7e4-c751-417f-b70f-a77b5d43e225} + {a40328fd-28d2-4258-80db-03a5f71f84e9} - {d4d3c083-d6bb-4f63-ac1d-4b41d92f7648} + {09829b32-6bc4-4ffd-9afd-bf4be9acc5c8} - {d4df8d98-263f-4ccf-b5f5-61b6c78cc5d5} + {b1e3e57c-b3ab-4120-a5c0-3e28ed0176d5} - {d02a12ff-1344-44bd-bcc3-a7d78826dbee} + {b773dfd8-e801-4452-97af-734f6f77d87a} diff --git a/Crypto/Crypto_vs120.vcxproj b/Crypto/Crypto_vs120.vcxproj index b4e7aca64..6f2600959 100644 --- a/Crypto/Crypto_vs120.vcxproj +++ b/Crypto/Crypto_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 PocoCryptod PocoCryptomdd PocoCryptomtd @@ -120,9 +120,13 @@ obj\Crypto\$(Configuration)\ + + xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.dll ..\bin32 +xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.lib ..\lib32 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoCryptod.dll true true @@ -150,13 +154,17 @@ + + xcopy /y ..\openssl\out\win32\bin\release\*32MD.dll ..\bin32 +xcopy /y ..\openssl\out\win32\bin\release\*32MD.lib ..\lib32 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +178,7 @@ Default - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoCrypto.dll true false @@ -183,9 +191,13 @@ + + xcopy /y ..\openssl\out\win32\lib\debug\*32MTd.lib ..\lib32 +xcopy /y ..\openssl\out\win32\lib\debug\*32MTd.pdb ..\lib32 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +218,16 @@ + + xcopy /y ..\openssl\out\win32\lib\release\*32MT.lib ..\lib32 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +245,13 @@ + + xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.dll ..\bin32 +xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.lib ..\lib32 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +272,17 @@ + + xcopy /y ..\openssl\out\win32\bin\release\*32MD.dll ..\bin32 +xcopy /y ..\openssl\out\win32\bin\release\*32MD.lib ..\lib32 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -274,7 +297,7 @@ Default - ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) ..\lib\PocoCryptomd.lib @@ -284,16 +307,16 @@ - - - + + + @@ -303,18 +326,20 @@ - - + + + true true true + true true true diff --git a/Crypto/Crypto_vs120.vcxproj.filters b/Crypto/Crypto_vs120.vcxproj.filters index d033e4180..672d5f10f 100644 --- a/Crypto/Crypto_vs120.vcxproj.filters +++ b/Crypto/Crypto_vs120.vcxproj.filters @@ -2,49 +2,49 @@ - {5ae83f98-0b68-403d-8ce9-b5443d6cab4e} + {64d0948c-9d29-4ced-97a2-71a7043862d1} - {a686911a-ad67-48a4-a1ea-1ec79bdf1f47} + {21421141-85fe-4eed-aabf-07f2df29a203} - {6a543ff0-2b57-42f6-90c1-40dd0847171f} + {13a2a2ef-a238-44b2-a7a7-cc74ed2a13ca} - {d5790207-151f-45c8-9658-e05578a0e5df} + {7538aa07-cd18-4825-ac3c-7eff6a02fe60} - {f5373b08-b9cd-4925-b894-23d23a4cd22e} + {b341aeaa-b10e-418b-bdd4-5a85471a6427} - {68263161-1452-4b04-81f6-4db3ceb477f7} + {8b328e22-ce01-44c0-9557-ec4fab8837a7} - {81cd526b-d1f7-4ff7-bab3-4e6fa3037ea4} + {c01d13ab-1f7d-4e61-8af3-67e75ee2b270} - {87487a68-b26f-4343-8e01-4ed069b04a21} + {f2b20826-bc48-4a12-8558-64f291d6282d} - {3958bf26-33d7-468c-9e4d-617c816aa107} + {2164d6d6-5d5d-4a46-a82d-5b616d0521af} - {aee2d403-7869-4e1a-9224-88158b62c6e2} + {6f65ad9b-ec31-4216-ac6e-1feae7276551} - {3d232344-7880-4e4c-83b0-daa97a4593d7} + {9995ba6d-1107-4036-a276-a6a870e25f09} - {cdc058d1-00ae-4180-a5f1-68521ae4bf6e} + {a3c88ec4-f7a6-479b-89fd-cb19d2b744d4} - {9e54bee8-542d-4f3e-8338-2c494cedd39d} + {b40cca94-3edd-454f-b1dd-8a77bf386551} - {f7370629-f891-4682-a902-89e362cce1af} + {c907646a-56ec-4b60-b3b7-887928ec02de} - {cddde1df-5a57-4fe5-996d-274e1cd1b10b} + {d3dc46ac-7b96-4569-ae64-355dd66aabd6} diff --git a/Crypto/Crypto_x64_vs100.vcxproj b/Crypto/Crypto_x64_vs100.vcxproj index b9a261d02..07b2ec87f 100644 --- a/Crypto/Crypto_x64_vs100.vcxproj +++ b/Crypto/Crypto_x64_vs100.vcxproj @@ -102,9 +102,13 @@ PocoCryptomt + + xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.dll ..\bin64 +xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.lib ..\lib64 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -122,7 +126,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoCrypto64d.dll true true @@ -135,13 +139,17 @@ + + xcopy /y ..\openssl\out\win64\bin\release\*64MD.dll ..\bin64 +xcopy /y ..\openssl\out\win64\bin\release\*64MD.lib ..\lib64 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +165,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoCrypto64.dll true false @@ -171,9 +179,13 @@ + + xcopy /y ..\openssl\out\win64\lib\debug\*64MTd.lib ..\lib64 +xcopy /y ..\openssl\out\win64\lib\debug\*64MTd.pdb ..\lib64 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -196,13 +208,16 @@ + + xcopy /y ..\openssl\out\win64\lib\release\*64MT.lib ..\lib64 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -222,9 +237,13 @@ + + xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.dll ..\bin64 +xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.lib ..\lib64 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -247,13 +266,17 @@ + + xcopy /y ..\openssl\out\win64\bin\release\*64MD.dll ..\bin64 +xcopy /y ..\openssl\out\win64\bin\release\*64MD.lib ..\lib64 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -307,8 +330,10 @@ + true true true + true true true diff --git a/Crypto/Crypto_x64_vs100.vcxproj.filters b/Crypto/Crypto_x64_vs100.vcxproj.filters index a58e9cb23..52c91398f 100644 --- a/Crypto/Crypto_x64_vs100.vcxproj.filters +++ b/Crypto/Crypto_x64_vs100.vcxproj.filters @@ -2,49 +2,49 @@ - {41473f3a-cada-47de-be58-8011fe717c47} + {f0d0c722-6ff8-4ec1-a7a2-e9ee69b26877} - {19e607e0-a163-46c8-81b4-27266a0a4faf} + {1c9b3d87-4c16-41ae-9488-eda00201b9f9} - {4fe9d67a-cbbd-41ab-9d43-d084c6eae4ae} + {e3610a2a-560c-4cff-8096-cd48273c610d} - {e98a81e1-6f8e-46a4-9a03-1d426a5db4c7} + {c3fe6b5a-5d9a-4554-9d07-3cb7681a31ca} - {d130fbb6-1ba9-4640-b21e-c395efeb88ff} + {2d20ad64-df0e-467b-9bbd-b3873990f3b6} - {f3dcd92e-27ce-4ffc-8db1-823769d94e6e} + {d0651205-f88e-4924-99b2-6c6075c5adbf} - {750a7ed0-ca4b-460a-8356-8a9731ffc03a} + {1c3db86a-36f8-4c42-901f-e3143aae3bd9} - {c991ec62-51d9-4893-916a-7b4e4637f76d} + {80003f03-c256-4e1f-8a93-9c42a7eb7065} - {929a7175-814a-41b9-9db3-8339f8387980} + {d57cd631-0d57-433b-88e5-ea20415f3021} - {0350d7c1-2a11-4bf4-a040-ec0c72437b07} + {da23d4e8-b0b4-40c6-9077-de48ac2e2dfd} - {8be90aa4-1aea-4753-ac62-ea92a3899a61} + {588fc269-0df8-4041-b2f0-44a66edcfedd} - {8783ad17-d9dd-4e8b-8514-5509db84d960} + {df2dc078-56e2-4a77-b80b-14810bebaab5} - {dad6c757-4c14-4684-8307-1c2f12bd64bb} + {20adedf3-8b9a-4b9a-b7bf-1cfdb44aa912} - {521a8698-9c5f-4491-b979-feb2b43540ea} + {4fe668de-e83b-4d6f-b73a-0a0415ba378f} - {fa65b55f-f708-451f-87a0-8c6ce53abcc4} + {46d663cf-d99d-4cd9-b1b2-e1e81db0db45} diff --git a/Crypto/Crypto_x64_vs110.vcxproj b/Crypto/Crypto_x64_vs110.vcxproj index cd6b9ff74..94c26c029 100644 --- a/Crypto/Crypto_x64_vs110.vcxproj +++ b/Crypto/Crypto_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoCrypto64d PocoCryptomdd PocoCryptomtd @@ -120,9 +120,13 @@ obj64\Crypto\$(Configuration)\ + + xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.dll ..\bin64 +xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.lib ..\lib64 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoCrypto64d.dll true true @@ -150,13 +154,17 @@ + + xcopy /y ..\openssl\out\win64\bin\release\*64MD.dll ..\bin64 +xcopy /y ..\openssl\out\win64\bin\release\*64MD.lib ..\lib64 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +178,7 @@ Default - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoCrypto64.dll true false @@ -183,9 +191,13 @@ + + xcopy /y ..\openssl\out\win64\lib\debug\*64MTd.lib ..\lib64 +xcopy /y ..\openssl\out\win64\lib\debug\*64MTd.pdb ..\lib64 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +218,16 @@ + + xcopy /y ..\openssl\out\win64\lib\release\*64MT.lib ..\lib64 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +245,13 @@ + + xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.dll ..\bin64 +xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.lib ..\lib64 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +272,17 @@ + + xcopy /y ..\openssl\out\win64\bin\release\*64MD.dll ..\bin64 +xcopy /y ..\openssl\out\win64\bin\release\*64MD.lib ..\lib64 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -311,8 +334,10 @@ + true true true + true true true diff --git a/Crypto/Crypto_x64_vs110.vcxproj.filters b/Crypto/Crypto_x64_vs110.vcxproj.filters index 3f1e4c7d8..5f5448641 100644 --- a/Crypto/Crypto_x64_vs110.vcxproj.filters +++ b/Crypto/Crypto_x64_vs110.vcxproj.filters @@ -2,49 +2,49 @@ - {b22e4ebe-200f-40e7-add9-f9b48a0a7df0} + {035197f8-0955-4a4a-bc11-5f3bb5d31cf5} - {c9065ba7-1562-49fc-b013-9cacd6c4c207} + {b7f87174-151e-4f2f-ac3c-1da7156ea723} - {0c4951bd-731a-4b7c-8dbc-14ecd993e2f0} + {c540ebc7-27b1-4cac-9711-e3d72acab969} - {67e63db8-e2b5-4d74-94b0-6ba9d9f49d0c} + {48395c84-a8fc-4fc4-863f-910b9b7ae08c} - {aee015d5-daf0-43a5-afd1-b24e0a3b6e47} + {2af065a7-3e5e-432c-b2b0-f5eae33d738b} - {cb91d4af-e801-4a18-ab9f-2a97f65e41ce} + {a019d7a4-a71e-451f-9bc2-fb9ad61215b3} - {04a39e73-60cd-4822-8704-e9bc43c56289} + {d1d22438-4bdb-44ac-984b-6040960722c5} - {b5032320-fbed-490a-9633-e0fda728df0f} + {75deee99-971f-49eb-9170-2d09097c78f2} - {04db063b-e811-41c9-8e23-feea65d2f0c1} + {c3af7a65-46af-4af5-845f-88bd28deb699} - {b86f6951-487b-4e30-853a-823ffb4b3043} + {d86c6dcf-6164-4220-a12d-c7ba63511904} - {43cbade1-51d1-4849-9110-853f70248774} + {eb3a35b5-6de4-476e-8d0d-9b6160acbc9e} - {6c52e2d0-25c4-427d-ae4f-55e1334a0ea8} + {4a7d1ad8-bd8a-437d-b96f-3f4544bf3878} - {1fb87234-cd37-47da-9e5e-0c63ce2c17ee} + {b7364e20-83f3-4e05-9890-192080628de9} - {bc37e6bb-0d20-4810-be24-8f22d3481bdb} + {603edbc6-cb01-4a87-ad64-611af3a5ec0d} - {91ff8a37-7e13-4614-aa41-e30c4b695743} + {35fc572f-ed7e-4670-863c-a692f559fb98} diff --git a/Crypto/Crypto_x64_vs120.vcxproj b/Crypto/Crypto_x64_vs120.vcxproj index 982ef63ed..bfc66728a 100644 --- a/Crypto/Crypto_x64_vs120.vcxproj +++ b/Crypto/Crypto_x64_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 PocoCrypto64d PocoCryptomdd PocoCryptomtd @@ -120,9 +120,13 @@ obj64\Crypto\$(Configuration)\ + + xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.dll ..\bin64 +xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.lib ..\lib64 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoCrypto64d.dll true true @@ -150,13 +154,17 @@ + + xcopy /y ..\openssl\out\win64\bin\release\*64MD.dll ..\bin64 +xcopy /y ..\openssl\out\win64\bin\release\*64MD.lib ..\lib64 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +178,7 @@ Default - ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoCrypto64.dll true false @@ -183,9 +191,13 @@ + + xcopy /y ..\openssl\out\win64\lib\debug\*64MTd.lib ..\lib64 +xcopy /y ..\openssl\out\win64\lib\debug\*64MTd.pdb ..\lib64 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +218,16 @@ + + xcopy /y ..\openssl\out\win64\lib\release\*64MT.lib ..\lib64 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +245,13 @@ + + xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.dll ..\bin64 +xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.lib ..\lib64 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +272,17 @@ + + xcopy /y ..\openssl\out\win64\bin\release\*64MD.dll ..\bin64 +xcopy /y ..\openssl\out\win64\bin\release\*64MD.lib ..\lib64 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -282,16 +305,16 @@ - - - + + + @@ -301,18 +324,20 @@ - - + + + true true true + true true true diff --git a/Crypto/Crypto_x64_vs120.vcxproj.filters b/Crypto/Crypto_x64_vs120.vcxproj.filters index a8ec2b5eb..97df0f7b3 100644 --- a/Crypto/Crypto_x64_vs120.vcxproj.filters +++ b/Crypto/Crypto_x64_vs120.vcxproj.filters @@ -2,49 +2,49 @@ - {61f480eb-f537-4490-afa6-de43dad6f50c} + {cebcd2ef-d11e-49ec-a7d6-77b9189beaaf} - {17966432-0ecb-4056-a1be-f10f552fda18} + {03519048-884e-4ae5-ad33-dfa0ebb654e6} - {cb319c84-df0e-4c1d-b686-645f7be90ca4} + {101b508d-0c76-49cf-b737-a28ce5aae58e} - {912ba4b5-f1ca-45b1-93ba-e01eac37ff78} + {951e7565-a3ab-43fb-a56b-0dfece62cdfe} - {8520e77e-d8ba-4d8f-bc8e-d67b3ff777db} + {f2f414f3-b966-4e5a-857f-eb07fef240a9} - {6d9e9a81-ca3a-46ed-8d6b-cf714a594b8d} + {9a31e30c-4f8d-4af9-8e76-74d00cc64089} - {196d1039-1490-4136-9652-705e2d9c5306} + {a2edae4a-e18b-4f55-a3a9-5a61c5035dee} - {6e213a53-c061-42dc-9fb7-1bd0eb4d079d} + {304c7183-d424-4492-b48a-3c4001159670} - {72a1f7a0-22ac-4815-877f-bd9ad751b3b6} + {9949a703-c7b7-488b-b83e-6900e6533b3e} - {d2321ab1-08c6-4ae5-84bf-7827c396e5c0} + {7675f339-f2e5-4ac6-a5bd-c57e3120806b} - {bab4e84b-3c1c-4dee-8f6d-ce8b733b0f69} + {1306ca47-0704-4f02-966b-3d803f692028} - {7cb4cbe0-8df6-4a7e-b2ff-82447f69b4c5} + {d62c0fcc-53d7-40e5-9d4d-3e68ec8f17c8} - {fa17836c-1be4-4804-beb0-57e71a678321} + {ae1aa64e-4efe-402c-aec9-0876bc1e859e} - {a9c9c4ca-654b-4713-a948-f3fc8c0ebbda} + {afa1463d-d3f7-488a-a621-ea63416ebb5c} - {a773c1bc-f5c5-4b6f-b8a7-866977541ff2} + {590428af-2b17-44b3-89f9-f2737be0c8f0} diff --git a/Crypto/Crypto_x64_vs90.vcproj b/Crypto/Crypto_x64_vs90.vcproj index 8c129ee5c..c41469b53 100644 --- a/Crypto/Crypto_x64_vs90.vcproj +++ b/Crypto/Crypto_x64_vs90.vcproj @@ -1,37 +1,49 @@ + Keyword="Win32Proj" + TargetFrameworkVersion="0" + > + Name="x64" + /> - + + + CharacterSet="2" + > + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.dll ..\bin64 xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.lib ..\lib64" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\out\win64\bin\release\*64MD.dll ..\bin64 xcopy /y ..\openssl\out\win64\bin\release\*64MD.lib ..\lib64" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\out\win64\lib\debug\*64MTd.lib ..\lib64 xcopy /y ..\openssl\out\win64\lib\debug\*64MTd.pdb ..\lib64" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\out\win64\lib\release\*64MT.lib ..\lib64" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.dll ..\bin64 xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.lib ..\lib64" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\out\win64\bin\release\*64MD.dll ..\bin64 xcopy /y ..\openssl\out\win64\bin\release\*64MD.lib ..\lib64" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> - + + + Name="Cipher" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Crypto\Cipher.h" + > + + RelativePath=".\include\Poco\Crypto\CipherFactory.h" + > + + RelativePath=".\include\Poco\Crypto\CipherImpl.h" + > + + RelativePath=".\include\Poco\Crypto\CipherKey.h" + > + + RelativePath=".\include\Poco\Crypto\CipherKeyImpl.h" + > + + RelativePath=".\include\Poco\Crypto\CryptoStream.h" + > + + RelativePath=".\include\Poco\Crypto\CryptoTransform.h" + > + + Name="Source Files" + > + RelativePath=".\src\Cipher.cpp" + > + + RelativePath=".\src\CipherFactory.cpp" + > + + RelativePath=".\src\CipherImpl.cpp" + > + + RelativePath=".\src\CipherKey.cpp" + > + + RelativePath=".\src\CipherKeyImpl.cpp" + > + + RelativePath=".\src\CryptoStream.cpp" + > + + RelativePath=".\src\CryptoTransform.cpp" + > + + Name="RSA" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Crypto\RSACipherImpl.h" + > + + RelativePath=".\include\Poco\Crypto\RSADigestEngine.h" + > + + RelativePath=".\include\Poco\Crypto\RSAKey.h" + > + + RelativePath=".\include\Poco\Crypto\RSAKeyImpl.h" + > + + Name="Source Files" + > + RelativePath=".\src\RSACipherImpl.cpp" + > + + RelativePath=".\src\RSADigestEngine.cpp" + > + + RelativePath=".\src\RSAKey.cpp" + > + + RelativePath=".\src\RSAKeyImpl.cpp" + > + + Name="Certificate" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Crypto\X509Certificate.h" + > + + Name="Source Files" + > + RelativePath=".\src\X509Certificate.cpp" + > + + Name="CryptoCore" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Crypto\Crypto.h" + > + + RelativePath=".\include\Poco\Crypto\OpenSSLInitializer.h" + > + + Name="Source Files" + > + RelativePath=".\src\OpenSSLInitializer.cpp" + > + + Name="Digest" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Crypto\DigestEngine.h" + > + + Name="Source Files" + > + RelativePath=".\src\DigestEngine.cpp" + > + - - - - - - + RelativePath="..\DLLVersion.rc" + > + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> - + + diff --git a/Crypto/include/Poco/Crypto/Crypto.h b/Crypto/include/Poco/Crypto/Crypto.h index fcfb20ec2..6696a6ac3 100644 --- a/Crypto/include/Poco/Crypto/Crypto.h +++ b/Crypto/include/Poco/Crypto/Crypto.h @@ -79,12 +79,35 @@ enum RSAPaddingMode // -// Automatically link Crypto library. +// Automatically link Crypto and OpenSSL libraries. // #if defined(_MSC_VER) - #if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(Crypto_EXPORTS) - #pragma comment(lib, "PocoCrypto" POCO_LIB_SUFFIX) + + #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 (_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 + #if !defined(Crypto_EXPORTS) + #pragma comment(lib, "PocoCrypto" POCO_LIB_SUFFIX) + #endif + #endif + #endif diff --git a/Crypto/testsuite/TestSuite.progen b/Crypto/testsuite/TestSuite.progen index 0ac15ac2f..244e091eb 100644 --- a/Crypto/testsuite/TestSuite.progen +++ b/Crypto/testsuite/TestSuite.progen @@ -6,11 +6,9 @@ vc.project.pocobase = ..\\.. vc.project.platforms = Win32, x64, WinCE vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj -vc.project.compiler.include = ..\\..\\Foundation\\include +vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\openssl\\out\\include vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib -vc.project.linker.dependencies.debug_shared = libeay32.lib ssleay32.lib -vc.project.linker.dependencies.release_shared = libeay32.lib ssleay32.lib -vc.project.linker.dependencies.debug_static_md = libeay32.lib ssleay32.lib -vc.project.linker.dependencies.release_static_md = libeay32.lib ssleay32.lib -vc.project.linker.dependencies.debug_static_mt = libeay32mtd.lib ssleay32mtd.lib Crypt32.lib -vc.project.linker.dependencies.release_static_mt = libeay32mt.lib ssleay32mt.lib Crypt32.lib +vc.project.linker.dependencies.debug_static_md = Crypt32.lib +vc.project.linker.dependencies.release_static_md = Crypt32.lib +vc.project.linker.dependencies.debug_static_mt = Crypt32.lib +vc.project.linker.dependencies.release_static_mt = Crypt32.lib diff --git a/Crypto/testsuite/TestSuite_VS90.vcproj b/Crypto/testsuite/TestSuite_VS90.vcproj index a2db02f67..3a24d02f4 100644 --- a/Crypto/testsuite/TestSuite_VS90.vcproj +++ b/Crypto/testsuite/TestSuite_VS90.vcproj @@ -1,16 +1,20 @@ + Keyword="Win32Proj" + TargetFrameworkVersion="0" + > + Name="Win32" + /> - + + + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> - + + + Name="Crypto" + > + Name="Header Files" + > + RelativePath=".\src\CryptoTest.h" + > + + RelativePath=".\src\DigestEngineTest.cpp" + > + + RelativePath=".\src\DigestEngineTest.h" + > + + RelativePath=".\src\RSATest.h" + > + + Name="Source Files" + > + RelativePath=".\src\CryptoTest.cpp" + > + + RelativePath=".\src\RSATest.cpp" + > + + Name="_Suite" + > + Name="Header Files" + > + RelativePath=".\src\CryptoTestSuite.h" + > + + Name="Source Files" + > + RelativePath=".\src\CryptoTestSuite.cpp" + > + + Name="_Driver" + > + Name="Source Files" + > + RelativePath=".\src\WinDriver.cpp" + > + - + + diff --git a/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj b/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj index b86c91fb5..cd2fc1851 100644 --- a/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj @@ -1,30 +1,10 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - + + + + TestSuite @@ -36,59 +16,11 @@ CE800 - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -96,222 +28,7 @@ TestSuite TestSuite - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\shared\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - CppUnit.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmtd.lib;iphlpapi.lib;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_mt\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmt.lib;iphlpapi.lib;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmdd.lib;iphlpapi.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_md\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmd.lib;iphlpapi.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - - - - + diff --git a/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 0a1f786c0..c0e6fadb4 100644 --- a/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {3c777bbf-2b32-4c38-9793-493b97b4cfd3} + {d379a2af-a0b8-4453-aa5b-2598f4c99be0} - {f592a32a-be3f-4814-ba52-998a00700151} + {060f0e18-b181-4fbf-b9ff-e9871a34d43d} - {a849c00f-88db-4597-b917-e47a1a90b49d} + {1ec396e5-317c-439b-bbbc-a889c078bae9} - {45568015-ddf6-4d65-ac5d-a992c9951415} + {236be799-cd5f-49a9-bb41-c4a8a1e48d99} - {caa322b1-b4da-4d3c-a366-284041ad6a95} + {7bd7f65a-b758-4af4-98a7-89a177a4f595} - {08f3a7df-9ca5-428f-b451-86cf927e7cf3} + {97c020cd-b37f-4484-92de-4785f67f0a3d} - {a3778731-dbd3-4a6f-bc1d-78c7581f0e0c} + {29dea733-8244-47d0-a466-53f6c9c928ab} - {aa1b2657-0bd2-42dd-8b21-be405bbaf9ae} + {248958cf-718e-4ea6-a7b5-f59917a54ab0} diff --git a/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj index 66bbef31a..eb68d4db8 100644 --- a/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -1,30 +1,10 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - + + + + TestSuite @@ -36,59 +16,11 @@ CE800 - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - Application - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -96,227 +28,12 @@ TestSuite TestSuite - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\shared\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_mt\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - true - - - bin\$(Platform)\static_md\ - obj\TestSuite\$(Platform)\$(Configuration)\ - false - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\shared\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - CppUnit.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin\$(Platform)\shared\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmtd.lib;iphlpapi.lib;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_mt\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmt.lib;iphlpapi.lib;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_mt\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - - - - Win32 - - - Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - Level3 - ProgramDatabase - Default - - - CppUnitmdd.lib;iphlpapi.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuited.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - bin\$(Platform)\static_md\TestSuited.pdb - wmainCRTStartup - WindowsCE - - - - - Win32 - - - MaxSpeed - Default - true - Speed - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - CppUnitmd.lib;iphlpapi.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) - bin\$(Platform)\static_md\TestSuite.exe - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - true - true - wmainCRTStartup - WindowsCE - - + - - - - - - - - + + diff --git a/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 223bd3192..f74a72348 100644 --- a/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {7697416c-e68f-4dad-a39f-3557c748486d} + {af46577b-30fe-4e0e-a9f9-475afabc8ee9} - {5f220c7e-21a7-4dae-a27e-d89dbd6c0e39} + {c8bcbcac-2644-452b-8152-78ab17f383e9} - {76055bb4-7a56-43da-b3a8-79c12963f5e5} + {b85948c6-1419-4e38-b1e9-a719e89fc683} - {e54e847e-662d-4d9a-b946-6be77f0a1ac7} + {ab2a5aa6-2b33-434d-85cd-5700f54e35fe} - {601da967-92a2-49f0-8c5d-3e26c1300e1e} + {3878cd1e-88e0-41c2-9af8-2b7dfd34ad91} - {ad1ae979-501e-4496-9015-77c6053bc132} + {f3ff305b-8144-4ba1-830a-b8586b22f40d} - {e8743be1-25e4-4f6e-b859-67054ff511e6} + {dba533d7-01d1-4633-8a0b-063374ef468f} - {c655d458-12dc-413c-9f81-6e76a5d784cb} + {32d6b32e-c0fd-4479-abad-a982f2b3353f} diff --git a/Crypto/testsuite/TestSuite_vs100.vcxproj b/Crypto/testsuite/TestSuite_vs100.vcxproj index 8c8bb7c52..a9d7bdff7 100644 --- a/Crypto/testsuite/TestSuite_vs100.vcxproj +++ b/Crypto/testsuite/TestSuite_vs100.vcxproj @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies) + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies) + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_vs100.vcxproj.filters b/Crypto/testsuite/TestSuite_vs100.vcxproj.filters index b75e212f3..60bcc05a7 100644 --- a/Crypto/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {d5fdb1be-4d52-4f29-94ca-df06a1ce2806} + {26cb669d-b4a6-4fd0-9bf3-ed474ab62aee} - {e8e2d305-215e-4f5a-86cf-459d2d5ad2af} + {da7aa76b-912b-4a99-9759-0c36ddbb3320} - {9e9876e7-a3c3-4da5-b66d-4e4d00f081cf} + {dfdbad15-dd6d-46e9-8255-3b1174fcb65b} - {756653a7-42df-4419-9fe8-07eab92513bb} + {68d6f5c8-4800-41a5-9a61-44c211b494b7} - {ff459343-640a-447e-8f12-382dfa31a4fa} + {6230f4ed-3418-445d-857d-982eba2a41a3} - {ca609043-0121-4498-8691-2f6f68b6590a} + {af778458-d621-4dc0-a84a-9da116870734} - {0573ce8e-93d8-4f3b-b253-8854496427ec} + {7d941f62-a14f-4bfa-a6e8-926fe649c3cc} - {00011579-73fd-4260-825b-33579a3d8276} + {4ad684e5-9ac8-48ef-a399-fd59c5691eeb} diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj b/Crypto/testsuite/TestSuite_vs110.vcxproj index 9dbb4072e..f76a6b605 100644 --- a/Crypto/testsuite/TestSuite_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies) + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies) + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_vs110.vcxproj.filters index ef936d6a4..8fb1329c2 100644 --- a/Crypto/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {75186b32-dd31-42f4-a826-46258d4456fe} + {6566c264-0840-4874-b389-783500e31d11} - {e0798e60-92d2-49ed-beeb-1b24a419873f} + {568c47fe-cd22-420b-924e-03335be00c8d} - {32d32c88-3c8f-4e03-b3e7-7d2edeeaa292} + {4e59f74a-a5c2-4b4e-a41d-2af3bb3192d5} - {90a40fec-a587-44b2-9786-58e9da2bf1b6} + {a53d376b-c199-46a3-aff3-c7dd038c0e49} - {9f1b8180-6a0a-401f-ae7b-f8a5dbd11846} + {2cb1411a-aa78-4e07-8f01-2d45c1af9f60} - {44df3094-d197-4ad5-b760-32d1da1bd08e} + {0d3c28c9-688e-47d3-b0d7-545b68e53ac3} - {46deea92-96d5-41de-9ad8-07455e9c0856} + {fd312292-74d8-4708-8d4c-c892a4e03f91} - {1c6cd050-d954-459f-991a-4de4d98bf0f4} + {9ee1f7fe-6728-422a-a0fd-126acff4a49b} diff --git a/Crypto/testsuite/TestSuite_vs120.vcxproj b/Crypto/testsuite/TestSuite_vs120.vcxproj index f7fb82f84..f937c0e7a 100644 --- a/Crypto/testsuite/TestSuite_vs120.vcxproj +++ b/Crypto/testsuite/TestSuite_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies) + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies) + CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -305,16 +305,16 @@ - + - - - + + + diff --git a/Crypto/testsuite/TestSuite_vs120.vcxproj.filters b/Crypto/testsuite/TestSuite_vs120.vcxproj.filters index 42c524380..b75a57b3c 100644 --- a/Crypto/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {636193c2-d550-47fe-aefe-ee3aae7133d1} + {1ffa8d79-5130-4ad2-9229-7a0a09a372ac} - {e560cb66-9a22-44ef-971b-3194fd280f23} + {1014648a-95b3-4f6d-92de-0e28944b5508} - {02a63d46-2034-493c-b459-877f0ae706b6} + {831a56f5-1ebe-4f42-8809-d822b685ea7f} - {ac0494aa-57c1-47a1-b8b0-acc147937072} + {9db9e31e-ddd3-482e-bf0f-f5aed20cdb83} - {e039dfdb-4880-4fa5-8140-86d8e393f36e} + {f214137c-6911-43dd-9190-0fce773416bc} - {d62fd92d-2e44-49fd-9dda-3bfed06d0250} + {6158deda-8be5-48fe-811e-b2f892b829ad} - {a0ebd5cb-4ad7-4b39-981e-992e87409b71} + {fb5bce19-dcef-46d0-adfa-e4afdbc8d293} - {c30aa842-d56f-4f92-956b-f232962b311e} + {c5389653-9b17-4439-a6ce-735139739c22} diff --git a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj index 45ccb1168..548e023b3 100644 --- a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies) + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies) + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters index 2d21d474b..d23fdd02e 100644 --- a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {b1bb4c00-a0d8-42e9-823b-979fae46a05d} + {43922613-269e-4f0f-914b-51e9a0894691} - {443cbc00-e53a-4e01-b3dd-271356ff645a} + {11452252-4002-40a4-86bd-b30c501779d6} - {9a8bfe0d-8239-4186-807b-b3bfec38203e} + {250aa0ea-d63b-46c1-a0bb-77b88afcbdb0} - {624dbf88-a08e-4f3a-8444-60c68fc27b01} + {dd06a0ef-40be-4794-a768-df5a00ee2fde} - {6fbdd066-54ba-4f58-b462-9bf7f2fd74fa} + {b935eba6-2dea-40e3-9105-7d408a0ffec9} - {694152e2-1123-4722-8eba-4454ef60c594} + {d0a937d6-5743-479e-bba7-67d4493b2bec} - {7d507c3b-649e-4dce-9597-9f227cf0bab8} + {5bfdf6cb-fa97-4610-bcb1-03ca23604fe3} - {52e9ebde-5ea9-42d5-99ca-0d0803d01e98} + {d6365c59-1ab1-407a-804f-3608b4974472} diff --git a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj index a922344a3..123694457 100644 --- a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj @@ -91,7 +91,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 TestSuited TestSuited TestSuited @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies) + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies) + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters index bae062648..5e2f52d81 100644 --- a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {255f5e65-a5f5-4f80-acd1-a4aead93228a} + {a6812352-b46a-4c4b-8d04-9feb9d50acb9} - {9f491e61-c862-4600-84a8-262070ed0b60} + {32be05ca-a8b4-4a27-8ef7-2beef667390f} - {f7fe5515-566a-4600-b8c3-b88080b48695} + {d4aaa5cc-54a2-48da-bd85-fa0691152f0b} - {28c08c8d-0298-45e4-b59b-82d177017dd1} + {d6da3b68-7d76-4b3e-afc3-ca6d3562eb74} - {a9ebc8db-adf5-4fbb-a09f-a65197bb3a56} + {b3483828-2314-45b2-b3b7-48f1148d5931} - {8bf70d70-d6aa-496a-bf34-17d82c887c4c} + {2a229643-977f-4bf2-9350-20e2cee57158} - {9d5db3e7-11f9-44fd-93c5-e61b2e6b92f1} + {4ed3e8a1-daac-4cea-95be-b62ba6bb7989} - {78ff8144-27d2-4977-898f-32355e013285} + {a8c5ffee-19de-4446-8731-cbcd2cccdcc1} diff --git a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj index c8e7361b0..e51c9e209 100644 --- a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 TestSuited TestSuited TestSuited @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,7 @@ Default - CppUnitd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +173,7 @@ Default - CppUnit.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies) + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies) + CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -305,16 +305,16 @@ - + - - - + + + diff --git a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters index f4ee15136..98011f99d 100644 --- a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {6f47df82-cd5a-4a08-8761-79928725d7b4} + {30d93760-2d3d-4413-85eb-a4aa44a7ac0f} - {d0d193dc-1f3d-44e8-a50d-6b51a1b07fbe} + {1f951e94-8ebd-4a17-b121-490dd066cafb} - {9897665a-c828-48fd-9ca7-eea368d77631} + {925fd82c-d485-4525-99b0-fa74e5c290f1} - {37a5ff2a-125e-4e60-b0bf-dc57d06b499a} + {3739b912-da4f-485a-b99b-df4d9585f2a6} - {35f22eca-9df9-483c-8574-dd2e4b9880e4} + {3ed458e5-f756-4204-acb7-bb26f07074d1} - {9cdf7054-e611-4059-a8b7-aa0858edba4d} + {66cb98e7-e294-4d73-b62c-3082044dc4a8} - {28247888-ce7f-4d88-8d5c-1da16ab25ef3} + {e161a3c9-b1e1-44cd-9a28-e329d26df923} - {031510f2-0be4-48ee-84f5-93dbb5809da4} + {8f9d2ee8-d5fe-4977-83a9-9462c3c13d0e} diff --git a/Crypto/testsuite/TestSuite_x64_vs90.vcproj b/Crypto/testsuite/TestSuite_x64_vs90.vcproj index 9079582f6..7ffea1387 100644 --- a/Crypto/testsuite/TestSuite_x64_vs90.vcproj +++ b/Crypto/testsuite/TestSuite_x64_vs90.vcproj @@ -1,16 +1,20 @@ + Keyword="Win32Proj" + TargetFrameworkVersion="0" + > + Name="x64" + /> - + + + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> - + + + Name="Crypto" + > + Name="Header Files" + > + RelativePath=".\src\CryptoTest.h" + > + + RelativePath=".\src\DigestEngineTest.cpp" + > + + RelativePath=".\src\DigestEngineTest.h" + > + + RelativePath=".\src\RSATest.h" + > + + Name="Source Files" + > + RelativePath=".\src\CryptoTest.cpp" + > + + RelativePath=".\src\RSATest.cpp" + > + + Name="_Suite" + > + Name="Header Files" + > + RelativePath=".\src\CryptoTestSuite.h" + > + + Name="Source Files" + > + RelativePath=".\src\CryptoTestSuite.cpp" + > + + Name="_Driver" + > + Name="Source Files" + > + RelativePath=".\src\WinDriver.cpp" + > + - + + diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL.progen b/NetSSL_OpenSSL/NetSSL_OpenSSL.progen index 3d700e786..18d230a97 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL.progen +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL.progen @@ -7,7 +7,7 @@ vc.project.outdir = ${vc.project.pocobase} vc.project.platforms = Win32, x64, WinCE vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\Foundation\\include;..\\Net\\include;..\\Util\\include;..\\Crypto\\include +vc.project.compiler.include = ..\\Foundation\\include;..\\Net\\include;..\\Util\\include;..\\Crypto\\include;..\\openssl\\out\\include vc.project.compiler.defines = vc.project.compiler.defines.shared = NetSSL_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} @@ -15,11 +15,16 @@ vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.share vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.WinCE = ws2.lib iphlpapi.lib -vc.project.linker.dependencies.debug_shared = libeay32.lib ssleay32.lib -vc.project.linker.dependencies.release_shared = libeay32.lib ssleay32.lib -vc.project.linker.dependencies.debug_static_md = libeay32mdd.lib ssleay32mdd.lib Crypt32.lib -vc.project.linker.dependencies.release_static_md = libeay32md.lib ssleay32md.lib Crypt32.lib -vc.project.linker.dependencies.debug_static_mt = libeay32mtd.lib ssleay32mtd.lib Crypt32.lib -vc.project.linker.dependencies.release_static_mt = libeay32mt.lib ssleay32mt.lib Crypt32.lib +vc.project.linker.dependencies.debug_static_md = Crypt32.lib +vc.project.linker.dependencies.release_static_md = Crypt32.lib +vc.project.linker.dependencies.debug_static_mt = Crypt32.lib +vc.project.linker.dependencies.release_static_mt = Crypt32.lib +bits = ${vc.project.platform.bits} +vc.project.prebuild.debug_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${bits}\\* +vc.project.prebuild.debug_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${bits}\\* +vc.project.prebuild.debug_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.lib ..\\lib${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.pdb ..\\lib${bits}\\* +vc.project.prebuild.release_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${bits}\\* +vc.project.prebuild.release_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${bits}\\* +vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${bits}\\* vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj index d74540316..98c48b9d7 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj @@ -1,264 +1,6 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - - NetSSL_OpenSSL - {5AECC55E-A469-11DA-8DA6-005056C00008} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V300 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 - PocoNetSSLd - PocoNetSSLmdd - PocoNetSSLmtd - PocoNetSSL - PocoNetSSLmd - PocoNetSSLmt - - - ..\bin\$(Platform)\ - obj\NetSSL_OpenSSL\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\NetSSL_OpenSSL\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\NetSSL_OpenSSL\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\NetSSL_OpenSSL\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\NetSSL_OpenSSL\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\NetSSL_OpenSSL\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;NetSSL_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - - - libeay32.lib;ssleay32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoNetSSLd.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoNetSSLd.pdb - - - ..\lib\$(Platform)\PocoNetSSLd.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;NetSSL_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - libeay32.lib;ssleay32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoNetSSL.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoNetSSL.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoNetSSLmtd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLmtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLmt.lib - - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoNetSSLmdd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLmdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLmd.lib - - - @@ -288,6 +30,29 @@ + + NetSSL_OpenSSL + {5AECC55E-A469-11DA-8DA6-005056C00008} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V300 + CE800 + + + + + + + <_ProjectFileVersion>11.0.50727.1 + PocoNetSSLd + PocoNetSSLmdd + PocoNetSSLmtd + PocoNetSSL + PocoNetSSLmd + PocoNetSSLmt + + @@ -318,12 +83,7 @@ - - true - true - true - true - + diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj.filters index 122a9e011..ca83e690e 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {3621bed9-de60-446c-821f-63e0947e4b55} + {6ef030b5-4e4c-4c54-a8be-f5ed2aa483d6} - {7c7107e6-d03b-4a68-aece-373cf523c9f3} + {737b7620-4be3-4206-81ad-4625b120b4f9} - {ae1f75cf-5077-43d5-9a07-d097677bfad2} + {38bec95e-d15b-4426-9f0a-836524367b88} - {a50b3556-122e-441d-adc4-3a457e2167ba} + {469ae97a-3d34-48a7-b75a-b652e3eba7fa} - {fed3f660-55ce-4944-a242-6d3c8683aca9} + {831412f3-2541-4bd1-811b-4e51bfc92ec1} - {05884484-ce0c-4dac-86cb-683d71a03203} + {85a78781-507b-4e37-9e2b-760bedca1372} - {386c573e-d0a1-48d5-a6ec-5465d8095411} + {3725ff46-8ae8-43d9-81b5-9868ba5e79f0} - {fe7187cf-8284-4d55-b0d9-6eff9be61a0f} + {c3af7d58-bddb-4265-8349-60e4f8544680} - {93a96d65-0613-4523-b308-086f6b122d49} + {3fed0329-1851-4e8a-adaa-d04aac9103f3} - {f579e859-cbae-4f56-9da8-ea5ec6fdbd43} + {6c36624c-71ab-4b8a-8016-8cc2ca017ab3} - {7c777082-b102-4cb8-8524-afed6c73143a} + {c8ad06c3-083c-4f65-b013-2a2193856234} - {f49723e1-49df-46cd-b931-947cb5142423} + {c432169f-8090-4ce3-bd1a-6d3a581c9a67} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj index 087391a00..1280633cc 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj @@ -1,30 +1,34 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + NetSSL_OpenSSL @@ -36,59 +40,11 @@ CE800 - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 PocoNetSSLd PocoNetSSLmdd PocoNetSSLmtd @@ -96,207 +52,13 @@ PocoNetSSLmd PocoNetSSLmt - - ..\bin\$(Platform)\ - obj\NetSSL_OpenSSL\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\NetSSL_OpenSSL\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\NetSSL_OpenSSL\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\NetSSL_OpenSSL\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\NetSSL_OpenSSL\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\NetSSL_OpenSSL\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;NetSSL_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - - - libeay32.lib;ssleay32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoNetSSLd.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoNetSSLd.pdb - - - ..\lib\$(Platform)\PocoNetSSLd.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;NetSSL_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - libeay32.lib;ssleay32.lib;ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoNetSSL.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoNetSSL.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoNetSSLmtd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLmtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLmt.lib - - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoNetSSLmdd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLmdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - @@ -304,26 +66,24 @@ - - - - - - + + + + + + + + + - - true - true - true - true - + diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters index f1fbbf8c2..0ab0fe9c4 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {d0e7f0b7-ba64-4d69-a400-df98ca80c49a} + {cf58e8dd-63de-4bef-a810-ce851ee0ae9d} - {370dd256-a6bf-4a9f-ba33-0a57ca617f1f} + {c8318b54-484a-4fab-b861-454970e61603} - {bdeaa507-4c01-436f-aee3-b8686e050e4e} + {d3f6696f-9393-495a-9f39-0d291d9823f0} - {d8653605-e2a6-410f-a019-0a66dbbc3079} + {f2626a45-6517-4264-b13c-20709a50f109} - {dbbf7c11-1937-423b-8b66-5e7ce64a01ef} + {8a697f3e-7c6b-40f4-9c3e-d71255a2ef25} - {f81ca428-00d0-44e9-9ca8-a5dabb87a853} + {dd75b631-98b2-47d1-9f26-c343760a9e26} - {c4127884-561b-464d-b343-e09d249ac4cb} + {a58b74d8-737e-404a-9bd5-7b174721414b} - {3772d420-9c5a-4725-94c5-5c0c5a86d30b} + {e6f3208d-4807-4d2c-a35d-9c87b3f83316} - {fa615f2c-b02d-47bf-a040-ad92fa66f7b7} + {54cec710-5151-4791-972a-44e77b2caef3} - {799945fc-a322-4371-abca-f7c077c5df44} + {5352007e-9c81-4b43-8152-8049a43725da} - {b9d3be73-1e1e-42c7-8cbb-9def50023ffa} + {5835c281-688a-4851-a172-e110a3139078} - {175f4fd3-1a50-4b7b-b24c-3410fbdcc63c} + {6c5b26b8-3e06-4838-bdeb-811b3e286f13} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj index bf44d2dae..dee0c5f7c 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj @@ -102,9 +102,13 @@ PocoNetSSLmt + + xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.dll ..\bin32\* +xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.lib ..\lib32\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) true true @@ -122,7 +126,7 @@ %(AdditionalOptions) - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoNetSSLd.dll true true @@ -135,13 +139,17 @@ + + xcopy /y ..\openssl\out\win32\bin\release\*32MD.dll ..\bin32\* +xcopy /y ..\openssl\out\win32\bin\release\*32MD.lib ..\lib32\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +165,7 @@ %(AdditionalOptions) - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoNetSSL.dll true false @@ -171,9 +179,13 @@ + + xcopy /y ..\openssl\out\win32\lib\debug\*32MTd.lib ..\lib32\* +xcopy /y ..\openssl\out\win32\lib\debug\*32MTd.pdb ..\lib32\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -196,13 +208,16 @@ + + xcopy /y ..\openssl\out\win32\lib\release\*32MT.lib ..\lib32\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -222,9 +237,13 @@ + + xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.dll ..\bin32\* +xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.lib ..\lib32\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -247,13 +266,17 @@ + + xcopy /y ..\openssl\out\win32\bin\release\*32MD.dll ..\bin32\* +xcopy /y ..\openssl\out\win32\bin\release\*32MD.lib ..\lib32\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -270,7 +293,7 @@ %(AdditionalOptions) - libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\lib\PocoNetSSLmd.lib @@ -335,8 +358,10 @@ + true true true + true true true diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters index ec12e739f..841e32d39 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {43a3eed6-ca21-4c66-a301-09da70eef8b5} + {525dd8cb-1ff0-48f3-8386-6c7c2764e960} - {cb85860a-2833-44cd-8d14-ee03128220b7} + {2ee9f994-b3f2-437e-9771-6ca09821824c} - {33920a98-d4a7-456f-a55f-7f09b345a001} + {61c15c51-fb19-44b8-92fe-4a919646a62d} - {47845980-bdbe-4d9c-8eb7-627be7636ff9} + {1ba4124a-ddf2-4dd7-834b-f2c1518b51f3} - {1749298e-0009-403a-9f8a-dc98fecbd35b} + {d79d6e71-152c-4183-9f72-36d05983fdf2} - {28f24646-54ca-436d-bf7f-16f919e8b035} + {22705613-edd9-41b0-a0e6-82c4738d67c9} - {6196d192-7404-43e5-8116-a4ee835ae534} + {d11be9f8-3abd-4d97-883c-c33d987a3d14} - {0d8ad94d-b62e-440e-86ea-afcb7f524b8b} + {3b518a0c-9cca-46ff-80ee-8aeb7f86e5cc} - {4fd39bef-41d1-4704-a77f-f79d300b04aa} + {2c49024d-ea2e-4bee-9177-8ffbb4fc547e} - {65043764-66aa-4113-b1bd-cc923e3f3215} + {647b37f9-9fe6-40d3-8bff-54192ecb4bbd} - {5ee84ab3-2439-4fa9-b52a-17cd921f3451} + {ca0741bf-38c0-4990-ab94-7398beae44bd} - {39160099-eab1-4802-801e-3bae1958743a} + {099c0f37-51ce-4d80-8758-f4c62c52bcd2} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj index e4d1ccc3d..5db48e726 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoNetSSLd PocoNetSSLmdd PocoNetSSLmtd @@ -120,9 +120,13 @@ obj\NetSSL_OpenSSL\$(Configuration)\ + + xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.dll ..\bin32\* +xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.lib ..\lib32\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +142,7 @@ Default - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoNetSSLd.dll true true @@ -150,13 +154,17 @@ + + xcopy /y ..\openssl\out\win32\bin\release\*32MD.dll ..\bin32\* +xcopy /y ..\openssl\out\win32\bin\release\*32MD.lib ..\lib32\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +178,7 @@ Default - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoNetSSL.dll true false @@ -183,9 +191,13 @@ + + xcopy /y ..\openssl\out\win32\lib\debug\*32MTd.lib ..\lib32\* +xcopy /y ..\openssl\out\win32\lib\debug\*32MTd.pdb ..\lib32\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +218,16 @@ + + xcopy /y ..\openssl\out\win32\lib\release\*32MT.lib ..\lib32\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +245,13 @@ + + xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.dll ..\bin32\* +xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.lib ..\lib32\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +272,17 @@ + + xcopy /y ..\openssl\out\win32\bin\release\*32MD.dll ..\bin32\* +xcopy /y ..\openssl\out\win32\bin\release\*32MD.lib ..\lib32\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -274,7 +297,7 @@ Default - libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\lib\PocoNetSSLmd.lib @@ -339,8 +362,10 @@ + true true true + true true true diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters index 00425f9e3..8160c4808 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {c1284b2f-3ee9-4699-bdd5-138133b67b15} + {74903bb3-281d-4b0f-85f8-8a324cfed0b3} - {9f26cbaf-8ac1-46f7-8c1e-31ba94b86815} + {48afdda4-cba3-4cbf-8e57-bf2dda8163d7} - {40d716ba-bc86-479d-9f60-4b84d6f662f4} + {3978c0b2-44a1-47ae-9007-89ad2403cfe5} - {43635892-5933-4235-98e8-28e56b95f993} + {4ab6b4a1-0a23-48f2-bd34-2e645a015bca} - {44ebef2d-8053-4dda-9327-bf3cb5b9ea04} + {11b24934-aed5-4d88-afbd-6b425be0c4a1} - {f0571736-0aa6-41ac-97e8-c2edbf35c32c} + {9a10b180-f699-4617-be36-a9dc4b2544e5} - {5b7fed66-c6e6-4a4d-b2d7-42d0def1a97b} + {5c78f0a2-2f73-4ac8-bbfa-fc6a1a5e8705} - {e7e8d85e-054e-47b5-b8fa-5729be5cf90d} + {db3e8d90-11db-4f0e-9b33-3a0e30f7f533} - {dd9acd48-2880-44de-9cfc-72b214e162ed} + {1e27a818-3006-4123-a232-9ad79bcbf165} - {5afc9b6d-1574-4ef8-a308-311f7d121c5a} + {6a55163c-a4d3-4d11-a941-dae90dd57f84} - {081c127a-771c-4875-a1bf-fa8e3c370602} + {c07c2094-a898-415e-a344-a693a0ef3aa5} - {f8b213c6-7ade-4b9b-b1b2-2d2720510290} + {a0a2fb74-2142-41d2-8dfb-425a9e1a6397} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj index cc19ba6a8..6ecb3f145 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 PocoNetSSLd PocoNetSSLmdd PocoNetSSLmtd @@ -120,9 +120,13 @@ obj\NetSSL_OpenSSL\$(Configuration)\ + + xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.dll ..\bin32\* +xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.lib ..\lib32\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +142,7 @@ Default - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoNetSSLd.dll true true @@ -150,13 +154,17 @@ + + xcopy /y ..\openssl\out\win32\bin\release\*32MD.dll ..\bin32\* +xcopy /y ..\openssl\out\win32\bin\release\*32MD.lib ..\lib32\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +178,7 @@ Default - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoNetSSL.dll true false @@ -183,9 +191,13 @@ + + xcopy /y ..\openssl\out\win32\lib\debug\*32MTd.lib ..\lib32\* +xcopy /y ..\openssl\out\win32\lib\debug\*32MTd.pdb ..\lib32\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +218,16 @@ + + xcopy /y ..\openssl\out\win32\lib\release\*32MT.lib ..\lib32\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +245,13 @@ + + xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.dll ..\bin32\* +xcopy /y ..\openssl\out\win32\bin\debug\*32MDd.lib ..\lib32\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +272,17 @@ + + xcopy /y ..\openssl\out\win32\bin\release\*32MD.dll ..\bin32\* +xcopy /y ..\openssl\out\win32\bin\release\*32MD.lib ..\lib32\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -274,7 +297,7 @@ Default - libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\lib\PocoNetSSLmd.lib @@ -284,9 +307,6 @@ - - - @@ -295,18 +315,21 @@ - - - - - - + + + + + + + + + @@ -314,9 +337,6 @@ - - - @@ -324,23 +344,28 @@ - - - - - - + + + + + + + + + + true true true + true true true diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters index 75c9b75d8..cb67bfab7 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {4a58cb85-195d-4e27-8e43-e4b0b32fe6c8} + {21a6ce0c-8add-48dc-8160-802f348ef2f7} - {cfa2b3c6-044f-47dd-a337-94b54e1ec4ec} + {ef7af1fd-d49a-420c-b4a2-74742014c61b} - {f3b62c89-f184-4c44-9d7b-cffdb8607d4f} + {aa5dc973-5ead-4bf7-8ed8-c0a22ced8ec6} - {57c234d7-ceb9-4afb-83bb-d7e8fcae5d3c} + {ce6e28bb-bd8b-486f-af0a-22026683407a} - {27807990-f13b-4627-b54e-5523d5a9979b} + {095e109d-220c-4c86-ab93-edd814967aae} - {5f207702-9306-48f2-9586-55e47b5aac94} + {d44954bf-b11c-491b-9f09-ab58b00bc123} - {0c1c2277-c1ce-40d6-b078-da1046d49baf} + {2d4cdbaa-8983-4b72-8e8a-133368e5d306} - {8275856d-c9c1-467c-81aa-5bce4d270df6} + {c7a2e010-f1cf-444b-8b4a-1481f599f7ac} - {2071d581-a579-41c9-99b3-efc5ac950431} + {01b9f0f3-f1e1-445f-9431-6da1a0bf9fbe} - {21611894-fe10-4c80-9920-f92abbadcd24} + {30ec08a9-784b-48d9-b483-5c381b046bed} - {a25338a9-7e24-4d31-a9a6-bcbb538bef69} + {54bb6547-7dca-4653-8ff4-bb6f7ef7bb26} - {7a2c777f-a9b7-4980-b535-3dbd30564ec9} + {a0c39014-131c-4ee9-b120-b700942593cf} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj index e2f5b299f..9c327c214 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj @@ -1,37 +1,48 @@ + Keyword="Win32Proj" + TargetFrameworkVersion="0" + > + Name="Win32" + /> - + + + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + OutputFile="..\lib\PocoNetSSLmtd.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + OutputFile="..\lib\PocoNetSSLmt.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + OutputFile="..\lib\PocoNetSSLmdd.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + OutputFile="..\lib\PocoNetSSLmd.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> - + + + Name="SSLCore" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Net\AcceptCertificateHandler.h" + > + + RelativePath=".\include\Poco\Net\CertificateHandlerFactory.h" + > + + RelativePath=".\include\Poco\Net\CertificateHandlerFactoryMgr.h" + > + + RelativePath=".\include\Poco\Net\ConsoleCertificateHandler.h" + > + + RelativePath=".\include\Poco\Net\Context.h" + > + + RelativePath=".\include\Poco\Net\InvalidCertificateHandler.h" + > + + RelativePath=".\include\Poco\Net\KeyConsoleHandler.h" + > + + RelativePath=".\include\Poco\Net\KeyFileHandler.h" + > + + RelativePath=".\include\Poco\Net\NetSSL.h" + > + + RelativePath=".\include\Poco\Net\PrivateKeyFactory.h" + > + + RelativePath=".\include\Poco\Net\PrivateKeyFactoryMgr.h" + > + + RelativePath=".\include\Poco\Net\PrivateKeyPassphraseHandler.h" + > + + RelativePath=".\include\Poco\Net\RejectCertificateHandler.h" + > + + RelativePath=".\include\Poco\Net\Session.h" + > + + RelativePath=".\include\Poco\Net\SSLException.h" + > + + RelativePath=".\include\Poco\Net\SSLManager.h" + > + + RelativePath=".\include\Poco\Net\Utility.h" + > + + RelativePath=".\include\Poco\Net\VerificationErrorArgs.h" + > + + RelativePath=".\include\Poco\Net\X509Certificate.h" + > + + Name="Source Files" + > + RelativePath=".\src\AcceptCertificateHandler.cpp" + > + + RelativePath=".\src\CertificateHandlerFactory.cpp" + > + + RelativePath=".\src\CertificateHandlerFactoryMgr.cpp" + > + + RelativePath=".\src\ConsoleCertificateHandler.cpp" + > + + RelativePath=".\src\Context.cpp" + > + + RelativePath=".\src\InvalidCertificateHandler.cpp" + > + + RelativePath=".\src\KeyConsoleHandler.cpp" + > + + RelativePath=".\src\KeyFileHandler.cpp" + > + + RelativePath=".\src\PrivateKeyFactory.cpp" + > + + RelativePath=".\src\PrivateKeyFactoryMgr.cpp" + > + + RelativePath=".\src\PrivateKeyPassphraseHandler.cpp" + > + + RelativePath=".\src\RejectCertificateHandler.cpp" + > + + RelativePath=".\src\Session.cpp" + > + + RelativePath=".\src\SSLException.cpp" + > + + RelativePath=".\src\SSLManager.cpp" + > + + RelativePath=".\src\Utility.cpp" + > + + RelativePath=".\src\VerificationErrorArgs.cpp" + > + + RelativePath=".\src\X509Certificate.cpp" + > + + Name="HTTPSClient" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Net\HTTPSClientSession.h" + > + + RelativePath=".\include\Poco\Net\HTTPSSessionInstantiator.h" + > + + RelativePath=".\include\Poco\Net\HTTPSStreamFactory.h" + > + + Name="Source Files" + > + RelativePath=".\src\HTTPSClientSession.cpp" + > + + RelativePath=".\src\HTTPSSessionInstantiator.cpp" + > + + RelativePath=".\src\HTTPSStreamFactory.cpp" + > + + Name="SSLSockets" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Net\SecureServerSocket.h" + > + + RelativePath=".\include\Poco\Net\SecureServerSocketImpl.h" + > + + RelativePath=".\include\Poco\Net\SecureSocketImpl.h" + > + + RelativePath=".\include\Poco\Net\SecureStreamSocket.h" + > + + RelativePath=".\include\Poco\Net\SecureStreamSocketImpl.h" + > + + Name="Source Files" + > + RelativePath=".\src\SecureServerSocket.cpp" + > + + RelativePath=".\src\SecureServerSocketImpl.cpp" + > + + RelativePath=".\src\SecureSocketImpl.cpp" + > + + RelativePath=".\src\SecureStreamSocket.cpp" + > + + RelativePath=".\src\SecureStreamSocketImpl.cpp" + > + + Name="Mail" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Net\SecureSMTPClientSession.h" + > + + Name="Source Files" + > + RelativePath=".\src\SecureSMTPClientSession.cpp" + > + - - - - - - + RelativePath="..\DLLVersion.rc" + > + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> - + + diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj index 8b4237089..3d533aab4 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj @@ -102,9 +102,13 @@ PocoNetSSLmt + + xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.dll ..\bin64\* +xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.lib ..\lib64\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) true true @@ -122,7 +126,7 @@ %(AdditionalOptions) - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoNetSSL64d.dll true true @@ -135,13 +139,17 @@ + + xcopy /y ..\openssl\out\win64\bin\release\*64MD.dll ..\bin64\* +xcopy /y ..\openssl\out\win64\bin\release\*64MD.lib ..\lib64\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +165,7 @@ %(AdditionalOptions) - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoNetSSL64.dll true false @@ -171,9 +179,13 @@ + + xcopy /y ..\openssl\out\win64\lib\debug\*64MTd.lib ..\lib64\* +xcopy /y ..\openssl\out\win64\lib\debug\*64MTd.pdb ..\lib64\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -196,13 +208,16 @@ + + xcopy /y ..\openssl\out\win64\lib\release\*64MT.lib ..\lib64\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -222,9 +237,13 @@ + + xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.dll ..\bin64\* +xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.lib ..\lib64\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -247,13 +266,17 @@ + + xcopy /y ..\openssl\out\win64\bin\release\*64MD.dll ..\bin64\* +xcopy /y ..\openssl\out\win64\bin\release\*64MD.lib ..\lib64\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -333,8 +356,10 @@ + true true true + true true true diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters index f5ea0e388..f4e03862a 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {13dedb2c-8da7-4f64-86d4-f0b4dfdef92b} + {88e117a0-f466-4286-8f90-7f14caedc4ef} - {1f56c15e-866a-41a7-86fc-f13fa328e941} + {882a5a6c-3c6e-4fd9-b7d4-beb168d70594} - {a7a2dc64-ca69-4c99-bbec-5dc70a5b3c11} + {346b858c-d1b7-4cff-a1af-0e92888cc2bb} - {cbf41bff-6542-413d-bc20-0b613583caaf} + {7a6f0650-3950-4ca4-9f12-b642afe23859} - {e37d3d08-3f15-4210-8eb8-e810b1c7f244} + {d4ab756c-7265-4daa-bc1d-0ea10218aad2} - {34229953-664c-44e3-b279-6c79a6ddb0f8} + {7ead15bb-4bc3-4e24-8159-49b67704f806} - {67c5ab35-011b-4889-9ee0-952aedb8db85} + {5c917ade-5f7f-4f7f-853b-a8b3a3398977} - {7ca14931-10fb-4048-aae0-13f1f37612cc} + {eb986a73-da22-4dcf-8848-973d6057cc2f} - {bf1e64e4-c83b-4cf6-97f4-3b4f0a1fa46a} + {8745f081-00ef-43b6-9597-5a38b4cb6e18} - {29fd30a1-e5ff-4da1-a953-eb425767fe60} + {34ef5f0a-7c98-4cfe-b99c-45213c60071c} - {0466abdc-f10a-4b74-a273-ce74b8950a67} + {4bc75c5f-9a62-485b-ac47-2f9c256cd439} - {189f4d3d-28d5-49c4-9b6b-d8c212f9ed73} + {bdfd8f05-d7cf-454e-bd5e-0498f5a3801d} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj index cad8f590b..5efa40412 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoNetSSL64d PocoNetSSLmdd PocoNetSSLmtd @@ -120,9 +120,13 @@ obj64\NetSSL_OpenSSL\$(Configuration)\ + + xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.dll ..\bin64\* +xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.lib ..\lib64\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +142,7 @@ Default - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoNetSSL64d.dll true true @@ -150,13 +154,17 @@ + + xcopy /y ..\openssl\out\win64\bin\release\*64MD.dll ..\bin64\* +xcopy /y ..\openssl\out\win64\bin\release\*64MD.lib ..\lib64\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +178,7 @@ Default - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoNetSSL64.dll true false @@ -183,9 +191,13 @@ + + xcopy /y ..\openssl\out\win64\lib\debug\*64MTd.lib ..\lib64\* +xcopy /y ..\openssl\out\win64\lib\debug\*64MTd.pdb ..\lib64\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +218,16 @@ + + xcopy /y ..\openssl\out\win64\lib\release\*64MT.lib ..\lib64\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +245,13 @@ + + xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.dll ..\bin64\* +xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.lib ..\lib64\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +272,17 @@ + + xcopy /y ..\openssl\out\win64\bin\release\*64MD.dll ..\bin64\* +xcopy /y ..\openssl\out\win64\bin\release\*64MD.lib ..\lib64\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -337,8 +360,10 @@ + true true true + true true true diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters index aa1183fc9..102295eb2 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {16867494-75a0-4be9-8f27-9e296a93a65f} + {884d08fc-1ab0-48f2-b43a-4e01983025c1} - {1b693143-8955-4805-ac55-9213c51c6488} + {22ac9b38-ac4c-4548-ab6c-f56bfd056025} - {d8dd42f8-14dd-44f2-8fdd-cbb7c03f9b10} + {bbc640e4-0c71-4440-9a03-ed73e0de6f6f} - {42532f84-0e12-4535-aaef-18caa66982cf} + {534776ba-6f05-49fc-b197-b05e7907b04d} - {c9cad21b-b659-4a8f-94c1-237c720d9d73} + {87daa418-da8d-4536-ac95-0e1c2fae5f5f} - {6ac23154-e914-4ec9-ad56-47a1e3667346} + {c71df107-851b-4bdc-8dcc-67878c345f10} - {64f46b83-58ca-48c6-9715-aab6f7289a83} + {cca4dd37-2f92-4aaf-9f46-bf8cf221919c} - {b5038389-ff31-4b1e-9456-20052293be10} + {2368bc5a-699b-40da-9bb1-da12f11b9073} - {800fb2d1-3e24-4c18-936d-82ce5c071c8f} + {11314fca-e705-4698-b7bf-244f0dcfdd8c} - {7dea310d-d49f-4cd5-bfa1-e6ff072e5021} + {80069b8d-5ad5-4433-ad1b-5eaf8b6fecbb} - {0b78411e-5f24-491d-9f82-6126600938eb} + {5ad867ab-c9da-4fd3-a22b-63fbe4cdfa52} - {9fcfeebe-d4ad-417c-83ab-25e208322431} + {f26fda46-5d71-48a9-8450-39e019c0270f} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj index 5d5f1d9cd..8be7a162b 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.30501.0 + <_ProjectFileVersion>12.0.21005.1 PocoNetSSL64d PocoNetSSLmdd PocoNetSSLmtd @@ -120,9 +120,13 @@ obj64\NetSSL_OpenSSL\$(Configuration)\ + + xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.dll ..\bin64\* +xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.lib ..\lib64\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +142,7 @@ Default - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoNetSSL64d.dll true true @@ -150,13 +154,17 @@ + + xcopy /y ..\openssl\out\win64\bin\release\*64MD.dll ..\bin64\* +xcopy /y ..\openssl\out\win64\bin\release\*64MD.lib ..\lib64\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;NetSSL_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +178,7 @@ Default - libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoNetSSL64.dll true false @@ -183,9 +191,13 @@ + + xcopy /y ..\openssl\out\win64\lib\debug\*64MTd.lib ..\lib64\* +xcopy /y ..\openssl\out\win64\lib\debug\*64MTd.pdb ..\lib64\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +218,16 @@ + + xcopy /y ..\openssl\out\win64\lib\release\*64MT.lib ..\lib64\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +245,13 @@ + + xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.dll ..\bin64\* +xcopy /y ..\openssl\out\win64\bin\debug\*64MDd.lib ..\lib64\* + Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +272,17 @@ + + xcopy /y ..\openssl\out\win64\bin\release\*64MD.dll ..\bin64\* +xcopy /y ..\openssl\out\win64\bin\release\*64MD.lib ..\lib64\* + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Net\include;..\Util\include;..\Crypto\include;..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -282,9 +305,6 @@ - - - @@ -293,18 +313,21 @@ - - - - - - + + + + + + + + + @@ -312,9 +335,6 @@ - - - @@ -322,23 +342,28 @@ - - - - - - + + + + + + + + + + true true true + true true true diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters index 3a8999fe6..ed2f9001a 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {08e29be1-96b2-4412-976d-6a7d832442c3} + {6c04ccc3-489e-4297-831b-484586239672} - {649e39b8-6ed6-4688-b72a-2da92c50067c} + {6819dbe1-83e1-4b9b-b307-d4292d6a4790} - {850cfcdb-74bd-4ea3-9e58-1c7a7d31a23d} + {6541ce78-cfb1-400a-9e4b-aee9e7c476c2} - {5909c680-b072-4204-8017-b5efecb1b846} + {3d5843e7-9893-4b83-a092-cc83399e42a1} - {31765ed3-b187-4bd3-b7d9-df3c492f43ae} + {23b38b02-2e7d-4701-9ea5-1087724d728c} - {a8df99cc-2c78-4b5c-9afe-fab96b56f7be} + {97ce2d87-bfae-4999-8325-f56de2043826} - {74069c6d-0a0d-42e4-a7ed-84d299ac8543} + {b6d8fcb2-d07b-432e-9c06-5f1b04a34583} - {bc6966f1-f166-4db7-82b0-16dd27eea46b} + {9d8a890e-051e-4ccf-860a-b647c2827051} - {ae3f2545-cd2f-4086-8824-0ec4dbd92654} + {1154d65b-94b3-45af-9900-abddf028139f} - {9e84efa0-7d50-4af1-84e6-4d034ea35ce2} + {441d134b-9d30-44bc-a0b0-cb4d5337c24b} - {6540af15-c9bb-4301-8429-3575cec2c730} + {2ef48584-0351-47be-9263-ed56f3d79666} - {0c4ebe30-4d24-4fb7-a33d-36bcbffa4192} + {3daa0546-965f-41c5-835f-1154c2a14ed9} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs90.vcproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs90.vcproj index 527d827c7..ad196d8b7 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs90.vcproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs90.vcproj @@ -1,37 +1,48 @@ + Keyword="Win32Proj" + TargetFrameworkVersion="0" + > + Name="x64" + /> - + + + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> - + + + Name="SSLCore" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Net\AcceptCertificateHandler.h" + > + + RelativePath=".\include\Poco\Net\CertificateHandlerFactory.h" + > + + RelativePath=".\include\Poco\Net\CertificateHandlerFactoryMgr.h" + > + + RelativePath=".\include\Poco\Net\ConsoleCertificateHandler.h" + > + + RelativePath=".\include\Poco\Net\Context.h" + > + + RelativePath=".\include\Poco\Net\InvalidCertificateHandler.h" + > + + RelativePath=".\include\Poco\Net\KeyConsoleHandler.h" + > + + RelativePath=".\include\Poco\Net\KeyFileHandler.h" + > + + RelativePath=".\include\Poco\Net\NetSSL.h" + > + + RelativePath=".\include\Poco\Net\PrivateKeyFactory.h" + > + + RelativePath=".\include\Poco\Net\PrivateKeyFactoryMgr.h" + > + + RelativePath=".\include\Poco\Net\PrivateKeyPassphraseHandler.h" + > + + RelativePath=".\include\Poco\Net\RejectCertificateHandler.h" + > + + RelativePath=".\include\Poco\Net\Session.h" + > + + RelativePath=".\include\Poco\Net\SSLException.h" + > + + RelativePath=".\include\Poco\Net\SSLManager.h" + > + + RelativePath=".\include\Poco\Net\Utility.h" + > + + RelativePath=".\include\Poco\Net\VerificationErrorArgs.h" + > + + RelativePath=".\include\Poco\Net\X509Certificate.h" + > + + Name="Source Files" + > + RelativePath=".\src\AcceptCertificateHandler.cpp" + > + + RelativePath=".\src\CertificateHandlerFactory.cpp" + > + + RelativePath=".\src\CertificateHandlerFactoryMgr.cpp" + > + + RelativePath=".\src\ConsoleCertificateHandler.cpp" + > + + RelativePath=".\src\Context.cpp" + > + + RelativePath=".\src\InvalidCertificateHandler.cpp" + > + + RelativePath=".\src\KeyConsoleHandler.cpp" + > + + RelativePath=".\src\KeyFileHandler.cpp" + > + + RelativePath=".\src\PrivateKeyFactory.cpp" + > + + RelativePath=".\src\PrivateKeyFactoryMgr.cpp" + > + + RelativePath=".\src\PrivateKeyPassphraseHandler.cpp" + > + + RelativePath=".\src\RejectCertificateHandler.cpp" + > + + RelativePath=".\src\Session.cpp" + > + + RelativePath=".\src\SSLException.cpp" + > + + RelativePath=".\src\SSLManager.cpp" + > + + RelativePath=".\src\Utility.cpp" + > + + RelativePath=".\src\VerificationErrorArgs.cpp" + > + + RelativePath=".\src\X509Certificate.cpp" + > + + Name="HTTPSClient" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Net\HTTPSClientSession.h" + > + + RelativePath=".\include\Poco\Net\HTTPSSessionInstantiator.h" + > + + RelativePath=".\include\Poco\Net\HTTPSStreamFactory.h" + > + + Name="Source Files" + > + RelativePath=".\src\HTTPSClientSession.cpp" + > + + RelativePath=".\src\HTTPSSessionInstantiator.cpp" + > + + RelativePath=".\src\HTTPSStreamFactory.cpp" + > + + Name="SSLSockets" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Net\SecureServerSocket.h" + > + + RelativePath=".\include\Poco\Net\SecureServerSocketImpl.h" + > + + RelativePath=".\include\Poco\Net\SecureSocketImpl.h" + > + + RelativePath=".\include\Poco\Net\SecureStreamSocket.h" + > + + RelativePath=".\include\Poco\Net\SecureStreamSocketImpl.h" + > + + Name="Source Files" + > + RelativePath=".\src\SecureServerSocket.cpp" + > + + RelativePath=".\src\SecureServerSocketImpl.cpp" + > + + RelativePath=".\src\SecureSocketImpl.cpp" + > + + RelativePath=".\src\SecureStreamSocket.cpp" + > + + RelativePath=".\src\SecureStreamSocketImpl.cpp" + > + + Name="Mail" + > + Name="Header Files" + > + RelativePath=".\include\Poco\Net\SecureSMTPClientSession.h" + > + + Name="Source Files" + > + RelativePath=".\src\SecureSMTPClientSession.cpp" + > + - - - - - - + RelativePath="..\DLLVersion.rc" + > + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> + ExcludedFromBuild="true" + > + Name="VCResourceCompilerTool" + /> - + + diff --git a/NetSSL_OpenSSL/testsuite/TestSuite.progen b/NetSSL_OpenSSL/testsuite/TestSuite.progen index 5ea2697e6..79cee86ee 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite.progen +++ b/NetSSL_OpenSSL/testsuite/TestSuite.progen @@ -6,13 +6,11 @@ vc.project.pocobase = ..\\.. vc.project.platforms = Win32, x64, WinCE vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj -vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\XML\\include;..\\..\\Util\\include;..\\..\\Net\\include;..\\..\\Crypto\\include +vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\XML\\include;..\\..\\Util\\include;..\\..\\Net\\include;..\\..\\Crypto\\include;..\\..\\openssl\\out\\include vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.WinCE = ws2.lib iphlpapi.lib -vc.project.linker.dependencies.debug_shared = libeay32.lib ssleay32.lib -vc.project.linker.dependencies.release_shared = libeay32.lib ssleay32.lib -vc.project.linker.dependencies.debug_static_md = libeay32mdd.lib ssleay32mdd.lib Crypt32.lib -vc.project.linker.dependencies.release_static_md = libeay32md.lib ssleay32md.lib Crypt32.lib -vc.project.linker.dependencies.debug_static_mt = libeay32mtd.lib ssleay32mtd.lib Crypt32.lib -vc.project.linker.dependencies.release_static_mt = libeay32mt.lib ssleay32mt.lib Crypt32.lib +vc.project.linker.dependencies.debug_static_md = Crypt32.lib +vc.project.linker.dependencies.release_static_md = Crypt32.lib +vc.project.linker.dependencies.debug_static_mt = Crypt32.lib +vc.project.linker.dependencies.release_static_mt = Crypt32.lib diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 65312fbf6..1c9e66186 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {04df41c9-3ee2-496a-a3f4-608debb2f0b3} + {70d51cba-2e48-45dd-bff9-4e4b1d78d2cf} - {1b49d0a2-b247-482c-8507-fcb17def9054} + {d4547f83-5a82-4e1b-b812-f5d664adadc1} - {fd0ee3cb-ce45-4919-8514-dd672e12bfd1} + {9e6d0148-60b2-484d-bcc2-dcb4ceb808cf} - {f75f756a-ad4a-4ee5-a400-e3e415b6e9bc} + {3d1fc721-bb77-479f-981b-facf39fbfe82} - {6d320bac-1f29-4834-b008-d4bf5b6f89c9} + {49ac04c5-bbf4-4a10-bbd3-c34c1be125f8} - {76f0aaf7-d89b-4bbe-a3cc-cf5c13b7cd46} + {614143e8-fd4f-4cb4-89da-ed107005508c} - {1aa3c893-db2b-4b5e-9d8f-0b2f0394b294} + {dc64f6e2-6c82-4294-afe9-97b4b962ef0c} - {f7634e2d-27b4-4f45-bad5-f9714c4f4030} + {631b7bf9-6bde-4084-8f1c-dca9f806716c} - {c7ee446e-53c9-469b-8f6d-c9430614d1ca} + {a02ca62c-b709-49d1-9b66-65bcecdb9360} - {81c7ec98-2b90-4891-b3e2-56aba10d5d31} + {46fe37ef-2496-4d8a-949e-af6791c08cc2} - {0e97d9d5-5614-4f3b-88c4-1b8b28d39ff5} + {03133e01-53b0-4af9-8f1a-631d15ffe07b} - {c51d13ca-8f56-413e-9698-aeb9bc96612b} + {c85fdfd6-cd27-40be-aad0-59e2ace53e67} - {902efde1-a4a1-4cfd-abad-3f135d55bc0e} + {5487c672-3918-4ee6-92e7-5638cee90617} - {4482cc44-a8d4-4b97-a791-af3036be02e7} + {291e24d6-6f64-4700-809b-ace7c41481f8} - {d9bdcaed-d5ee-4f4a-9de3-08c435d7c61b} + {39ada452-21f7-4506-9119-a739c4edd443} - {ed7abad3-c8a9-41f8-bccd-7fa72cc1751e} + {d3d12202-7e81-469a-be22-f6b066a5a7ef} - {7cc64001-7b50-4170-8fed-874a21636aa2} + {474533f8-6eb9-427d-bb24-75a420446a46} - {06e08bb8-a657-4ed7-a5af-8f725ed1df87} + {fa376519-a197-4698-89df-5ac2318e4b71} - {a37185a3-4c6d-481c-b160-f59eb75fcb8c} + {e1584415-196f-4cf8-9325-791ca5ba916b} - {25611509-32cb-4feb-846e-efee396807ef} + {f6e2f1b1-398d-4188-b68d-62a429001b37} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 6c336ca3e..4f21a57bd 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {e9d7c7b8-b84c-4ea2-b0b7-5ff2f9c7feb3} + {fb063db2-ebe0-4663-b891-24856d987e2b} - {52a26c82-915b-4d00-911a-7730dafb2885} + {3b0c8436-b23c-4330-b4b0-f1b28545977a} - {d94c8f93-d502-49dd-9148-d9d176549eee} + {48fdb92c-c129-41fc-b6fb-68ed0da340d4} - {8ec55b51-5f3f-4799-a01d-c934cb7a4767} + {56fc9652-93e3-49cb-a653-ef71c77d5a44} - {7e410e75-103b-492e-8971-95619c502c93} + {6b555674-703f-4ee3-8f2d-3e947bbe2df8} - {e07167a2-bc64-4d6c-8dfe-38b6ba3d44e7} + {247a2c5c-a906-42c1-ad07-080d9dba37e1} - {bba27924-a09f-4fcb-894b-54894deed569} + {ed20cf06-d3a3-4262-aabf-ace762a0abb2} - {f7481006-7683-4dea-870d-7f7367d500a7} + {347bb67d-f903-4a8d-be1b-84736270aa3f} - {5c2967ff-a52c-4688-9025-dfc125c6b515} + {d2ccd81f-28f0-4000-989b-e1d936180bb4} - {9390f3e6-cdcc-494d-acc9-e4442c737cc4} + {ce156d8f-4934-450b-a4f7-c33f10b77c07} - {1d20f39c-29bb-4f73-a011-f7439c9998a5} + {9ca6732a-20c1-4689-b00c-2b0a5335ba6c} - {2ac9f173-17e2-4133-b3e2-2a7305644b24} + {269e9fa2-27ac-4476-a87b-37f7db854e9d} - {69179ea6-a66a-4b94-9b11-72f9c0a7b9f9} + {ce3a7fd8-db5e-4d2d-b2b4-23577bb841df} - {ef9c8b0e-d0d8-4e93-a95e-aa8c59eac7e2} + {bebd8d08-a971-48f3-98e0-f814ae8e6340} - {1c7a3379-7f2d-4072-90c5-74be26dc43ed} + {9a4ee68a-a058-4160-ade8-2793aa779834} - {754c50f5-e11c-4294-a245-1dec8ed4dc31} + {7d19176f-fb26-4d01-b328-240418f6bd86} - {9eaa4d40-d4d5-4b8f-a5ce-138b977ece65} + {1892e5cf-4651-4b35-9653-1f04548a6d8b} - {41fd072c-2046-4ed2-a2cf-b5b4f0ef310e} + {6fbd07ca-4954-4b52-819b-a4663dc81ca6} - {5158d325-b8d9-4301-86b5-16b9bd220de3} + {efb6ec0b-f2b3-4307-9cf3-c37c4d1bf037} - {d9a9bcd7-d1c0-4242-a95c-4e511dc37d17} + {162e3dc2-e208-4ba9-8d58-7e73fbc13c01} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj index 452652b37..822c7b974 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>10.0.30319.1 + <_ProjectFileVersion>10.0.40219.1 bin\ obj\TestSuite\$(Configuration)\ true @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters index aacb6751e..d8ff892ce 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,64 +2,64 @@ - {121758df-1dae-4ad9-b187-45b7f8116af9} + {058594fe-4c13-4e1d-bf4f-9eaaa891934b} - {5352cf03-a95a-4b37-9be0-0edd61b96d45} + {a4b9863c-eeb4-42d4-8929-11a419094a35} - {c78b49db-5e16-4f28-9aee-bd04e506e85b} + {90fd8403-87bb-4906-a697-917df214d9d8} - {1f3ffdbf-a441-43d9-8cd8-4c74bdbc625d} + {67384a43-268c-4238-afe0-481412e96094} - {760d3eea-e3ab-4f1c-986e-0eb2f7e2ee6a} + {f4cbc781-caac-457e-bb48-b8421d67a51a} - {5245bc82-7a02-4a82-9881-7042dd1d1032} + {ef948cfd-4347-4de4-b3d1-a285fc45f284} - {20b0b455-1be2-436f-9dbb-608da8fa8e55} + {de9268ad-e524-4804-87f6-ee70617c3eeb} - {8a7eb904-582a-45a0-a51d-c1df372103a1} + {55363568-b5f6-4f9b-b5d9-7ac8d6ad42e0} - {d33713fa-e256-4df3-a8de-e266e6981cdb} + {b32da18e-960d-41b7-9f46-6c621e8b5d8c} - {5d6a7226-eab6-4b27-92b4-b8420e41131a} + {d7a29f09-ac05-477f-a5b6-32929ac63ae3} - {2b407caf-6758-40db-b692-ee896e504756} + {37c0fda7-8913-453d-b0b2-7b297a739252} - {ead8ed7b-781a-4378-b4b8-e7bda85da0d4} + {12c6af85-0c7d-4a4f-a0f7-fe46d900fad1} - {0b3b8373-b96f-439f-b853-cfea6babb05c} + {6d6e0048-8e01-4fc7-9bc5-0b06b222015d} - {c3154b09-7da1-4459-a231-8c75bcb16217} + {b083a0a0-af94-4e2b-a197-87b89482352d} - {8b5d231a-9a7b-443f-acf7-87f24fda0fa2} + {3ddbedee-ac4d-4974-b9f5-be3fd98d05fc} - {d176e423-afd6-4df2-b169-c29a0202e2af} + {83f672f5-4794-4621-b82c-841efa96808c} - {a1d10e6e-cd96-4c89-abf0-8e814e4a321a} + {01c4cfdd-cf19-4003-b38b-95f8d26bbe4f} - {a4c7374e-f372-4644-81f1-6d7014943f45} + {b72a1102-9601-4fdf-9596-3a88abb39009} - {4b5fd321-993b-42ef-847a-23d315b191af} + {a0d72ed9-671b-4266-aed1-783aedc94015} - {dcba1a0a-f5c6-4933-b1a2-48d740f8c6d9} + {169b3c74-2025-423b-a4a0-28dc8f3ee0bb} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj index 04d78e129..0306c23ba 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters index 725f83766..07be478e7 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {1671a15d-e60f-4783-822c-90b3937dba88} + {6f194283-f1e8-449d-be9f-1a9f17ad382b} - {6f53f5ef-f1a3-47d9-baa4-7369461056e6} + {7c8308cc-85ff-48e0-a926-a8e0b9638829} - {0009be6f-81d6-461a-bac4-b7deffbe7d25} + {61db9633-f253-42e0-98fd-e66770b579d6} - {9854bf06-24e7-49a7-8ba5-ead47aa576f5} + {2fe29675-bd23-4976-b619-e2dae92913ef} - {2941501d-bafa-4d34-ad9a-154e8a343458} + {226fdb36-0f88-4547-9168-1f0a5860987d} - {36bcb347-20cf-468e-ae41-ed315f4f42ff} + {d03abdf4-4ab2-42a5-b785-885d477011fe} - {0061fa85-0168-4538-856b-adcd048dd410} + {1d517340-3232-4bed-9948-bfd97b6e523b} - {4c2e7272-2a39-45c6-9e28-69f431420173} + {d8a8d230-f23a-4653-981a-8b46e9f5d090} - {bc13b75d-9781-46bd-abc0-3a89a5c47fff} + {1aefd716-e0e5-424d-90af-f61d6812aa61} - {741d3021-3d8b-4cac-9573-a35919d9f0b4} + {318c9a6a-ae7b-4ad2-a1f9-bfe915cc8d04} - {eb04a956-7b1e-4105-8a89-0de11f9a0fa0} + {f50004c3-3479-4088-8fff-4bd245abb26a} - {a5b8f580-a3f2-46c8-8a81-13afe6d47a84} + {0e96455f-3b7d-4d83-89b7-4fd65bd26255} - {477b1628-fd42-49c3-a2ff-e7c129b93ab6} + {73a8a23f-4e2c-4f76-80ec-7f5688893bbb} - {238fd9c7-8ba4-47d8-b9d8-5b4d9ff18bd1} + {04a08838-0b0f-49c4-bb2d-dcc58b0cafcd} - {143766cc-0cdf-49b5-8c3c-8509ffc88d84} + {390117da-83fc-4da1-bc12-8575031fe433} - {7e6a0aaf-83f9-4d63-a52d-591fc1578615} + {5dba826a-b39d-4eb2-a4c8-b1f820f3ed3b} - {61bba7d4-2883-40b6-ad67-093501f2b32c} + {89a501dc-217f-455b-9a33-dea88c31b5cc} - {5de08214-e355-44bf-8c0e-b39949da6b55} + {0878ede7-9830-4965-95cb-071ba27431a7} - {21ceedff-b89f-4b3e-aa8e-f29ef2656222} + {5c78639d-2289-4b0d-8f8a-e5385b0449d5} - {dca12aa7-7e25-4ee5-a6d3-5b8f372609cb} + {753a9ab7-8a89-4d6b-badb-83a057b97d1f} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj index 220d92c30..2917c7770 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,7 @@ Default - CppUnitd.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +173,7 @@ Default - CppUnit.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters index 0ef6530ef..566a6836f 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {0e09f5ea-e70f-4718-ba84-73685209ff4f} + {89b3bf2d-5507-48e6-80b4-9d150b311bea} - {e3608c46-fb38-426c-a3ba-0289f499439a} + {26b9a336-d3d9-4fcf-8d25-f5bb8d56de9e} - {b748acc1-2bdf-407c-b129-a48adacf5479} + {a5c3b7a8-0c21-4eb7-bde4-5490036327e5} - {4e89a416-6af8-4a43-9c3d-9460b0276ff9} + {a859ebda-9051-4c95-976d-04ad75ad60c1} - {c044bf67-45a4-4e69-a731-e49aaab67832} + {89c26c52-2976-4f60-a998-7dcf03f5ad89} - {6b19304a-67b9-412f-96fa-fa107c80f8f5} + {bfca78b2-fae5-4727-99fa-06e854d600b0} - {1df6d6ea-582f-4d86-9ee8-a3d0255a462d} + {11c78a4f-cd15-4284-9a89-307326107a6a} - {40886e6d-f548-4b3b-9353-96303560cadd} + {1f828306-5ad3-4ec2-9dd7-f7a21d56836a} - {a1a685e0-8b93-441b-8b5b-9a4d50a138e0} + {7e1fc2cd-5fc8-4e93-be7c-69b9c353ed76} - {787b361c-ff20-475b-9f30-2a92706f8ce5} + {012f7730-344e-4f4c-a03a-c5ff9f5f24a8} - {2beffe90-0b25-4f52-bbad-2f89627edadd} + {d43cdafe-a31d-45c0-b7ac-246e58a306ff} - {cbe8d4bc-5f65-4083-8c68-db7add69b6ee} + {b4df3408-5e75-4859-a3f2-8ce55fd6a806} - {ce02aef3-9c36-4b2c-854e-7598124abcd9} + {3213a96e-f48a-49a5-b281-f8103cdb9b66} - {31d42856-80d1-4c9b-8a3a-8d7ae25f156c} + {2dc95e1c-aae3-4e70-96ef-65145abc947c} - {46458469-d145-49f8-9260-7525c487b8ba} + {1ba0d421-7214-4011-b076-7ec709a9ccbd} - {84583877-dcac-4381-861d-eb15c1c94c1b} + {1be8b06a-8aaa-44e2-9dc8-643c89e405bc} - {17d546e3-8653-4811-8d7d-159061827f81} + {fc8a8270-839d-45f2-afd4-90ebec059219} - {06bdb051-1698-42f5-9ea8-b9d354891d3e} + {7bab8e5e-7f77-4ee1-9879-f9fb8f353396} - {5a0ce0b8-0542-4b06-94bc-623a25cfd861} + {e9360bc8-03cb-4fb7-ac13-1f9890202ec3} - {afacadc2-8b2b-48aa-a45f-22e90ba6e93c} + {45f4966b-2b95-49e2-b47d-caf722a57919} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj index ae53aa659..e0e88e468 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj @@ -1,16 +1,20 @@ + Keyword="Win32Proj" + TargetFrameworkVersion="0" + > + Name="Win32" + /> - + + + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> - + + + Name="HTTPS" + > + Name="Header Files" + > + RelativePath=".\src\HTTPSTestServer.h" + > + + Name="Source Files" + > + RelativePath=".\src\HTTPSTestServer.cpp" + > + + Name="_Suite" + > + Name="Header Files" + > + RelativePath=".\src\NetSSLTestSuite.h" + > + + Name="Source Files" + > + RelativePath=".\src\NetSSLTestSuite.cpp" + > + + Name="_Driver" + > + Name="Source Files" + > + RelativePath=".\src\WinDriver.cpp" + > + + Name="TCPServer" + > + Name="Header Files" + > + RelativePath=".\src\TCPServerTest.h" + > + + RelativePath=".\src\TCPServerTestSuite.h" + > + + Name="Source Files" + > + RelativePath=".\src\TCPServerTest.cpp" + > + + RelativePath=".\src\TCPServerTestSuite.cpp" + > + + Name="HTTPSServer" + > + Name="Header Files" + > + RelativePath=".\src\HTTPSServerTest.h" + > + + RelativePath=".\src\HTTPSServerTestSuite.h" + > + + Name="Source Files" + > + RelativePath=".\src\HTTPSServerTest.cpp" + > + + RelativePath=".\src\HTTPSServerTestSuite.cpp" + > + + Name="HTTPSClient" + > + Name="Header Files" + > + RelativePath=".\src\HTTPSClientSessionTest.h" + > + + RelativePath=".\src\HTTPSClientTestSuite.h" + > + + RelativePath=".\src\HTTPSStreamFactoryTest.h" + > + + Name="Source Files" + > + RelativePath=".\src\HTTPSClientSessionTest.cpp" + > + + RelativePath=".\src\HTTPSClientTestSuite.cpp" + > + + RelativePath=".\src\HTTPSStreamFactoryTest.cpp" + > + + Name="WebSocket" + > + Name="Source Files" + > + RelativePath=".\src\WebSocketTest.cpp" + > + + RelativePath=".\src\WebSocketTestSuite.cpp" + > + + Name="Header Files" + > + RelativePath=".\src\WebSocketTest.h" + > + + RelativePath=".\src\WebSocketTestSuite.h" + > + - + + diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj index 8abad5147..e6b347801 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>10.0.30319.1 + <_ProjectFileVersion>10.0.40219.1 bin64\ obj64\TestSuite\$(Configuration)\ true @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,7 +132,7 @@ %(AdditionalOptions) - CppUnitd.lib;WinTestRunnerd.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,7 +166,7 @@ %(AdditionalOptions) - CppUnit.lib;WinTestRunner.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,7 +198,7 @@ %(AdditionalOptions) - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ %(AdditionalOptions) - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,7 +266,7 @@ %(AdditionalOptions) - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,7 +300,7 @@ %(AdditionalOptions) - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters index 1610925ab..d7bcab521 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,64 +2,64 @@ - {bdf86dfb-0131-424c-b1b6-8cdd823f5473} + {7bee4ac8-446f-4a08-930b-9767eef058e5} - {7961473e-e2bf-4765-ab90-df975486bffe} + {f41fe462-6b6b-4dc6-8557-ca42949fa8e3} - {40cd8ef3-d003-41a0-9e89-f7c8296a2caa} + {7479ceb3-b76e-4561-abb5-b2ac15e7f53f} - {1941b1a5-ed48-42eb-9447-203c9285da3c} + {681e2c2a-6bd2-4e34-9cbc-1c5892e707df} - {bf781b52-eb62-4647-bdb8-498ed8f85a9e} + {f2a4b8a7-d82c-4a40-8be4-53833448f5e9} - {32845aa4-4064-456b-aedd-8823fccb9e0e} + {df487324-c16c-4aec-adb5-775c023cf8aa} - {fffe2e68-9800-4a5e-b600-32c1dba729d8} + {96242cef-9543-496c-a06b-fdde3cb91b3f} - {6013768a-09eb-4991-9a61-656b18eb12f0} + {625009a0-b564-4769-b4f6-7e36ae544e35} - {911c0822-5c2b-4ff3-abd5-16e9a8a1e563} + {cb0ae261-1ea8-4b42-aaa1-7b1367cc0082} - {2f181791-4ea3-4b5f-8440-5863d71d82db} + {10a2b6de-c7ec-4718-a860-83df26d82efa} - {0ab59e21-5ca1-4fe1-a1e7-2707e9c7451a} + {b60472e3-fb1c-48f3-ad1c-7fb17cf29a69} - {d7baa143-e03f-4b8b-be7f-8b2b60a5db5e} + {83ee05ac-4fb2-455a-8d08-aa5bed4f98ab} - {b1570109-807d-424c-9df2-be935fee4deb} + {d34e6113-0944-42a1-bb26-1f6b0e172391} - {f28d72d4-40d6-4ebe-aaab-de1b48d1a010} + {0b63ddd5-7a69-4795-affe-76e4166f481c} - {3db45545-af6f-44c5-a981-7fb1c05eb7da} + {c712ef06-8b2e-43a8-bc5f-8af9470d66d1} - {cbf5bcd4-688b-4d7e-b7c4-47fc2c120eb1} + {80c2cbd0-58e9-4d19-a1e5-8cae39a7a88e} - {ee1deeaa-1ffe-4236-a1b2-67954c62260d} + {30670cbd-ea12-4312-9707-d05c568f6982} - {282cda0b-6ec2-435b-8d33-53b3c7fd1668} + {89463b2a-86df-4ee0-b208-1c9491bf0903} - {288d2792-b7ae-47d1-8cc0-de14b19d74b2} + {8104dce5-6a7e-48a1-9def-83a3f4c43958} - {522acf16-db9b-4f9e-a54e-ced61aba672d} + {87f09454-6b71-4a2a-9b1a-ce735775e4af} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj index dc6a53cb4..6fc304527 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,7 +148,7 @@ Default - CppUnitd.lib;WinTestRunnerd.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,7 +179,7 @@ Default - CppUnit.lib;WinTestRunner.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,7 +208,7 @@ Default - CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,7 +240,7 @@ Default - CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,7 +270,7 @@ Default - CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,7 +301,7 @@ Default - CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters index 0b8bb0119..06360fbb6 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {edcf6b04-9d8b-4196-9c8b-86210ad1e372} + {af1331f2-315f-444a-b755-78ec7c93dd18} - {97759aa9-5165-4dfb-aaff-d66ffbc890b6} + {c8fa2f79-e949-4360-8667-4fcf14cc1402} - {5113e1be-e397-496a-8c99-3a4ffb65d02d} + {228fb5e4-c010-4a16-9460-fb3373539012} - {ad7176be-5b84-4dc9-9385-0d1ee2f2b2f3} + {18fc5842-bc56-46b9-ac34-8003c14930a2} - {6df1fd8c-14f8-4d48-9caa-dfa6786a6d94} + {e008ad36-cb76-4c51-98f6-f955a74ee9f9} - {9cd88fc3-bc9f-48e3-ad4d-2afec7ee4f79} + {4b88b058-e8d9-4fbe-b5cc-3382ec80d3a1} - {17395e29-0c23-4633-bb4b-6e4165f94274} + {340a9473-e9bb-4b2c-b7bc-2d56df3f1772} - {a4b97f3e-8178-4941-8de1-0e04fa65902f} + {c4b09152-c3bd-4e61-8ec5-e639411f8f13} - {6fe05659-8a59-4f90-9777-6a342cc2f99e} + {8c89b1a2-79fd-4ecb-9ad9-6c450ba40028} - {ed90d55e-199e-46ac-ba74-33eb220571f5} + {6e1fb831-90b7-413e-8a09-8b3ee05b3f1e} - {3669f0a4-b70c-4b2b-8fc0-8377d5c10ad5} + {3dd9fa24-ffcb-4d06-a6eb-cbdf042d0aef} - {fbbf283b-a5d2-42e8-ad93-9d4abb064693} + {1f7e6e28-82fa-4ad6-bc2a-d6fb1114cc6b} - {439e1f1a-9144-4f50-811e-371a1285e30a} + {63ce1244-4ae3-430f-8a42-3ee1ba048a35} - {f2e9667a-6da1-4b6e-bc93-653499fe13ef} + {5b4cffde-86d5-4b3d-966b-cf3882475e17} - {7bb76651-8242-4ff9-94fa-3ef075b9acc3} + {5905a78d-75a5-4b53-b2ed-3e84ae87601e} - {29a548ee-1a97-4dff-bf7a-03d762349518} + {e2e0173b-a6d3-4301-abdf-d66a6e8a979a} - {8aa2c0d5-26b2-48c9-a98a-a0a1cf775860} + {f53906c9-47c1-4208-9f3f-91035cc3abc5} - {7261974f-da89-408b-bb33-14b4e343b39f} + {8fb9c615-11be-42ae-bd4b-07d444900150} - {514e7f71-f2d2-422d-af4f-bd86f7e5148a} + {45fd7c26-a5cb-4896-b1ba-ddec9890e8e5} - {b2716b49-6f6a-4228-a085-8f3af4752b70} + {898d7aef-4008-44d6-87e4-9fa828e2576d} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj index d3f9b431d..45b8e7bb7 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,7 @@ Default - CppUnitd.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +173,7 @@ Default - CppUnit.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - CppUnitmt.lib;iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;..\..\openssl\out\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - CppUnitmd.lib;iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters index 890da732e..0e6203b50 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {e8a96a50-3640-48f9-843b-650db9415fa5} + {e6131afc-176e-4783-a833-58692f25a879} - {b1e58987-cd76-46a1-ad02-a47c8080d223} + {e4c7bbbb-f7f4-4450-aa58-4db516f58e0b} - {b6d18a24-0d04-4115-935f-fc4076eee1b6} + {172d1bd1-7b63-4f6e-9096-bad46a1454f1} - {d48ae85d-7584-4ee0-955f-d8378f1dacee} + {fa21ad67-bf1a-4983-a03f-1dbf3b1b6b88} - {537e9b02-2cbc-4a86-b5f0-bb2a6c27470b} + {877f17da-b474-4646-acd1-83e4976448c2} - {31730825-d5c3-4cc5-a640-1ae24309001b} + {fd0ccd14-0180-4145-be23-96611405c094} - {7b957168-eb5d-4f10-a263-3b9d87d5cf26} + {6e5b416c-622b-42e5-8ced-fdaeb87ee65b} - {b65a0239-c96b-4594-a135-f11e76ecbe4e} + {f66b38d8-3d1a-4868-a03a-43b779ce08e3} - {78417f11-bfb0-44ac-8331-cc3136c22e0d} + {8e33b731-b409-4ca4-9564-9c9b4dea4ad7} - {c2c2e59c-51aa-4cc0-96e5-ac22570ca07a} + {0aa1431d-f17e-4e7a-aaca-462a022b86c6} - {2b700145-005f-4edf-a3df-373821826674} + {8cba5d2f-94e6-443c-bb33-91fae7a06345} - {66c3fe46-2bc1-4422-8c6d-ebaf172c5b32} + {39310045-5035-40a9-9eb1-c29be9666f73} - {3337edd3-9252-431e-b839-5819f694d562} + {7fe1dd62-4697-4099-ba94-1e0ad53f1985} - {7510b0ee-cf49-49f9-8906-ea85e92996ae} + {3a6ab805-258f-4199-bacd-ca820a81482f} - {49b597f9-9e0e-46e6-b8be-ddb2ac2584e0} + {38a9e7c2-7b32-4f43-a648-1d4ea7ccb43b} - {f95ced76-35a2-436e-9e8f-35c46c337bd7} + {b4e38705-fd52-4069-938a-a9de30959dc7} - {a3a304a4-6d5d-49a5-a031-a77b73e9b471} + {bbf2f958-d543-4919-a2c5-338d520e8b7b} - {a685b348-f1f9-4aad-a457-ddfc74026ba8} + {21734617-0865-444a-9493-6f199b72cdba} - {272d8be5-11d8-46ad-9475-4e5ab6176d46} + {d1660ac4-e05f-4e10-ba3a-69045b2df80c} - {b06e4a72-287b-429d-876e-a79120181962} + {fb09567c-50a4-4d55-ab4e-ff1d3f1f06ee} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj index bf4642e2a..ff6415150 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj @@ -1,16 +1,20 @@ + Keyword="Win32Proj" + TargetFrameworkVersion="0" + > + Name="x64" + /> - + + + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> - + + + Name="HTTPS" + > + Name="Header Files" + > + RelativePath=".\src\HTTPSTestServer.h" + > + + Name="Source Files" + > + RelativePath=".\src\HTTPSTestServer.cpp" + > + + Name="_Suite" + > + Name="Header Files" + > + RelativePath=".\src\NetSSLTestSuite.h" + > + + Name="Source Files" + > + RelativePath=".\src\NetSSLTestSuite.cpp" + > + + Name="_Driver" + > + Name="Source Files" + > + RelativePath=".\src\WinDriver.cpp" + > + + Name="TCPServer" + > + Name="Header Files" + > + RelativePath=".\src\TCPServerTest.h" + > + + RelativePath=".\src\TCPServerTestSuite.h" + > + + Name="Source Files" + > + RelativePath=".\src\TCPServerTest.cpp" + > + + RelativePath=".\src\TCPServerTestSuite.cpp" + > + + Name="HTTPSServer" + > + Name="Header Files" + > + RelativePath=".\src\HTTPSServerTest.h" + > + + RelativePath=".\src\HTTPSServerTestSuite.h" + > + + Name="Source Files" + > + RelativePath=".\src\HTTPSServerTest.cpp" + > + + RelativePath=".\src\HTTPSServerTestSuite.cpp" + > + + Name="HTTPSClient" + > + Name="Header Files" + > + RelativePath=".\src\HTTPSClientSessionTest.h" + > + + RelativePath=".\src\HTTPSClientTestSuite.h" + > + + RelativePath=".\src\HTTPSStreamFactoryTest.h" + > + + Name="Source Files" + > + RelativePath=".\src\HTTPSClientSessionTest.cpp" + > + + RelativePath=".\src\HTTPSClientTestSuite.cpp" + > + + RelativePath=".\src\HTTPSStreamFactoryTest.cpp" + > + + Name="WebSocket" + > + Name="Source Files" + > + RelativePath=".\src\WebSocketTest.cpp" + > + + RelativePath=".\src\WebSocketTestSuite.cpp" + > + + Name="Header Files" + > + RelativePath=".\src\WebSocketTest.h" + > + + RelativePath=".\src\WebSocketTestSuite.h" + > + - + + diff --git a/ProGen/src/ProGen.cpp b/ProGen/src/ProGen.cpp index 9c115e1a0..992e2f839 100644 --- a/ProGen/src/ProGen.cpp +++ b/ProGen/src/ProGen.cpp @@ -685,6 +685,7 @@ protected: setProperty(*pProps, "configuration.linker.libraries", projectConfig, "vc.project.linker.libraries", platform, config); setProperty(*pProps, "configuration.linker.entry", projectConfig, "vc.project.linker.entry", platform, config); setProperty(*pProps, "configuration.linker.additionalOptions", projectConfig, "vc.project.linker.additionalOptions", platform, config); + setProperty(*pProps, "configuration.prebuild", projectConfig, "vc.project.prebuild", platform, config); setProperty(*pProps, "configuration.postbuild", projectConfig, "vc.project.postbuild", platform, config); std::string libSuffix = this->config().getString("progen.libsuffix." + config, ""); Poco::StringTokenizer rawDependencies(pProps->getString("configuration.linker.dependencies"), " ", Poco::StringTokenizer::TOK_TRIM | Poco::StringTokenizer::TOK_IGNORE_EMPTY); @@ -706,6 +707,16 @@ protected: configPath.setExtension("template"); Poco::AutoPtr pConfigDoc = domParser.parse(configPath.toString()); Poco::XML::Element* pConfigElem = pConfigDoc->documentElement(); + + std::string prebuild = pProps->getString("configuration.prebuild", ""); + if (!prebuild.empty()) + { + Poco::XML::Node* pPreBuildNode = pConfigElem->getNodeByPath("Tool[@Name=VCPreBuildEventTool]"); + if (pPreBuildNode) + { + static_cast(pPreBuildNode)->setAttribute("CommandLine", prebuild); + } + } std::string postbuild = pProps->getString("configuration.postbuild", ""); if (!postbuild.empty()) @@ -901,6 +912,10 @@ protected: templatePath.pushDirectory(tool); templatePath.pushDirectory(platform); templatePath.pushDirectory(projectType); + if (platform == "Win32") pProjectConfig->setString("vc.project.platform.bits", "32"); + else if (platform == "x64") pProjectConfig->setString("vc.project.platform.bits", "64"); + else if (platform == "WinCE") pProjectConfig->setString("vc.project.platform.bits", "32"); + else throw Poco::NotFoundException(Poco::format("Unknown platform: %s", platform)); generateProject(*pProjectConfig, projectPath, templatePath, platform, tool); } }