From e89e3745ee80188573621a790866d11e97f9816a Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Sat, 16 Sep 2017 00:44:39 -0500 Subject: [PATCH] add Crypto PKCS12/EC; update VS projects --- .gitignore | 2 + Crypto/Crypto.progen | 25 +- Crypto/Crypto_CE_VS90.vcproj | 81 +++- Crypto/Crypto_VS90.vcproj | 81 +++- Crypto/Crypto_WEC2013_vs110.sln | 60 +++ Crypto/Crypto_WEC2013_vs110.vcxproj | 304 ++------------- Crypto/Crypto_WEC2013_vs110.vcxproj.filters | 87 ++++- Crypto/Crypto_WEC2013_vs120.vcxproj | 296 ++------------- Crypto/Crypto_WEC2013_vs120.vcxproj.filters | 87 ++++- Crypto/Crypto_vs100.vcxproj | 65 +++- Crypto/Crypto_vs100.vcxproj.filters | 87 ++++- Crypto/Crypto_vs110.vcxproj | 67 +++- Crypto/Crypto_vs110.vcxproj.filters | 87 ++++- Crypto/Crypto_vs120.vcxproj | 77 +++- Crypto/Crypto_vs120.vcxproj.filters | 87 ++++- Crypto/Crypto_vs140.vcxproj | 67 +++- Crypto/Crypto_vs140.vcxproj.filters | 87 ++++- Crypto/Crypto_vs150.vcxproj | 67 +++- Crypto/Crypto_vs150.vcxproj.filters | 87 ++++- Crypto/Crypto_x64_vs100.vcxproj | 63 +++- Crypto/Crypto_x64_vs100.vcxproj.filters | 87 ++++- Crypto/Crypto_x64_vs110.vcxproj | 65 +++- Crypto/Crypto_x64_vs110.vcxproj.filters | 87 ++++- Crypto/Crypto_x64_vs120.vcxproj | 75 +++- Crypto/Crypto_x64_vs120.vcxproj.filters | 87 ++++- Crypto/Crypto_x64_vs140.vcxproj | 65 +++- Crypto/Crypto_x64_vs140.vcxproj.filters | 87 ++++- Crypto/Crypto_x64_vs150.vcxproj | 65 +++- Crypto/Crypto_x64_vs150.vcxproj.filters | 87 ++++- Crypto/Crypto_x64_vs90.vcproj | 81 +++- Crypto/include/Poco/Crypto/Crypto.h | 46 ++- Crypto/include/Poco/Crypto/CryptoException.h | 57 +++ .../include/Poco/Crypto/ECDSADigestEngine.h | 101 +++++ Crypto/include/Poco/Crypto/ECKey.h | 99 +++++ Crypto/include/Poco/Crypto/ECKeyImpl.h | 137 +++++++ Crypto/include/Poco/Crypto/EVPPKey.h | 143 +++++++ Crypto/include/Poco/Crypto/KeyPair.h | 119 ++++++ Crypto/include/Poco/Crypto/KeyPairImpl.h | 103 +++++ Crypto/include/Poco/Crypto/PKCS12Container.h | 139 +++++++ Crypto/include/Poco/Crypto/X509Certificate.h | 9 +- Crypto/src/CryptoException.cpp | 107 ++++++ Crypto/src/ECDSADigestEngine.cpp | 100 +++++ Crypto/src/ECKey.cpp | 75 ++++ Crypto/src/ECKeyImpl.cpp | 357 ++++++++++++++++++ Crypto/src/EVPPKey.cpp | 134 +++++++ Crypto/src/KeyPair.cpp | 34 ++ Crypto/src/KeyPairImpl.cpp | 35 ++ Crypto/src/PKCS12Container.cpp | 135 +++++++ Crypto/src/X509Certificate.cpp | 51 ++- Crypto/testsuite/TestSuite.progen | 16 +- Crypto/testsuite/TestSuite_CE_VS90.vcproj | 48 ++- Crypto/testsuite/TestSuite_VS90.vcproj | 48 ++- .../testsuite/TestSuite_WEC2013_vs110.vcxproj | 301 +-------------- .../TestSuite_WEC2013_vs110.vcxproj.filters | 34 +- .../testsuite/TestSuite_WEC2013_vs120.vcxproj | 301 +-------------- .../TestSuite_WEC2013_vs120.vcxproj.filters | 34 +- Crypto/testsuite/TestSuite_vs100.vcxproj | 42 ++- .../testsuite/TestSuite_vs100.vcxproj.filters | 34 +- Crypto/testsuite/TestSuite_vs110.vcxproj | 44 ++- .../testsuite/TestSuite_vs110.vcxproj.filters | 34 +- Crypto/testsuite/TestSuite_vs120.vcxproj | 48 +-- .../testsuite/TestSuite_vs120.vcxproj.filters | 34 +- Crypto/testsuite/TestSuite_vs140.vcxproj | 42 ++- .../testsuite/TestSuite_vs140.vcxproj.filters | 34 +- Crypto/testsuite/TestSuite_vs150.vcxproj | 42 ++- .../testsuite/TestSuite_vs150.vcxproj.filters | 34 +- Crypto/testsuite/TestSuite_x64_vs100.vcxproj | 42 ++- .../TestSuite_x64_vs100.vcxproj.filters | 34 +- Crypto/testsuite/TestSuite_x64_vs110.vcxproj | 44 ++- .../TestSuite_x64_vs110.vcxproj.filters | 34 +- Crypto/testsuite/TestSuite_x64_vs120.vcxproj | 48 +-- .../TestSuite_x64_vs120.vcxproj.filters | 34 +- Crypto/testsuite/TestSuite_x64_vs140.vcxproj | 42 ++- .../TestSuite_x64_vs140.vcxproj.filters | 34 +- Crypto/testsuite/TestSuite_x64_vs150.vcxproj | 42 ++- .../TestSuite_x64_vs150.vcxproj.filters | 34 +- Crypto/testsuite/TestSuite_x64_vs90.vcproj | 48 ++- Crypto/testsuite/data/certs-only.p12 | Bin 0 -> 7272 bytes Crypto/testsuite/data/full.p12 | Bin 0 -> 5880 bytes Crypto/testsuite/src/CryptoTestSuite.cpp | 10 +- Crypto/testsuite/src/ECTest.cpp | 327 ++++++++++++++++ Crypto/testsuite/src/ECTest.h | 46 +++ Crypto/testsuite/src/PKCS12ContainerTest.cpp | 244 ++++++++++++ Crypto/testsuite/src/PKCS12ContainerTest.h | 48 +++ ProGen/src/ProGen.cpp | 15 + 85 files changed, 5061 insertions(+), 1866 deletions(-) create mode 100644 Crypto/Crypto_WEC2013_vs110.sln create mode 100644 Crypto/include/Poco/Crypto/CryptoException.h create mode 100644 Crypto/include/Poco/Crypto/ECDSADigestEngine.h create mode 100644 Crypto/include/Poco/Crypto/ECKey.h create mode 100644 Crypto/include/Poco/Crypto/ECKeyImpl.h create mode 100644 Crypto/include/Poco/Crypto/EVPPKey.h create mode 100644 Crypto/include/Poco/Crypto/KeyPair.h create mode 100644 Crypto/include/Poco/Crypto/KeyPairImpl.h create mode 100644 Crypto/include/Poco/Crypto/PKCS12Container.h create mode 100644 Crypto/src/CryptoException.cpp create mode 100644 Crypto/src/ECDSADigestEngine.cpp create mode 100644 Crypto/src/ECKey.cpp create mode 100644 Crypto/src/ECKeyImpl.cpp create mode 100644 Crypto/src/EVPPKey.cpp create mode 100644 Crypto/src/KeyPair.cpp create mode 100644 Crypto/src/KeyPairImpl.cpp create mode 100644 Crypto/src/PKCS12Container.cpp create mode 100644 Crypto/testsuite/data/certs-only.p12 create mode 100644 Crypto/testsuite/data/full.p12 create mode 100644 Crypto/testsuite/src/ECTest.cpp create mode 100644 Crypto/testsuite/src/ECTest.h create mode 100644 Crypto/testsuite/src/PKCS12ContainerTest.cpp create mode 100644 Crypto/testsuite/src/PKCS12ContainerTest.h diff --git a/.gitignore b/.gitignore index d0afe9b19..36f8c8238 100644 --- a/.gitignore +++ b/.gitignore @@ -89,6 +89,8 @@ Thumbs.db *.tlog *.lastbuildstate *.unsuccessfulbuild +*.opendb +.vs/ release_shared/ debug_shared/ release_static/ diff --git a/Crypto/Crypto.progen b/Crypto/Crypto.progen index a7f3cfa5b..f56cd3421 100644 --- a/Crypto/Crypto.progen +++ b/Crypto/Crypto.progen @@ -7,17 +7,28 @@ 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 = ${vc.project.pocobase}\\openssl\\VS_120\\include;${vc.project.pocobase}\\Foundation\\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_shared = +vc.project.linker.dependencies.release_shared = +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} +dirbits = ${vc.project.platform.bindir.suffix} +openssl = ${vc.project.pocobase}\\openssl +vc.project.prebuild.debug_shared = xcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\* 1>nul\nexit 0 +vc.project.prebuild.debug_static_md = xcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\* 1>nul\nexit 0 +vc.project.prebuild.debug_static_mt = xcopy /y ${openssl}\\VS_120\\win${bits}\\lib\\debug\\*${bits}MTd.lib ..\\lib${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\lib\\debug\\*${bits}MTd.pdb ..\\lib${dirbits}\\* 1>nul\nexit 0 +vc.project.prebuild.release_shared = xcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\* 1>nul\nexit 0 +vc.project.prebuild.release_static_md = xcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\* 1>nul\nexit 0 +vc.project.prebuild.release_static_mt = xcopy /y ${openssl}\\VS_120\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${dirbits}\\* 1>nul\nexit 0 +vc.solution.create = true +vc.solution.include = testsuite\\TestSuite vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/Crypto/Crypto_CE_VS90.vcproj b/Crypto/Crypto_CE_VS90.vcproj index ffbb7fa7e..15658e970 100644 --- a/Crypto/Crypto_CE_VS90.vcproj +++ b/Crypto/Crypto_CE_VS90.vcproj @@ -19,7 +19,8 @@ ConfigurationType="2" CharacterSet="1"> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + + @@ -515,11 +525,27 @@ Name="Header Files"> + + + + + + + + @@ -537,15 +563,38 @@ RelativePath=".\src\DigestEngine.cpp"/> + + + + + + + + + + + + + Name="debug_shared|Digi JumpStart (ARMV4I)" + ExcludedFromBuild="true"> + Name="release_shared|Digi JumpStart (ARMV4I)" + ExcludedFromBuild="true"> diff --git a/Crypto/Crypto_VS90.vcproj b/Crypto/Crypto_VS90.vcproj index 0a5cc669e..58b9af09e 100644 --- a/Crypto/Crypto_VS90.vcproj +++ b/Crypto/Crypto_VS90.vcproj @@ -19,7 +19,8 @@ ConfigurationType="2" CharacterSet="2"> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + + @@ -469,11 +479,27 @@ Name="Header Files"> + + + + + + + + @@ -491,15 +517,38 @@ RelativePath=".\src\DigestEngine.cpp"/> + + + + + + + + + + + + + Name="debug_shared|Win32" + ExcludedFromBuild="true"> + Name="release_shared|Win32" + ExcludedFromBuild="true"> diff --git a/Crypto/Crypto_WEC2013_vs110.sln b/Crypto/Crypto_WEC2013_vs110.sln new file mode 100644 index 000000000..b3b6a8dba --- /dev/null +++ b/Crypto/Crypto_WEC2013_vs110.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypto", "Crypto_WEC2013_vs110.vcxproj", "{EEEE7259-32E9-4D56-B023-C733940AB2A0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_WEC2013_vs110.vcxproj", "{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}" + ProjectSection(ProjectDependencies) = postProject + {EEEE7259-32E9-4D56-B023-C733940AB2A0} = {EEEE7259-32E9-4D56-B023-C733940AB2A0} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|SDK_AM335X_SK_WEC2013_V300 = debug_shared|SDK_AM335X_SK_WEC2013_V300 + release_shared|SDK_AM335X_SK_WEC2013_V300 = release_shared|SDK_AM335X_SK_WEC2013_V300 + debug_static_mt|SDK_AM335X_SK_WEC2013_V300 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300 + release_static_mt|SDK_AM335X_SK_WEC2013_V300 = release_static_mt|SDK_AM335X_SK_WEC2013_V300 + debug_static_md|SDK_AM335X_SK_WEC2013_V300 = debug_static_md|SDK_AM335X_SK_WEC2013_V300 + release_static_md|SDK_AM335X_SK_WEC2013_V300 = release_static_md|SDK_AM335X_SK_WEC2013_V300 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_shared|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_shared|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300 + {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_shared|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_shared|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Crypto/Crypto_WEC2013_vs110.vcxproj b/Crypto/Crypto_WEC2013_vs110.vcxproj index 9be13e6e6..af246e49f 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 - - - @@ -270,11 +12,42 @@ + + + + + + + + + + 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 + + @@ -287,17 +60,20 @@ + + + + + + + + - - true - true - true - true - + diff --git a/Crypto/Crypto_WEC2013_vs110.vcxproj.filters b/Crypto/Crypto_WEC2013_vs110.vcxproj.filters index 68a85bc72..efd0693f2 100644 --- a/Crypto/Crypto_WEC2013_vs110.vcxproj.filters +++ b/Crypto/Crypto_WEC2013_vs110.vcxproj.filters @@ -2,49 +2,58 @@ - {465e8121-9b16-441e-8fff-d92f3721b4d0} + {52a87638-79b0-4c5b-a43e-28b013024276} - {0b372042-6616-4556-a377-cf5597f26a22} + {0da5c65a-0145-4344-b8f5-46fcdb774247} - {a7cbec0d-3734-48d6-b77d-a03c8aad3cdb} + {66968020-91f9-49bb-8ea3-68bd104f16bd} - {eda6b73c-7cd7-429d-b1fd-9f44963a27ff} + {704039ee-6735-4f52-b6d1-ad53782324f5} - {3bf2c33f-a2f0-4b1f-b306-ef838b20c511} + {a06d38bd-be92-4b32-a5cf-7467c7372b53} - {23cf9511-7c2e-4f6d-9f09-669611fab997} + {692f74eb-12ba-4ae9-9894-4cdb28706603} - {f53302cf-7071-41d4-ad8f-cd927d905ff9} + {f04a635d-4f69-4c9f-8596-f6cda82f83fe} - {c2907fe6-d7a4-46b6-8190-647ae0c8d8bf} + {7a574bf6-0c83-4dc6-a3b2-0a53fb3b708c} - {4dd73f14-b378-43c8-9ac0-d25831a87711} + {820f4b9a-9fc0-410e-88de-2939a931d14d} - {de8a188c-d76a-420a-b447-b7dc2bd4ca00} + {c929c29d-645d-4664-9fc7-b0096b6fc8e7} - {400fcfce-c402-4616-91b8-ee0951aad4b9} + {954fe408-8d04-49df-a9c5-33e1b1d727c3} - {30aba583-f401-40de-9e6e-6681df14274a} + {a8a27d00-a02f-49e4-b279-7b1264fd0b1b} - {ab0bd4cd-7e6d-4f2d-8259-fa5b40a4cf5f} + {219baece-b662-4931-be03-28b56481c95c} - {355bfe67-7d41-4573-82b3-4cdee3bb7953} + {0a4096ea-dbb6-4fbb-93e4-5d28b1642137} - {bb72de48-9546-4d0d-9aee-7ee035c6301a} + {5ddac9a1-0f80-49b4-9189-18963a89d474} + + + {e34aafa6-7051-446d-bb28-c973411e8c58} + + + {58d8e2e8-4055-48ae-ba83-f79ef796b976} + + + {5175debb-478d-4bcc-af9d-54586e4f9c1e} @@ -81,18 +90,42 @@ RSA\Header Files + + Certificate\Header Files + Certificate\Header Files CryptoCore\Header Files + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + CryptoCore\Header Files Digest\Header Files + + EC\Header Files + + + EC\Header Files + + + EC\Header Files + @@ -128,15 +161,39 @@ RSA\Source Files + + Certificate\Source Files + Certificate\Source Files + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + CryptoCore\Source Files Digest\Source Files + + EC\Source Files + + + EC\Source Files + + + EC\Source Files + diff --git a/Crypto/Crypto_WEC2013_vs120.vcxproj b/Crypto/Crypto_WEC2013_vs120.vcxproj index a43f387fb..7b460737c 100644 --- a/Crypto/Crypto_WEC2013_vs120.vcxproj +++ b/Crypto/Crypto_WEC2013_vs120.vcxproj @@ -1,30 +1,29 @@ - - 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 +35,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 +47,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 +56,24 @@ - - + + + + + + + + + + - - true - true - true - true - + diff --git a/Crypto/Crypto_WEC2013_vs120.vcxproj.filters b/Crypto/Crypto_WEC2013_vs120.vcxproj.filters index cc51116aa..15c2182b9 100644 --- a/Crypto/Crypto_WEC2013_vs120.vcxproj.filters +++ b/Crypto/Crypto_WEC2013_vs120.vcxproj.filters @@ -2,49 +2,58 @@ - {6507102d-dbe1-46e4-814e-4df296cf7086} + {949d5e50-e7dc-4851-9327-f0cdb2834e94} - {51f353a2-11de-4571-ad66-cb15c08410bc} + {6023124d-5542-4443-8b44-dc65205946ff} - {b01a2305-9b1e-420e-94a9-cce479bda006} + {6d401f3a-ccf6-47ca-b761-e71ef613fb51} - {00891559-b515-48d9-825a-ca6df7c6d2e0} + {6393981e-67f8-42ea-841e-a60a9b50d195} - {47389051-5dab-4196-a869-097b36239271} + {5b143759-536a-46c9-9cc1-4d727532b760} - {d78cc93f-edbc-4f55-b923-16a90c950423} + {ffec7d33-267c-4d0d-9da1-cf989a7dc34c} - {dcc1dbe2-d6e6-47ea-8ba6-6bad761d8468} + {1bfac19f-e016-4556-bb17-26879a7e0ac6} - {39a85a47-5a6b-4fbf-ad4a-62c35e3ac316} + {1a8de80d-9cfd-432d-8ea5-902c5ee4db70} - {129c8e5f-8f6c-4efc-ab97-f0c7ee690ffe} + {59731b87-179b-4f67-ba4c-30cc08d797d9} - {93d68f47-b703-4762-9978-666d42ac725c} + {0565dfde-c07c-4bf1-ac1b-c31379ee5304} - {195c06ea-a61b-48e9-b8c4-353aa0573444} + {7efb1993-5384-4af2-9511-df396f5af05d} - {680dfb50-3603-48ee-8700-4e68152d3472} + {2820fbfd-f24d-41c1-a813-879c1c6ed14d} - {6ab2a0bb-5e20-477c-b23b-f7f96304f542} + {06096379-eef2-4ffb-830f-a64d4fd9f20e} - {ff396227-6c86-4b3d-8fb8-f28ebe2cdd2f} + {d7e99055-55f7-418a-90a0-6d18b7f8debe} - {8e8eb5d9-8618-4b6e-8209-06683de083b4} + {ee8f454a-0a5d-421e-9bcb-ef1e0de12597} + + + {0ece3afb-bbe7-450f-adbb-139f7dc25f47} + + + {b7643012-21dc-4e70-a246-cfe2b31766c8} + + + {8c2ff7ca-1938-43cb-8712-6f8a80619e7a} @@ -81,18 +90,42 @@ RSA\Header Files + + Certificate\Header Files + Certificate\Header Files CryptoCore\Header Files + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + CryptoCore\Header Files Digest\Header Files + + EC\Header Files + + + EC\Header Files + + + EC\Header Files + @@ -128,15 +161,39 @@ RSA\Source Files + + Certificate\Source Files + Certificate\Source Files + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + CryptoCore\Source Files Digest\Source Files + + EC\Source Files + + + EC\Source Files + + + EC\Source Files + diff --git a/Crypto/Crypto_vs100.vcxproj b/Crypto/Crypto_vs100.vcxproj index 64643462f..59e70ac04 100644 --- a/Crypto/Crypto_vs100.vcxproj +++ b/Crypto/Crypto_vs100.vcxproj @@ -102,9 +102,14 @@ PocoCryptomt + + xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -122,7 +127,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 +140,18 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +167,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 +181,14 @@ + + xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -196,13 +211,17 @@ + + xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -222,9 +241,14 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -247,13 +271,18 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -270,7 +299,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 @@ -286,10 +315,18 @@ + + + + + + + + @@ -303,14 +340,24 @@ + + + + + + + + + true true true + true true true diff --git a/Crypto/Crypto_vs100.vcxproj.filters b/Crypto/Crypto_vs100.vcxproj.filters index a3c507014..533234599 100644 --- a/Crypto/Crypto_vs100.vcxproj.filters +++ b/Crypto/Crypto_vs100.vcxproj.filters @@ -2,49 +2,58 @@ - {71dc04c4-a3b2-4b6e-a4ef-73f5d4f1fe9d} + {de0c4809-96f7-4d8e-aeb5-662fc48aad3d} - {3926ffdb-6848-40b6-af21-d12bbb732b3d} + {94fd2b37-0a0c-4189-b3ab-3c5a11454416} - {db2aa1d3-10c5-4761-9989-9174af2b53b0} + {f1fb979a-57ca-46b5-bd1d-4d648b5e8107} - {0a923d97-8bf1-417a-890f-91e3b1dca98e} + {d47eb973-6e17-4962-abc1-29d43d5d1cfc} - {4487ee33-7af3-49e4-97ee-0039b0e9291e} + {f455f3cf-ec25-4ca0-9006-13104ddd3820} - {ac3b6e25-c3d2-4dde-bbdd-82a7c5c77941} + {80889b15-db9b-4dbe-8c83-a034ba4210a1} - {e4b3fce1-2506-4607-8d68-2b6863f6f01c} + {8866f83a-7c8f-487e-8d82-9f0dbdab5980} - {3a3cdc61-acd2-4e65-85e8-be288370c317} + {268bc325-f7c1-43c3-aee5-5da23547097b} - {bf8e3521-4a41-4482-8180-dddb89396035} + {bba8395b-6d43-492f-9e03-59b72c368301} - {fed0627f-5b88-433d-b3de-2d9820736a9f} + {9b9fe10a-6fe3-4a88-b8a9-e368ba7fc214} - {e37ad2dc-4e9f-4130-aee2-fecff255d480} + {2815a4aa-14f5-4d2a-8812-845f777e53b9} - {87fc1695-e12f-4d1a-a676-2ecc81bcca18} + {7164b269-e5fc-4922-8b47-791fd3e060c4} - {44ce7f91-0484-4921-b6b7-52842308dc44} + {53328768-6bdb-4f81-85bf-c2879db5c1fe} - {5b75c8e1-4b19-4bdb-a8da-0ee85c772344} + {abecec73-f5a6-4fd3-90d6-8dae862dd3f1} - {855c5194-1d8f-44f4-93f4-19e142493c05} + {29e7f5e0-01c9-4816-a579-e3766d125e71} + + + {c89c9a7a-a040-4e2f-849d-6ad21f0523ef} + + + {1628d9fe-0981-4d80-95e1-e05136b474f8} + + + {5f6106a8-f77a-4f0e-a99a-7c1f0c8532af} @@ -81,18 +90,42 @@ RSA\Header Files + + Certificate\Header Files + Certificate\Header Files CryptoCore\Header Files + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + CryptoCore\Header Files Digest\Header Files + + EC\Header Files + + + EC\Header Files + + + EC\Header Files + @@ -128,15 +161,39 @@ RSA\Source Files + + Certificate\Source Files + Certificate\Source Files + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + CryptoCore\Source Files Digest\Source Files + + EC\Source Files + + + EC\Source Files + + + EC\Source Files + diff --git a/Crypto/Crypto_vs110.vcxproj b/Crypto/Crypto_vs110.vcxproj index 6f09c2bc1..2049fb52e 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,14 @@ obj\Crypto\$(Configuration)\ + + xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +143,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 +155,18 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +180,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 +193,14 @@ + + xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +221,17 @@ + + xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +249,14 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +277,18 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -274,7 +303,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 @@ -290,10 +319,18 @@ + + + + + + + + @@ -307,14 +344,24 @@ + + + + + + + + + true true true + true true true diff --git a/Crypto/Crypto_vs110.vcxproj.filters b/Crypto/Crypto_vs110.vcxproj.filters index c1ba693d5..a9b823b41 100644 --- a/Crypto/Crypto_vs110.vcxproj.filters +++ b/Crypto/Crypto_vs110.vcxproj.filters @@ -2,49 +2,58 @@ - {7180e1e7-f8d9-4098-85e6-8f0e25a5f2ae} + {4fbc7688-5e88-4267-8a9f-088036458fc0} - {3329478c-3eee-4efa-921e-dc33abd0c8ac} + {8b96d623-60d5-4aca-bd5c-a8eb6bb85197} - {1491f39b-290c-483a-af10-39c8f3c1b8f0} + {bc455431-5b00-4c7c-9ba7-94ae74892bc1} - {4448fec3-5a6a-4a9a-b403-dd4aea9f5fbd} + {0cb94b84-9795-4bc2-912b-7aa6ec6ec519} - {976240fb-dd22-40aa-9985-c82e361a6045} + {db5804fd-f710-40e4-929c-ac069ca736c8} - {1e1b8265-5a56-4a67-973b-cacf5f5b7aa7} + {4cd4e1c7-7217-4be6-a8f5-4c261e904ece} - {35f35313-371e-4f3d-8fc6-29cc5fb9d5f6} + {0f97ea6d-b434-4e1e-93f8-6a90af79280f} - {a0afac60-127f-4faf-960f-b8701343f3b9} + {ff34ec09-cd95-4b9b-baaf-8d652c6f0df4} - {8334d7a1-be41-412e-8f57-162fe5a00de5} + {842af386-a77b-44b4-95ab-c14032b96a13} - {deb3127d-d211-4964-bbbe-df28cb245d4d} + {870a256f-1d0e-4e6d-bdbe-3713632c2f6d} - {3c255391-d9cf-46a6-9b03-82c187852b85} + {d3a1d991-9952-40d2-bbc9-81b486e9660e} - {8bdea7e4-c751-417f-b70f-a77b5d43e225} + {d929ca4e-aa0c-44a5-805a-80c703e914a8} - {d4d3c083-d6bb-4f63-ac1d-4b41d92f7648} + {c1001bb3-89d6-4d97-943f-251bc080fe3c} - {d4df8d98-263f-4ccf-b5f5-61b6c78cc5d5} + {d7577a29-b605-4532-8a8d-3ab64fe47a98} - {d02a12ff-1344-44bd-bcc3-a7d78826dbee} + {b3e0e465-588a-490e-b7ac-b34df6323ca3} + + + {8dfe53db-bba3-4013-bf72-09cafaaff86f} + + + {34456d4e-e859-487d-8912-f2d3ea5ee383} + + + {63d796b7-eb83-4513-be28-83d00f456921} @@ -81,18 +90,42 @@ RSA\Header Files + + Certificate\Header Files + Certificate\Header Files CryptoCore\Header Files + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + CryptoCore\Header Files Digest\Header Files + + EC\Header Files + + + EC\Header Files + + + EC\Header Files + @@ -128,15 +161,39 @@ RSA\Source Files + + Certificate\Source Files + Certificate\Source Files + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + CryptoCore\Source Files Digest\Source Files + + EC\Source Files + + + EC\Source Files + + + EC\Source Files + diff --git a/Crypto/Crypto_vs120.vcxproj b/Crypto/Crypto_vs120.vcxproj index b4e7aca64..e9ce65d8b 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,14 @@ obj\Crypto\$(Configuration)\ + + xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +143,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 +155,18 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +180,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 +193,14 @@ + + xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +221,17 @@ + + xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +249,14 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +277,18 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -274,7 +303,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 +313,24 @@ - - - + + + + + + + + + + + @@ -303,18 +340,28 @@ - - + + + + + + + + + + + true true true + true true true diff --git a/Crypto/Crypto_vs120.vcxproj.filters b/Crypto/Crypto_vs120.vcxproj.filters index d033e4180..a47390baf 100644 --- a/Crypto/Crypto_vs120.vcxproj.filters +++ b/Crypto/Crypto_vs120.vcxproj.filters @@ -2,49 +2,58 @@ - {5ae83f98-0b68-403d-8ce9-b5443d6cab4e} + {02fcb445-0828-4024-852e-0ea6b8ac886d} - {a686911a-ad67-48a4-a1ea-1ec79bdf1f47} + {e69fea72-a489-49dc-bb37-f76d6a929f76} - {6a543ff0-2b57-42f6-90c1-40dd0847171f} + {3134aa69-a377-4ec0-8e9b-3b0e0b3b4552} - {d5790207-151f-45c8-9658-e05578a0e5df} + {06dfda50-246a-48b3-b656-f7c084c60800} - {f5373b08-b9cd-4925-b894-23d23a4cd22e} + {c570c2a4-843b-4fde-8488-8b0711898dc7} - {68263161-1452-4b04-81f6-4db3ceb477f7} + {35ce0426-af20-41e2-af1c-dbebcde57303} - {81cd526b-d1f7-4ff7-bab3-4e6fa3037ea4} + {1b0a02de-2f65-4299-b806-7969581d99f8} - {87487a68-b26f-4343-8e01-4ed069b04a21} + {605e1ce8-f977-486a-b206-dee6b713207d} - {3958bf26-33d7-468c-9e4d-617c816aa107} + {1cdb7f25-fd23-4413-bfdd-2070a36c7232} - {aee2d403-7869-4e1a-9224-88158b62c6e2} + {57180401-5770-42aa-9d3c-b56e8c392e99} - {3d232344-7880-4e4c-83b0-daa97a4593d7} + {9152ddd3-5702-4f05-8088-252e172b1e63} - {cdc058d1-00ae-4180-a5f1-68521ae4bf6e} + {56951b10-2403-46a4-8262-b127d9e558b6} - {9e54bee8-542d-4f3e-8338-2c494cedd39d} + {1bdf1539-2e20-4039-bc8b-1a1e13f0b69d} - {f7370629-f891-4682-a902-89e362cce1af} + {546721ff-a71a-46b8-b34c-94726f130a66} - {cddde1df-5a57-4fe5-996d-274e1cd1b10b} + {48d6c418-2e80-4223-aea6-243482af7fba} + + + {0db58ba3-39aa-4e72-9896-d3dc8c071795} + + + {b4d0af45-38a7-4235-8e4b-dc14968635fc} + + + {fd98b162-8dc9-4cc4-94a1-f6ccbd0168a7} @@ -81,18 +90,42 @@ RSA\Header Files + + Certificate\Header Files + Certificate\Header Files CryptoCore\Header Files + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + CryptoCore\Header Files Digest\Header Files + + EC\Header Files + + + EC\Header Files + + + EC\Header Files + @@ -128,15 +161,39 @@ RSA\Source Files + + Certificate\Source Files + Certificate\Source Files + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + CryptoCore\Source Files Digest\Source Files + + EC\Source Files + + + EC\Source Files + + + EC\Source Files + diff --git a/Crypto/Crypto_vs140.vcxproj b/Crypto/Crypto_vs140.vcxproj index 19db61e9c..f7d2d733b 100644 --- a/Crypto/Crypto_vs140.vcxproj +++ b/Crypto/Crypto_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25123.0 PocoCryptod PocoCryptomdd PocoCryptomtd @@ -120,9 +120,14 @@ obj\Crypto\$(Configuration)\ + + xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +143,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 +155,18 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +180,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 +193,14 @@ + + xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +221,17 @@ + + xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +249,14 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +277,18 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -274,7 +303,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 @@ -285,10 +314,18 @@ + + + + + + + + @@ -301,10 +338,18 @@ + + + + + + + + @@ -313,8 +358,10 @@ + true true true + true true true diff --git a/Crypto/Crypto_vs140.vcxproj.filters b/Crypto/Crypto_vs140.vcxproj.filters index 4586bcd74..b9c4f169f 100644 --- a/Crypto/Crypto_vs140.vcxproj.filters +++ b/Crypto/Crypto_vs140.vcxproj.filters @@ -2,49 +2,58 @@ - {bd9664ce-31ea-49d5-85a5-cd0776e4541f} + {61a7bc27-adf9-4bc4-9059-4d86ac37e298} - {a223f936-d29c-4d2a-82dc-c1c1e75ced88} + {6280c266-93c5-4760-a66c-6e80fc5169b3} - {5c3e93ad-4512-44bd-b866-b5e94a1d68d2} + {a16a7973-740e-4a2c-a9b5-f7ac3938cc8b} - {8d7eb385-f916-4c29-8b38-6aafbad0b178} + {ed9d011e-0895-457c-b82d-363f083b4931} - {9c2144c9-ec28-4f1b-b519-0276d432d2b5} + {8c29253f-7bc7-4650-bcef-dcf1111aed5d} - {8edd2e53-9b97-4d89-8dd5-b7a8c41dc384} + {1677c90a-63df-4531-8fa0-c8fbfb6f9db5} - {ae2dbd33-6a8b-4dfa-aa44-6be79adb6863} + {f553b9ce-648f-4a7f-bc97-f579932ed84b} - {2ae23b06-d30a-4b04-b0a9-ffadd897ea3a} + {80b1c7ba-778b-426b-9b72-d673a2739b94} - {b97e1e38-144b-43c1-aa43-abe9a40a674d} + {726f1f0a-04ee-4569-bc5a-03f161818850} - {a39f3796-d1a4-48a9-80be-c766f096363c} + {61e7d1c1-7326-4b4d-af8b-3aa6c00e284f} - {3b3c3276-bb3a-4474-8aba-756b9d1d691f} + {5573d619-5663-44f3-88ee-421cba5c8099} - {171abb06-64ee-477e-a8cc-a99e8eb5a7cc} + {3ec6622d-8b9b-4d2a-9b3f-4172fbdc2093} - {a5264618-b0ca-4d1d-9d4b-e58077765679} + {9cdc8ee5-890a-445e-bca7-6a0a39d93818} - {773d0c8a-2fed-4052-a49c-62cd6ac5cfb1} + {c2a19b0d-9d2f-4b9a-8381-cb8f7f1f0ccd} - {89b20720-f10b-4e9d-b174-1aad90fbc24a} + {95ed2926-d4b3-4963-a972-5387ea33ec60} + + + {3a5b87b0-3703-45bf-b3fe-f52349a34785} + + + {2ccaea34-3fb4-40e1-b8c1-cbbe60b8856c} + + + {5676fb16-cf50-43aa-a88a-982c8f1b7f5b} @@ -81,18 +90,42 @@ RSA\Header Files + + Certificate\Header Files + Certificate\Header Files CryptoCore\Header Files + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + CryptoCore\Header Files Digest\Header Files + + EC\Header Files + + + EC\Header Files + + + EC\Header Files + @@ -128,15 +161,39 @@ RSA\Source Files + + Certificate\Source Files + Certificate\Source Files + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + CryptoCore\Source Files Digest\Source Files + + EC\Source Files + + + EC\Source Files + + + EC\Source Files + diff --git a/Crypto/Crypto_vs150.vcxproj b/Crypto/Crypto_vs150.vcxproj index 9f11e161b..57d6a7dc8 100644 --- a/Crypto/Crypto_vs150.vcxproj +++ b/Crypto/Crypto_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.26228.10 PocoCryptod PocoCryptomdd PocoCryptomtd @@ -120,9 +120,14 @@ obj\Crypto\$(Configuration)\ + + xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +143,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 +155,18 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +180,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 +193,14 @@ + + xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +221,17 @@ + + xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +249,14 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +277,18 @@ + + xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -274,7 +303,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 @@ -285,10 +314,18 @@ + + + + + + + + @@ -301,10 +338,18 @@ + + + + + + + + @@ -313,8 +358,10 @@ + true true true + true true true diff --git a/Crypto/Crypto_vs150.vcxproj.filters b/Crypto/Crypto_vs150.vcxproj.filters index 4586bcd74..f24fef168 100644 --- a/Crypto/Crypto_vs150.vcxproj.filters +++ b/Crypto/Crypto_vs150.vcxproj.filters @@ -2,49 +2,58 @@ - {bd9664ce-31ea-49d5-85a5-cd0776e4541f} + {eb5bbe82-8c72-45b0-ab97-decffbff67dc} - {a223f936-d29c-4d2a-82dc-c1c1e75ced88} + {a16e9b99-2ace-49cf-9164-8ab9f689dda5} - {5c3e93ad-4512-44bd-b866-b5e94a1d68d2} + {1ba12752-bee5-443e-b2fb-38218b0fd566} - {8d7eb385-f916-4c29-8b38-6aafbad0b178} + {2a6167ba-1558-416f-9fba-ee12602947a9} - {9c2144c9-ec28-4f1b-b519-0276d432d2b5} + {9f1ff060-96c7-4862-a105-3fe61ae5b19a} - {8edd2e53-9b97-4d89-8dd5-b7a8c41dc384} + {355e772b-1891-45c2-8b97-20078e37a6a9} - {ae2dbd33-6a8b-4dfa-aa44-6be79adb6863} + {6ba67cd7-7c15-4604-a96f-ed0d88c42a28} - {2ae23b06-d30a-4b04-b0a9-ffadd897ea3a} + {f5177bab-fc92-435d-a192-f740602f6af7} - {b97e1e38-144b-43c1-aa43-abe9a40a674d} + {03f04ceb-17d9-4a49-b02a-7bb916de73ec} - {a39f3796-d1a4-48a9-80be-c766f096363c} + {596a063b-67fa-4b24-9d91-17c77d1e903c} - {3b3c3276-bb3a-4474-8aba-756b9d1d691f} + {4880f8d3-3ec5-47c7-953f-342fc84a9533} - {171abb06-64ee-477e-a8cc-a99e8eb5a7cc} + {dd63ac66-9f22-4c59-93e6-7586ebad7f2f} - {a5264618-b0ca-4d1d-9d4b-e58077765679} + {bd739d2f-7b2c-49e4-bc33-84fa144a71d3} - {773d0c8a-2fed-4052-a49c-62cd6ac5cfb1} + {e0953c21-eebe-4e54-82cd-e5d0f1385899} - {89b20720-f10b-4e9d-b174-1aad90fbc24a} + {6b5abed4-da41-4d1c-8be5-5132453530ba} + + + {5006c57f-98e9-4109-8fbe-0d35b8621ac1} + + + {a9b1a415-b2a4-484e-9532-9b94568052ed} + + + {eba62bba-2622-48d1-a0cc-4d4c2b14f7ef} @@ -81,18 +90,42 @@ RSA\Header Files + + Certificate\Header Files + Certificate\Header Files CryptoCore\Header Files + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + CryptoCore\Header Files Digest\Header Files + + EC\Header Files + + + EC\Header Files + + + EC\Header Files + @@ -128,15 +161,39 @@ RSA\Source Files + + Certificate\Source Files + Certificate\Source Files + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + CryptoCore\Source Files Digest\Source Files + + EC\Source Files + + + EC\Source Files + + + EC\Source Files + diff --git a/Crypto/Crypto_x64_vs100.vcxproj b/Crypto/Crypto_x64_vs100.vcxproj index b9a261d02..aca013bc1 100644 --- a/Crypto/Crypto_x64_vs100.vcxproj +++ b/Crypto/Crypto_x64_vs100.vcxproj @@ -102,9 +102,14 @@ PocoCryptomt + + xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -122,7 +127,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 +140,18 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -157,7 +167,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 +181,14 @@ + + xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.pdb ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -196,13 +211,17 @@ + + xcopy /y ..\openssl\VS_120\win64\lib\release\*64MT.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -222,9 +241,14 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -247,13 +271,18 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -284,10 +313,18 @@ + + + + + + + + @@ -301,14 +338,24 @@ + + + + + + + + + true true true + true true true diff --git a/Crypto/Crypto_x64_vs100.vcxproj.filters b/Crypto/Crypto_x64_vs100.vcxproj.filters index a58e9cb23..e74409df8 100644 --- a/Crypto/Crypto_x64_vs100.vcxproj.filters +++ b/Crypto/Crypto_x64_vs100.vcxproj.filters @@ -2,49 +2,58 @@ - {41473f3a-cada-47de-be58-8011fe717c47} + {dfaeb0de-f7fd-4e2d-b9b5-637b346538a4} - {19e607e0-a163-46c8-81b4-27266a0a4faf} + {3287b871-2577-436a-894f-4b4202bdc396} - {4fe9d67a-cbbd-41ab-9d43-d084c6eae4ae} + {a4730690-6b69-421e-bd41-c7ed80e04b9a} - {e98a81e1-6f8e-46a4-9a03-1d426a5db4c7} + {5606789e-bfef-4e6b-ba5b-c7283f0c6dac} - {d130fbb6-1ba9-4640-b21e-c395efeb88ff} + {2ac8b366-3158-42f5-b5db-48a8d1639eaa} - {f3dcd92e-27ce-4ffc-8db1-823769d94e6e} + {a6634a3c-2c9a-428c-9551-dd98d2e7db14} - {750a7ed0-ca4b-460a-8356-8a9731ffc03a} + {9ed7d995-9e73-4340-8713-e5e608034c9f} - {c991ec62-51d9-4893-916a-7b4e4637f76d} + {34272cdc-a627-420f-9e0f-d60ef1ba502a} - {929a7175-814a-41b9-9db3-8339f8387980} + {01b1b99e-374a-4edb-a152-fe5b3eb5da9d} - {0350d7c1-2a11-4bf4-a040-ec0c72437b07} + {7317857e-f937-4046-8bec-cc9ae5d96b73} - {8be90aa4-1aea-4753-ac62-ea92a3899a61} + {18f928a1-053d-408e-b110-b05331790b08} - {8783ad17-d9dd-4e8b-8514-5509db84d960} + {c8501461-82c8-436d-9c91-3825cfc6538e} - {dad6c757-4c14-4684-8307-1c2f12bd64bb} + {fd0124b8-7243-47da-8d67-5e57583579cb} - {521a8698-9c5f-4491-b979-feb2b43540ea} + {eb400d4b-b682-4892-99f8-a567ec2a56b8} - {fa65b55f-f708-451f-87a0-8c6ce53abcc4} + {b0484812-36bd-4711-80ec-1b2a78911e15} + + + {bd7a5b72-ad52-4beb-a41c-1971ba7da648} + + + {811be083-ec4b-43f2-af30-1213341e6cc9} + + + {4694dc54-9f3d-431f-a260-ace6949a500a} @@ -81,18 +90,42 @@ RSA\Header Files + + Certificate\Header Files + Certificate\Header Files CryptoCore\Header Files + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + CryptoCore\Header Files Digest\Header Files + + EC\Header Files + + + EC\Header Files + + + EC\Header Files + @@ -128,15 +161,39 @@ RSA\Source Files + + Certificate\Source Files + Certificate\Source Files + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + CryptoCore\Source Files Digest\Source Files + + EC\Source Files + + + EC\Source Files + + + EC\Source Files + diff --git a/Crypto/Crypto_x64_vs110.vcxproj b/Crypto/Crypto_x64_vs110.vcxproj index cd6b9ff74..11c42f93a 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,14 @@ obj64\Crypto\$(Configuration)\ + + xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +143,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 +155,18 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +180,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 +193,14 @@ + + xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.pdb ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +221,17 @@ + + xcopy /y ..\openssl\VS_120\win64\lib\release\*64MT.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +249,14 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +277,18 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -288,10 +317,18 @@ + + + + + + + + @@ -305,14 +342,24 @@ + + + + + + + + + true true true + true true true diff --git a/Crypto/Crypto_x64_vs110.vcxproj.filters b/Crypto/Crypto_x64_vs110.vcxproj.filters index 3f1e4c7d8..c27790f54 100644 --- a/Crypto/Crypto_x64_vs110.vcxproj.filters +++ b/Crypto/Crypto_x64_vs110.vcxproj.filters @@ -2,49 +2,58 @@ - {b22e4ebe-200f-40e7-add9-f9b48a0a7df0} + {ec9a0cfe-e65a-41f5-a50b-2cfc5c7a229e} - {c9065ba7-1562-49fc-b013-9cacd6c4c207} + {189451cf-7056-4433-8e34-2a98c9617251} - {0c4951bd-731a-4b7c-8dbc-14ecd993e2f0} + {d213b27c-b121-413e-9749-72cf2d787e35} - {67e63db8-e2b5-4d74-94b0-6ba9d9f49d0c} + {4cb112da-f918-487d-9fc3-a9c786aab7c6} - {aee015d5-daf0-43a5-afd1-b24e0a3b6e47} + {4beb9598-9945-4474-b1a8-28bdaf2c7e08} - {cb91d4af-e801-4a18-ab9f-2a97f65e41ce} + {948c50c3-b53d-46b1-8836-76df471c89a8} - {04a39e73-60cd-4822-8704-e9bc43c56289} + {622d199d-5c29-4bae-9acf-974700a46a8f} - {b5032320-fbed-490a-9633-e0fda728df0f} + {615cbeb5-0e72-4ae9-b567-881a62d70bbd} - {04db063b-e811-41c9-8e23-feea65d2f0c1} + {256597f5-3d9c-47dd-ab2d-0c25610775bf} - {b86f6951-487b-4e30-853a-823ffb4b3043} + {d8ecd4e2-d09d-4be4-b18e-640d2198ca9b} - {43cbade1-51d1-4849-9110-853f70248774} + {e0bed99b-b3fb-4f2e-bc5f-d6b9d241ca54} - {6c52e2d0-25c4-427d-ae4f-55e1334a0ea8} + {d14b5c44-f2c5-4eac-aabf-c2027c971133} - {1fb87234-cd37-47da-9e5e-0c63ce2c17ee} + {fdd9860d-f1f2-4f44-aada-cf3ed13fbe2f} - {bc37e6bb-0d20-4810-be24-8f22d3481bdb} + {10821441-eac5-46ce-ab87-19048e92f736} - {91ff8a37-7e13-4614-aa41-e30c4b695743} + {3e5eb12f-6999-45eb-aa4e-41d2987ebd70} + + + {5c9bc82d-2188-4623-99f7-921b8f4eef84} + + + {e8cdd43a-19b1-482f-98f8-c7f794a35e11} + + + {b849724b-bfde-45b2-8995-66cd353071ef} @@ -81,18 +90,42 @@ RSA\Header Files + + Certificate\Header Files + Certificate\Header Files CryptoCore\Header Files + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + CryptoCore\Header Files Digest\Header Files + + EC\Header Files + + + EC\Header Files + + + EC\Header Files + @@ -128,15 +161,39 @@ RSA\Source Files + + Certificate\Source Files + Certificate\Source Files + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + CryptoCore\Source Files Digest\Source Files + + EC\Source Files + + + EC\Source Files + + + EC\Source Files + diff --git a/Crypto/Crypto_x64_vs120.vcxproj b/Crypto/Crypto_x64_vs120.vcxproj index 982ef63ed..85f43a4c2 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,14 @@ obj64\Crypto\$(Configuration)\ + + xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +143,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 +155,18 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +180,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 +193,14 @@ + + xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.pdb ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +221,17 @@ + + xcopy /y ..\openssl\VS_120\win64\lib\release\*64MT.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +249,14 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +277,18 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -282,16 +311,24 @@ - - - + + + + + + + + + + + @@ -301,18 +338,28 @@ - - + + + + + + + + + + + true true true + true true true diff --git a/Crypto/Crypto_x64_vs120.vcxproj.filters b/Crypto/Crypto_x64_vs120.vcxproj.filters index a8ec2b5eb..ea1bfddca 100644 --- a/Crypto/Crypto_x64_vs120.vcxproj.filters +++ b/Crypto/Crypto_x64_vs120.vcxproj.filters @@ -2,49 +2,58 @@ - {61f480eb-f537-4490-afa6-de43dad6f50c} + {b6cabe6a-8576-45ca-8e25-ef80aa689593} - {17966432-0ecb-4056-a1be-f10f552fda18} + {737a5dcd-871f-408e-a6d4-82ab7be01b19} - {cb319c84-df0e-4c1d-b686-645f7be90ca4} + {965a51b5-1204-4ab7-9780-f990e12419e8} - {912ba4b5-f1ca-45b1-93ba-e01eac37ff78} + {8f9431fe-a136-4a32-889d-513cae7a6086} - {8520e77e-d8ba-4d8f-bc8e-d67b3ff777db} + {f5b08d3c-3be5-4ad3-ad1c-ef3dbbacdba5} - {6d9e9a81-ca3a-46ed-8d6b-cf714a594b8d} + {5415df30-7b08-4cb8-9f75-ea5961a15c2d} - {196d1039-1490-4136-9652-705e2d9c5306} + {e41be478-c9b3-4605-8225-ec68ef4542bc} - {6e213a53-c061-42dc-9fb7-1bd0eb4d079d} + {fb51c51f-ad0c-48cf-945a-631b3f082742} - {72a1f7a0-22ac-4815-877f-bd9ad751b3b6} + {b1c3781a-b09f-4608-b92a-fabd4b63da21} - {d2321ab1-08c6-4ae5-84bf-7827c396e5c0} + {ea331bfd-43bb-4ac3-9749-d56364ddf1ee} - {bab4e84b-3c1c-4dee-8f6d-ce8b733b0f69} + {6428b0da-e195-4dc0-ae9f-447dd3abaeed} - {7cb4cbe0-8df6-4a7e-b2ff-82447f69b4c5} + {0e148532-51d7-4e13-95f6-7eb12d58d22d} - {fa17836c-1be4-4804-beb0-57e71a678321} + {7b769ec8-cea6-47cb-a0ff-d18b36b24cdb} - {a9c9c4ca-654b-4713-a948-f3fc8c0ebbda} + {b7533a24-cf25-421a-bc65-95ce25addedb} - {a773c1bc-f5c5-4b6f-b8a7-866977541ff2} + {eda08d61-e9fa-4eb0-8fa9-45bab1dda447} + + + {1ac2b893-d0fe-47c0-a0b4-566ccc4ce018} + + + {01d0ae1e-0280-455b-bebd-9f55a104353e} + + + {16a980d5-5f34-46e0-b3dc-3c2710fbbccd} @@ -81,18 +90,42 @@ RSA\Header Files + + Certificate\Header Files + Certificate\Header Files CryptoCore\Header Files + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + CryptoCore\Header Files Digest\Header Files + + EC\Header Files + + + EC\Header Files + + + EC\Header Files + @@ -128,15 +161,39 @@ RSA\Source Files + + Certificate\Source Files + Certificate\Source Files + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + CryptoCore\Source Files Digest\Source Files + + EC\Source Files + + + EC\Source Files + + + EC\Source Files + diff --git a/Crypto/Crypto_x64_vs140.vcxproj b/Crypto/Crypto_x64_vs140.vcxproj index dd43359f9..ee5713db5 100644 --- a/Crypto/Crypto_x64_vs140.vcxproj +++ b/Crypto/Crypto_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25123.0 PocoCrypto64d PocoCryptomdd PocoCryptomtd @@ -120,9 +120,14 @@ obj64\Crypto\$(Configuration)\ + + xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +143,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 +155,18 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +180,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 +193,14 @@ + + xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.pdb ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +221,17 @@ + + xcopy /y ..\openssl\VS_120\win64\lib\release\*64MT.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +249,14 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +277,18 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -283,10 +312,18 @@ + + + + + + + + @@ -299,10 +336,18 @@ + + + + + + + + @@ -311,8 +356,10 @@ + true true true + true true true diff --git a/Crypto/Crypto_x64_vs140.vcxproj.filters b/Crypto/Crypto_x64_vs140.vcxproj.filters index de986ee2c..ee28ce459 100644 --- a/Crypto/Crypto_x64_vs140.vcxproj.filters +++ b/Crypto/Crypto_x64_vs140.vcxproj.filters @@ -2,49 +2,58 @@ - {c37a808f-4e87-4e8b-a6b6-77320212182c} + {ff650bbf-a0b8-4116-8045-06f7b969693f} - {96888b37-5444-4852-8f12-897c1150f463} + {59567b15-1c58-404c-899c-d43cbe7f57bb} - {ba0dbffb-e592-4031-b832-d3317c38212c} + {9747af12-2d36-4a5f-b708-e576c7dcb774} - {6fc16cfc-bf90-49db-a2ae-11502d1d9e39} + {b3e1f05e-bbb0-4f82-872d-a72e761f406a} - {ca333ddc-f9a8-4cc7-8096-7ba86c827ad5} + {f5a9a149-3dcd-45b4-a640-e469b1141e7e} - {101994b0-fc9c-427f-ba87-31eae4a226bb} + {8b3a63f8-257d-4bf1-8c47-f214aea6d675} - {18159430-962d-49ac-b44c-6644b6ff0497} + {705dc855-7275-4572-a34e-59de5e2bb246} - {a6506375-5c8c-4dd2-bbd3-0ab84d76e756} + {b94796d4-5426-403d-b733-683ba25c6152} - {8f7af233-72f6-4c80-bd82-c3b7ed70a746} + {b48bc78c-8233-4aa3-81aa-27a322ccf2f4} - {4a33808e-d203-4ada-bf30-bbb297b1070e} + {f06ec594-a032-4c51-83b7-0ca13201858f} - {295bcebe-1e14-40c8-8733-8cb4fb19a1f9} + {760ab1ff-7ede-4a7c-94fb-c88822aa9e08} - {c104ca0a-f966-40cf-90a4-ff742cdbcfc7} + {3cda2765-2000-4d74-b475-e7157d1da62c} - {0020cf02-2513-419f-acaa-779bbd2f6cec} + {f6e439a4-ac60-4a51-a40f-3f8e33e6ccc1} - {511652fd-2799-47ca-bfd8-ec6395b7182a} + {b454f78b-9878-4fd2-ae8f-29c4030acf46} - {67fffcbd-e839-4a04-b89b-a3aa0d00c4f3} + {4c8960ed-69b1-4fef-bd3c-3910fb27c9cf} + + + {50acab45-70a3-4143-b1b7-2f5f1692bb01} + + + {b58e0819-3a76-45a3-ae15-1c732748c80a} + + + {4359db01-00c3-4751-aecb-135899103444} @@ -81,18 +90,42 @@ RSA\Header Files + + Certificate\Header Files + Certificate\Header Files CryptoCore\Header Files + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + CryptoCore\Header Files Digest\Header Files + + EC\Header Files + + + EC\Header Files + + + EC\Header Files + @@ -128,15 +161,39 @@ RSA\Source Files + + Certificate\Source Files + Certificate\Source Files + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + CryptoCore\Source Files Digest\Source Files + + EC\Source Files + + + EC\Source Files + + + EC\Source Files + diff --git a/Crypto/Crypto_x64_vs150.vcxproj b/Crypto/Crypto_x64_vs150.vcxproj index 50baf5013..ff3836ecf 100644 --- a/Crypto/Crypto_x64_vs150.vcxproj +++ b/Crypto/Crypto_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.26228.10 PocoCrypto64d PocoCryptomdd PocoCryptomtd @@ -120,9 +120,14 @@ obj64\Crypto\$(Configuration)\ + + xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true true @@ -138,7 +143,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 +155,18 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -170,7 +180,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 +193,14 @@ + + xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.pdb ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,13 +221,17 @@ + + xcopy /y ..\openssl\VS_120\win64\lib\release\*64MT.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,9 +249,14 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -253,13 +277,18 @@ + + xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul +xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul +exit 0 + MaxSpeed OnlyExplicitInline true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;..\openssl\VS_120\include;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -283,10 +312,18 @@ + + + + + + + + @@ -299,10 +336,18 @@ + + + + + + + + @@ -311,8 +356,10 @@ + true true true + true true true diff --git a/Crypto/Crypto_x64_vs150.vcxproj.filters b/Crypto/Crypto_x64_vs150.vcxproj.filters index de986ee2c..3fa8971a7 100644 --- a/Crypto/Crypto_x64_vs150.vcxproj.filters +++ b/Crypto/Crypto_x64_vs150.vcxproj.filters @@ -2,49 +2,58 @@ - {c37a808f-4e87-4e8b-a6b6-77320212182c} + {1222cedf-f4ee-4001-af94-690fa42a87bc} - {96888b37-5444-4852-8f12-897c1150f463} + {6b0feebf-7b2b-4f82-a427-7d018ebe268e} - {ba0dbffb-e592-4031-b832-d3317c38212c} + {11d6fe46-de05-46a9-a5c0-b70678de992d} - {6fc16cfc-bf90-49db-a2ae-11502d1d9e39} + {a93857e5-024a-45ed-b52e-70e4fb2fb040} - {ca333ddc-f9a8-4cc7-8096-7ba86c827ad5} + {ac06fb32-1250-4203-9821-415bac0dbab1} - {101994b0-fc9c-427f-ba87-31eae4a226bb} + {f00950fa-f3a7-4c24-9f5f-81c4f3ed69c6} - {18159430-962d-49ac-b44c-6644b6ff0497} + {5396fdf2-9d10-4752-836e-5b151c4c7264} - {a6506375-5c8c-4dd2-bbd3-0ab84d76e756} + {c04fac79-3b1d-46a1-9329-bdc228717be1} - {8f7af233-72f6-4c80-bd82-c3b7ed70a746} + {61b42b6c-07f4-4301-a1e9-e4a980d7a81c} - {4a33808e-d203-4ada-bf30-bbb297b1070e} + {c1105e92-2936-4855-8f46-f0c4c4d538d7} - {295bcebe-1e14-40c8-8733-8cb4fb19a1f9} + {81dbd9fc-5456-4187-957c-6183744aa35e} - {c104ca0a-f966-40cf-90a4-ff742cdbcfc7} + {2c95a82d-8c4a-4ad1-abd7-e72405da7eae} - {0020cf02-2513-419f-acaa-779bbd2f6cec} + {2c7ed289-5aee-4bfc-91ad-5420ac600db0} - {511652fd-2799-47ca-bfd8-ec6395b7182a} + {e6eed7e4-157d-4c67-805d-99ee70c2e937} - {67fffcbd-e839-4a04-b89b-a3aa0d00c4f3} + {9d8b88ea-7e7b-4819-8e54-287a943393c2} + + + {156f025e-b02e-4a42-9219-75b947d1f8c2} + + + {b00dcc0a-1ca7-4bbe-8d75-8eb68a614846} + + + {b69b2001-6d8c-4bf1-8904-b06e940afd53} @@ -81,18 +90,42 @@ RSA\Header Files + + Certificate\Header Files + Certificate\Header Files CryptoCore\Header Files + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + + + CryptoCore\Header Files + CryptoCore\Header Files Digest\Header Files + + EC\Header Files + + + EC\Header Files + + + EC\Header Files + @@ -128,15 +161,39 @@ RSA\Source Files + + Certificate\Source Files + Certificate\Source Files + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + + + CryptoCore\Source Files + CryptoCore\Source Files Digest\Source Files + + EC\Source Files + + + EC\Source Files + + + EC\Source Files + diff --git a/Crypto/Crypto_x64_vs90.vcproj b/Crypto/Crypto_x64_vs90.vcproj index 8c129ee5c..730f0ea2d 100644 --- a/Crypto/Crypto_x64_vs90.vcproj +++ b/Crypto/Crypto_x64_vs90.vcproj @@ -19,7 +19,8 @@ ConfigurationType="2" CharacterSet="2"> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.pdb ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win64\lib\release\*64MT.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + Name="VCPreBuildEventTool" + CommandLine="xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin${vc.project.platform.bindir.suffix}\* 1>nul xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib${vc.project.platform.bindir.suffix}\* 1>nul exit 0"/> + + @@ -474,11 +484,27 @@ Name="Header Files"> + + + + + + + + @@ -496,15 +522,38 @@ RelativePath=".\src\DigestEngine.cpp"/> + + + + + + + + + + + + + Name="debug_shared|x64" + ExcludedFromBuild="true"> + Name="release_shared|x64" + ExcludedFromBuild="true"> diff --git a/Crypto/include/Poco/Crypto/Crypto.h b/Crypto/include/Poco/Crypto/Crypto.h index d3fadb539..aa9046465 100644 --- a/Crypto/include/Poco/Crypto/Crypto.h +++ b/Crypto/include/Poco/Crypto/Crypto.h @@ -55,14 +55,21 @@ enum RSAPaddingMode // from a DLL simpler. All files within this DLL are compiled with the Crypto_EXPORTS // symbol defined on the command line. this symbol should not be defined on any project // that uses this DLL. This way any other project whose source files include this file see -// Crypto_API functions as being imported from a DLL, wheras this DLL sees symbols +// Crypto_API functions as being imported from a DLL, whereas this DLL sees symbols // defined with this macro as being exported. // -#if defined(_WIN32) && defined(POCO_DLL) - #if defined(Crypto_EXPORTS) - #define Crypto_API __declspec(dllexport) +#if defined(_WIN32) + #if defined(POCO_DLL) + #if defined(Crypto_EXPORTS) + #define Crypto_API __declspec(dllexport) + #else + #define Crypto_API __declspec(dllimport) + #endif #else - #define Crypto_API __declspec(dllimport) + #if (POCO_MSVS_VERSION >= 2015) // needed for OpenSSL + #pragma comment(lib, "legacy_stdio_definitions.lib") + #pragma comment(lib, "legacy_stdio_wide_specifiers.lib") + #endif #endif #endif @@ -77,12 +84,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(POCO_EXTERNAL_OPENSSL) + #if defined (_DLL) + #pragma comment(lib, "libeay" POCO_PLATFORM_BITS "MD" POCO_DEBUG_POSTFIX ".lib") + #pragma comment(lib, "ssleay" POCO_PLATFORM_BITS "MD" POCO_DEBUG_POSTFIX ".lib") + #else + #pragma comment(lib, "libeay" POCO_PLATFORM_BITS "MT" POCO_DEBUG_POSTFIX ".lib") + #pragma comment(lib, "ssleay" POCO_PLATFORM_BITS "MT" POCO_DEBUG_POSTFIX ".lib") + #endif + #endif // POCO_EXTERNAL_OPENSSL + #if !defined(Crypto_EXPORTS) + #pragma comment(lib, "PocoCrypto" POCO_LIB_SUFFIX) + #endif + #endif // POCO_NO_AUTOMATIC_LIBS #endif diff --git a/Crypto/include/Poco/Crypto/CryptoException.h b/Crypto/include/Poco/Crypto/CryptoException.h new file mode 100644 index 000000000..0373d1e45 --- /dev/null +++ b/Crypto/include/Poco/Crypto/CryptoException.h @@ -0,0 +1,57 @@ +// +// CryptoException.h +// +// +// Library: Crypto +// Package: Crypto +// Module: CryptoException +// +// Definition of the CryptoException class. +// +// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#ifndef Crypto_CryptoException_INCLUDED +#define Crypto_CryptoException_INCLUDED + + +#include "Poco/Crypto/Crypto.h" +#include "Poco/Exception.h" +#include + + +namespace Poco { +namespace Crypto { + + +POCO_DECLARE_EXCEPTION(Crypto_API, CryptoException, Poco::Exception) + + +class OpenSSLException : public CryptoException +{ +public: + OpenSSLException(int code = 0); + OpenSSLException(const std::string& msg, int code = 0); + OpenSSLException(const std::string& msg, const std::string& arg, int code = 0); + OpenSSLException(const std::string& msg, const Poco::Exception& exc, int code = 0); + OpenSSLException(const OpenSSLException& exc); + ~OpenSSLException() throw(); + OpenSSLException& operator = (const OpenSSLException& exc); + const char* name() const throw(); + const char* className() const throw(); + Poco::Exception* clone() const; + void rethrow() const; + +private: + void setExtMessage(); +}; + + +} } // namespace Poco::Crypto + + +#endif // Crypto_CryptoException_INCLUDED diff --git a/Crypto/include/Poco/Crypto/ECDSADigestEngine.h b/Crypto/include/Poco/Crypto/ECDSADigestEngine.h new file mode 100644 index 000000000..ed6fab442 --- /dev/null +++ b/Crypto/include/Poco/Crypto/ECDSADigestEngine.h @@ -0,0 +1,101 @@ +// +// ECDSADigestEngine.h +// +// +// Library: Crypto +// Package: ECDSA +// Module: ECDSADigestEngine +// +// Definition of the ECDSADigestEngine class. +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#ifndef Crypto_ECDSADigestEngine_INCLUDED +#define Crypto_ECDSADigestEngine_INCLUDED + + +#include "Poco/Crypto/Crypto.h" +#include "Poco/Crypto/ECKey.h" +#include "Poco/DigestEngine.h" +#include "Poco/Crypto/DigestEngine.h" +#include +#include + + +namespace Poco { +namespace Crypto { + + +class Crypto_API ECDSADigestEngine: public Poco::DigestEngine + /// This class implements a Poco::DigestEngine that can be + /// used to compute a secure digital signature. + /// + /// First another Poco::Crypto::DigestEngine is created and + /// used to compute a cryptographic hash of the data to be + /// signed. Then, the hash value is encrypted, using + /// the ECDSA private key. + /// + /// To verify a signature, pass it to the verify() + /// member function. It will decrypt the signature + /// using the ECDSA public key and compare the resulting + /// hash with the actual hash of the data. +{ +public: + + ECDSADigestEngine(const ECKey& key, const std::string &name); + /// Creates the ECDSADigestEngine with the given ECDSA key, + /// using the hash algorithm with the given name + /// (e.g., "SHA1", "SHA256", "SHA512", etc.). + /// See the OpenSSL documentation for a list of supported digest algorithms. + /// + /// Throws a Poco::NotFoundException if no algorithm with the given name exists. + + ~ECDSADigestEngine(); + /// Destroys the ECDSADigestEngine. + + std::size_t digestLength() const; + /// Returns the length of the digest in bytes. + + void reset(); + /// Resets the engine so that a new + /// digest can be computed. + + const DigestEngine::Digest& digest(); + /// Finishes the computation of the digest + /// (the first time it's called) and + /// returns the message digest. + /// + /// Can be called multiple times. + + const DigestEngine::Digest& signature(); + /// Signs the digest using the ECDSADSA algorithm + /// and the private key (the first time it's + /// called) and returns the result. + /// + /// Can be called multiple times. + + bool verify(const DigestEngine::Digest& signature); + /// Verifies the data against the signature. + /// + /// Returns true if the signature can be verified, false otherwise. + +protected: + void updateImpl(const void* data, std::size_t length); + +private: + ECKey _key; + Poco::Crypto::DigestEngine _engine; + Poco::DigestEngine::Digest _digest; + Poco::DigestEngine::Digest _signature; +}; + + +} } // namespace Poco::Crypto + + +#endif // Crypto_ECDSADigestEngine_INCLUDED diff --git a/Crypto/include/Poco/Crypto/ECKey.h b/Crypto/include/Poco/Crypto/ECKey.h new file mode 100644 index 000000000..921998447 --- /dev/null +++ b/Crypto/include/Poco/Crypto/ECKey.h @@ -0,0 +1,99 @@ +// +// ECKey.h +// +// +// Library: Crypto +// Package: EC +// Module: ECKey +// +// Definition of the ECKey class. +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#ifndef Crypto_ECKey_INCLUDED +#define Crypto_ECKey_INCLUDED + + +#include "Poco/Crypto/Crypto.h" +#include "Poco/Crypto/KeyPair.h" +#include "Poco/Crypto/ECKeyImpl.h" + + +namespace Poco { +namespace Crypto { + + +class X509Certificate; +class PKCS12Container; + + +class Crypto_API ECKey : public KeyPair + /// This class stores an EC key pair, consisting + /// of private and public key. Storage of the private + /// key is optional. + /// + /// If a private key is available, the ECKey can be + /// used for decrypting data (encrypted with the public key) + /// or computing secure digital signatures. +{ +public: + ECKey(const EVPPKey& key); + /// Constructs ECKeyImpl by extracting the EC key. + + ECKey(const X509Certificate& cert); + /// Extracts the EC public key from the given certificate. + + ECKey(const PKCS12Container& cert); + /// Extracts the EC private key from the given certificate. + + ECKey(const std::string& eccGroup); + /// Creates the ECKey. Creates a new public/private keypair using the given parameters. + /// Can be used to sign data and verify signatures. + + ECKey(const std::string& publicKeyFile, const std::string& privateKeyFile, const std::string& privateKeyPassphrase = ""); + /// Creates the ECKey, by reading public and private key from the given files and + /// using the given passphrase for the private key. + /// + /// Cannot be used for signing or decryption unless a private key is available. + /// + /// If a private key is specified, you don't need to specify a public key file. + /// OpenSSL will auto-create the public key from the private key. + + ECKey(std::istream* pPublicKeyStream, std::istream* pPrivateKeyStream = 0, const std::string& privateKeyPassphrase = ""); + /// Creates the ECKey, by reading public and private key from the given streams and + /// using the given passphrase for the private key. + /// + /// Cannot be used for signing or decryption unless a private key is available. + /// + /// If a private key is specified, you don't need to specify a public key file. + /// OpenSSL will auto-create the public key from the private key. + + ~ECKey(); + /// Destroys the ECKey. + + ECKeyImpl::Ptr impl() const; + /// Returns the impl object. + +private: + ECKeyImpl::Ptr _pImpl; +}; + + +// +// inlines +// +inline ECKeyImpl::Ptr ECKey::impl() const +{ + return _pImpl; +} + + +} } // namespace Poco::Crypto + + +#endif // Crypto_ECKey_INCLUDED diff --git a/Crypto/include/Poco/Crypto/ECKeyImpl.h b/Crypto/include/Poco/Crypto/ECKeyImpl.h new file mode 100644 index 000000000..bf418f363 --- /dev/null +++ b/Crypto/include/Poco/Crypto/ECKeyImpl.h @@ -0,0 +1,137 @@ +// +// ECKeyImpl.h +// +// +// Library: Crypto +// Package: EC +// Module: ECKeyImpl +// +// Definition of the ECKeyImpl class. +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#ifndef Crypto_ECKeyImplImpl_INCLUDED +#define Crypto_ECKeyImplImpl_INCLUDED + + +#include "Poco/Crypto/Crypto.h" +#include "Poco/Crypto/EVPPKey.h" +#include "Poco/Crypto/KeyPairImpl.h" +#include "Poco/Crypto/OpenSSLInitializer.h" +#include "Poco/RefCountedObject.h" +#include "Poco/AutoPtr.h" +#include +#include +#include +#include +#include +#include + + +namespace Poco { +namespace Crypto { + + +class X509Certificate; +class PKCS12Container; + + +class ECKeyImpl: public KeyPairImpl + /// Elliptic Curve key clas implementation. +{ +public: + typedef Poco::AutoPtr Ptr; + typedef std::vector ByteVec; + + ECKeyImpl(const EVPPKey& key); + /// Constructs ECKeyImpl by extracting the EC key. + + ECKeyImpl(const X509Certificate& cert); + /// Constructs ECKeyImpl by extracting the EC public key from the given certificate. + + ECKeyImpl(const PKCS12Container& cert); + /// Constructs ECKeyImpl by extracting the EC private key from the given certificate. + + ECKeyImpl(int eccGroup); + /// Creates the ECKey of the specified group. Creates a new public/private keypair using the given parameters. + /// Can be used to sign data and verify signatures. + + ECKeyImpl(const std::string& publicKeyFile, const std::string& privateKeyFile, const std::string& privateKeyPassphrase); + /// Creates the ECKey, by reading public and private key from the given files and + /// using the given passphrase for the private key. Can only by used for signing if + /// a private key is available. + + ECKeyImpl(std::istream* pPublicKeyStream, std::istream* pPrivateKeyStream, const std::string& privateKeyPassphrase); + /// Creates the ECKey. Can only by used for signing if pPrivKey + /// is not null. If a private key file is specified, you don't need to + /// specify a public key file. OpenSSL will auto-create it from the private key. + + ~ECKeyImpl(); + /// Destroys the ECKeyImpl. + + EC_KEY* getECKey(); + /// Returns the OpenSSL EC key. + + const EC_KEY* getECKey() const; + /// Returns the OpenSSL EC key. + + int size() const; + /// Returns the EC key length in bits. + + int groupId() const; + /// Returns the EC key group integer Id. + + std::string groupName() const; + /// Returns the EC key group name. + + void save(const std::string& publicKeyFile, const std::string& privateKeyFile = "", const std::string& privateKeyPassphrase = ""); + /// Exports the public and private keys to the given files. + /// + /// If an empty filename is specified, the corresponding key + /// is not exported. + + void save(std::ostream* pPublicKeyStream, std::ostream* pPrivateKeyStream = 0, const std::string& privateKeyPassphrase = ""); + /// Exports the public and private key to the given streams. + /// + /// If a null pointer is passed for a stream, the corresponding + /// key is not exported. + +private: + typedef EVP_PKEY* (*PEM_read_bio_Key_fn)(BIO*, EVP_PKEY**, pem_password_cb*, void*); + typedef EVP_PKEY* (*PEM_read_Key_fn)(FILE*, EVP_PKEY**, pem_password_cb*, void*); + + static int passCB(char* buf, int size, int, void* pass); + bool loadKey(PEM_read_Key_fn func, const std::string& keyFile, const std::string& pass = ""); + bool loadKey(PEM_read_bio_Key_fn func, std::istream* pKeyStream, const std::string& pass = ""); + void freeEC(); + + static ByteVec convertToByteVec(const BIGNUM* bn); + + EC_KEY* _pEC; +}; + + +// +// inlines +// +inline EC_KEY* ECKeyImpl::getECKey() +{ + return _pEC; +} + + +inline const EC_KEY* ECKeyImpl::getECKey() const +{ + return _pEC; +} + + +} } // namespace Poco::Crypto + + +#endif // Crypto_ECKeyImplImpl_INCLUDED diff --git a/Crypto/include/Poco/Crypto/EVPPKey.h b/Crypto/include/Poco/Crypto/EVPPKey.h new file mode 100644 index 000000000..c9fc7ee44 --- /dev/null +++ b/Crypto/include/Poco/Crypto/EVPPKey.h @@ -0,0 +1,143 @@ +// +// EVPPKey.h +// +// +// Library: Crypto +// Package: CryptoCore +// Module: EVPPKey +// +// Definition of the EVPPKey class. +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#ifndef Crypto_EVPPKeyImpl_INCLUDED +#define Crypto_EVPPKeyImpl_INCLUDED + + +#include "Poco/Crypto/Crypto.h" +#include "Poco/Crypto/CryptoException.h" +#include +#include +#include + + +namespace Poco { +namespace Crypto { + + +class Crypto_API EVPPKey + /// Utility class for conversion of native keys to EVP. + /// Currently, only RSA and EC keys are supported. +{ +public: + explicit EVPPKey(const std::string& ecCurveName); + /// Constructs EVPPKey from ECC curve name. + /// + /// Only EC keys can be wrapped by an EVPPKey + /// created using this constructor. + + explicit EVPPKey(const char* ecCurveName); + /// Constructs EVPPKey from ECC curve name. + /// + /// Only EC keys can be wrapped by an EVPPKey + /// created using this constructor. + + explicit EVPPKey(EVP_PKEY* pEVPPKey); + /// Constructs EVPPKey from EVP_PKEY pointer. + /// The content behind the supplied pointer is internally duplicated. + + template + explicit EVPPKey(K* pKey): _pEVPPKey(EVP_PKEY_new()) + /// Constructs EVPPKey from a "native" key pointer. + { + if (!_pEVPPKey) throw OpenSSLException(); + setKey(pKey); + } + + EVPPKey(const EVPPKey& other); + /// Copy constructor. + + EVPPKey& operator=(const EVPPKey& other); + /// Assignment operator. + +#ifdef POCO_ENABLE_CPP11 + EVPPKey(EVPPKey&& other); + /// Move constructor. + + EVPPKey& operator=(EVPPKey&& other); + /// Assignment move operator. +#endif // POCO_ENABLE_CPP11 + + ~EVPPKey(); + /// Destroys the EVPPKey. + + int type() const; + /// Retuns the EVPPKey type NID. + + operator const EVP_PKEY*() const; + /// Returns const pointer to the EVP_PKEY structure. + + operator EVP_PKEY*(); + /// Returns pointer to the EVP_PKEY structure. + +private: + EVPPKey(); + + void newECKey(const char* group); + + void duplicate(EVP_PKEY* pEVPPKey); + void setKey(EC_KEY* pKey); + void setKey(RSA* pKey); + + EVP_PKEY* _pEVPPKey; +}; + +// +// inlines +// + +inline int EVPPKey::type() const +{ + if (!_pEVPPKey) return NID_undef; + + return EVP_PKEY_type(_pEVPPKey->type); +} + + +inline EVPPKey::operator const EVP_PKEY*() const + /// Returns const pointer to the EVP_PKEY structure. +{ + return _pEVPPKey; +} + + +inline EVPPKey::operator EVP_PKEY*() + /// Returns pointer to the EVP_PKEY structure. +{ + return _pEVPPKey; +} + + +inline void EVPPKey::setKey(EC_KEY* pKey) +{ + if (!EVP_PKEY_set1_EC_KEY(_pEVPPKey, pKey)) + throw OpenSSLException(); +} + + +inline void EVPPKey::setKey(RSA* pKey) +{ + if (!EVP_PKEY_set1_RSA(_pEVPPKey, pKey)) + throw OpenSSLException(); +} + + +} } // namespace Poco::Crypto + + +#endif // Crypto_EVPPKeyImpl_INCLUDED diff --git a/Crypto/include/Poco/Crypto/KeyPair.h b/Crypto/include/Poco/Crypto/KeyPair.h new file mode 100644 index 000000000..aa0f35b2c --- /dev/null +++ b/Crypto/include/Poco/Crypto/KeyPair.h @@ -0,0 +1,119 @@ +// +// KeyPair.h +// +// +// Library: Crypto +// Package: CryptoCore +// Module: KeyPair +// +// Definition of the KeyPair class. +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#ifndef Crypto_KeyPair_INCLUDED +#define Crypto_KeyPair_INCLUDED + + +#include "Poco/Crypto/Crypto.h" +#include "Poco/Crypto/KeyPairImpl.h" + + +namespace Poco { +namespace Crypto { + + +class X509Certificate; + + +class Crypto_API KeyPair + /// This is a parent class for classes storing a key pair, consisting + /// of private and public key. Storage of the private key is optional. + /// + /// If a private key is available, the KeyPair can be + /// used for decrypting data (encrypted with the public key) + /// or computing secure digital signatures. +{ +public: + enum Type + { + KT_RSA = KeyPairImpl::KT_RSA_IMPL, + KT_EC = KeyPairImpl::KT_EC_IMPL + }; + + explicit KeyPair(KeyPairImpl::Ptr pKeyPairImpl = 0); + /// Extracts the RSA public key from the given certificate. + + virtual ~KeyPair(); + /// Destroys the KeyPair. + + virtual int size() const; + /// Returns the RSA modulus size. + + virtual void save(const std::string& publicKeyPairFile, const std::string& privateKeyPairFile = "", const std::string& privateKeyPairPassphrase = ""); + /// Exports the public and private keys to the given files. + /// + /// If an empty filename is specified, the corresponding key + /// is not exported. + + virtual void save(std::ostream* pPublicKeyPairStream, std::ostream* pPrivateKeyPairStream = 0, const std::string& privateKeyPairPassphrase = ""); + /// Exports the public and private key to the given streams. + /// + /// If a null pointer is passed for a stream, the corresponding + /// key is not exported. + + KeyPairImpl::Ptr impl() const; + /// Returns the impl object. + + const std::string& name() const; + /// Returns key pair name + + Type type() const; + /// Returns key pair type + +private: + KeyPairImpl::Ptr _pImpl; +}; + + +// +// inlines +// + +inline int KeyPair::size() const +{ + return _pImpl->size(); +} + + +inline void KeyPair::save(const std::string& publicKeyFile, const std::string& privateKeyFile, const std::string& privateKeyPassphrase) +{ + _pImpl->save(publicKeyFile, privateKeyFile, privateKeyPassphrase); +} + + +inline void KeyPair::save(std::ostream* pPublicKeyStream, std::ostream* pPrivateKeyStream, const std::string& privateKeyPassphrase) +{ + _pImpl->save(pPublicKeyStream, pPrivateKeyStream, privateKeyPassphrase); +} + + +inline const std::string& KeyPair::name() const +{ + return _pImpl->name(); +} + +inline KeyPairImpl::Ptr KeyPair::impl() const +{ + return _pImpl; +} + + +} } // namespace Poco::Crypto + + +#endif // Crypto_KeyPair_INCLUDED diff --git a/Crypto/include/Poco/Crypto/KeyPairImpl.h b/Crypto/include/Poco/Crypto/KeyPairImpl.h new file mode 100644 index 000000000..b8d017e60 --- /dev/null +++ b/Crypto/include/Poco/Crypto/KeyPairImpl.h @@ -0,0 +1,103 @@ +// +// KeyPairImpl.h +// +// +// Library: Crypto +// Package: CryptoCore +// Module: KeyPairImpl +// +// Definition of the KeyPairImpl class. +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#ifndef Crypto_KeyPairImplImpl_INCLUDED +#define Crypto_KeyPairImplImpl_INCLUDED + + +#include "Poco/Crypto/Crypto.h" +#include "Poco/Crypto/OpenSSLInitializer.h" +#include "Poco/RefCountedObject.h" +#include "Poco/AutoPtr.h" +#include +#include + + +namespace Poco { +namespace Crypto { + + +class KeyPairImpl: public Poco::RefCountedObject + /// Class KeyPairImpl +{ +public: + enum Type + { + KT_RSA_IMPL = 0, + KT_EC_IMPL + }; + + typedef Poco::AutoPtr Ptr; + typedef std::vector ByteVec; + + KeyPairImpl(const std::string& name, Type type); + /// Create KeyPairImpl with specified type and name. + + virtual ~KeyPairImpl(); + /// Destroys the KeyPairImpl. + + virtual int size() const = 0; + /// Returns the key size. + + virtual void save(const std::string& publicKeyFile, const std::string& privateKeyFile = "", const std::string& privateKeyPassphrase = "") = 0; + /// Exports the public and private keys to the given files. + /// + /// If an empty filename is specified, the corresponding key + /// is not exported. + + virtual void save(std::ostream* pPublicKeyStream, std::ostream* pPrivateKeyStream = 0, const std::string& privateKeyPassphrase = "") = 0; + /// Exports the public and private key to the given streams. + /// + /// If a null pointer is passed for a stream, the corresponding + /// key is not exported. + + const std::string& name() const; + /// Returns key pair name + + Type type() const; + /// Returns key pair type + +private: + KeyPairImpl(); + + std::string _name; + Type _type; + OpenSSLInitializer _openSSLInitializer; +}; + + +// +// inlines +// + + +inline const std::string& KeyPairImpl::name() const +{ + return _name; +} + + +inline KeyPairImpl::Type KeyPairImpl::type() const +{ + return _type; +} + + +} } // namespace Poco::Crypto + + +#endif // Crypto_KeyPairImplImpl_INCLUDED diff --git a/Crypto/include/Poco/Crypto/PKCS12Container.h b/Crypto/include/Poco/Crypto/PKCS12Container.h new file mode 100644 index 000000000..175817bbe --- /dev/null +++ b/Crypto/include/Poco/Crypto/PKCS12Container.h @@ -0,0 +1,139 @@ +// +// PKCS12Container.h +// +// $Id: //poco/1.4/Crypto/include/Poco/Crypto/PKCS12Container.h#2 $ +// +// Library: Crypto +// Package: Certificate +// Module: PKCS12Container +// +// Definition of the PKCS12Container class. +// +// Copyright (c) 2006-2009, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#ifndef Crypto_PKCS12Container_INCLUDED +#define Crypto_PKCS12Container_INCLUDED + + +#include "Poco/Crypto/Crypto.h" +#include "Poco/Crypto/OpenSSLInitializer.h" +#include "Poco/Crypto/X509Certificate.h" +#include "Poco/Crypto/EVPPKey.h" +#include "Poco/Path.h" +#include +#include +#include + + +namespace Poco { +namespace Crypto { + + +class Crypto_API PKCS12Container + /// This class implements PKCS#12 container functionality. +{ +public: + typedef std::vector CAList; + + explicit PKCS12Container(std::istream& istr, const std::string& password = ""); + /// Creates the PKCS12Container object from a stream. + + explicit PKCS12Container(const std::string& str, const std::string& password = ""); + /// Creates the PKCS12Container object from a string. + + PKCS12Container(const PKCS12Container& cert); + /// Copy constructor. + + PKCS12Container& operator = (const PKCS12Container& cert); + /// Assignment operator. + + ~PKCS12Container(); + /// Destroys the PKCS12Container. + + bool hasKey() const; + /// Returns true if container contains the key. + + EVPPKey getKey() const; + /// Return key as openssl EVP_PKEY wrapper object. + + bool hasX509Certificate() const; + /// Returns true if container has X509 certificate. + + const X509Certificate& getX509Certificate() const; + /// Returns the X509 certificate. + /// Throws NotFoundException if there is no certificate. + + const CAList& getCACerts() const; + /// Returns the list of CA certificates in this container. + + const std::string& getFriendlyName() const; + /// Returns the friendly name of the certificate bag. + +private: + void load(PKCS12* pPKCS12, const std::string& password = ""); + +#ifdef POCO_ENABLE_CPP11 + typedef std::unique_ptr CertPtr; +#else + typedef std::auto_ptr CertPtr; +#endif // #ifdef POCO_ENABLE_CPP11 + + OpenSSLInitializer _openSSLInitializer; + EVP_PKEY* _pKey; + CertPtr _pX509Cert; + CAList _caCertList; + std::string _pkcsFriendlyname; +}; + + +// +// inlines +// + +inline bool PKCS12Container::hasX509Certificate() const +{ + return _pX509Cert.get() != 0; +} + + +inline const X509Certificate& PKCS12Container::getX509Certificate() const +{ + if (!hasX509Certificate()) + throw NotFoundException("PKCS12Container X509 certificate"); + return *_pX509Cert; +} + + +inline const std::string& PKCS12Container::getFriendlyName() const +{ + return _pkcsFriendlyname; +} + + +inline const PKCS12Container::CAList& PKCS12Container::getCACerts() const +{ + return _caCertList; +} + + +inline bool PKCS12Container::hasKey() const +{ + return _pKey != 0; +} + + +inline EVPPKey PKCS12Container::getKey() const +{ + return EVPPKey(_pKey); +} + + +} } // namespace Poco::Crypto + + +#endif // Crypto_PKCS12Container_INCLUDED diff --git a/Crypto/include/Poco/Crypto/X509Certificate.h b/Crypto/include/Poco/Crypto/X509Certificate.h index 6606f08d4..47f318099 100644 --- a/Crypto/include/Poco/Crypto/X509Certificate.h +++ b/Crypto/include/Poco/Crypto/X509Certificate.h @@ -44,7 +44,9 @@ public: NID_LOCALITY_NAME = 15, NID_STATE_OR_PROVINCE = 16, NID_ORGANIZATION_NAME = 17, - NID_ORGANIZATION_UNIT_NAME = 18 + NID_ORGANIZATION_UNIT_NAME = 18, + NID_PKCS9_EMAIL_ADDRESS = 48, + NID_SERIAL_NUMBER = 105 }; explicit X509Certificate(std::istream& istr); @@ -126,7 +128,7 @@ public: /// certificate. /// /// Returns true if verification against the issuer certificate - /// was successfull, false otherwise. + /// was successful, false otherwise. bool equals(const X509Certificate& otherCertificate) const; /// Checks whether the certificate is equal to @@ -139,6 +141,9 @@ public: const X509* certificate() const; /// Returns the underlying OpenSSL certificate. + void print(std::ostream& out) const; + /// Prints the certificate information to ostream. + protected: void load(std::istream& stream); /// Loads the certificate from the given stream. The diff --git a/Crypto/src/CryptoException.cpp b/Crypto/src/CryptoException.cpp new file mode 100644 index 000000000..c6496a197 --- /dev/null +++ b/Crypto/src/CryptoException.cpp @@ -0,0 +1,107 @@ +// +// CryptoException.cpp +// +// +// Library: Crypto +// Package: Crypto +// Module: CryptoException +// +// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#include "Poco/Crypto/CryptoException.h" +#include "Poco/NumberFormatter.h" +#include + + +namespace Poco { +namespace Crypto { + + +POCO_IMPLEMENT_EXCEPTION(CryptoException, Exception, "Crypto Exception") + + +OpenSSLException::OpenSSLException(int otherCode): CryptoException(otherCode) +{ + setExtMessage(); +} + + +OpenSSLException::OpenSSLException(const std::string& msg, int otherCode): CryptoException(msg, otherCode) +{ + setExtMessage(); +} + + +OpenSSLException::OpenSSLException(const std::string& msg, const std::string& arg, int otherCode): CryptoException(msg, arg, otherCode) +{ + setExtMessage(); +} + + +OpenSSLException::OpenSSLException(const std::string& msg, const Poco::Exception& exc, int otherCode): CryptoException(msg, exc, otherCode) +{ + setExtMessage(); +} + + +OpenSSLException::OpenSSLException(const OpenSSLException& exc): CryptoException(exc) +{ + setExtMessage(); +} + + +OpenSSLException::~OpenSSLException() throw() +{ +} + + +OpenSSLException& OpenSSLException::operator = (const OpenSSLException& exc) +{ + CryptoException::operator = (exc); + return *this; +} + + +const char* OpenSSLException::name() const throw() +{ + return "OpenSSLException"; +} + + +const char* OpenSSLException::className() const throw() +{ + return typeid(*this).name(); +} + + +Poco::Exception* OpenSSLException::clone() const +{ + return new OpenSSLException(*this); +} + + +void OpenSSLException::setExtMessage() +{ + unsigned long e = ERR_get_error(); + char buf[128] = { 0 }; + char* pErr = ERR_error_string(e, buf); + std::string err; + if (pErr) err = pErr; + else err = NumberFormatter::format(e); + + extendedMessage(err); +} + + +void OpenSSLException::rethrow() const +{ + throw *this; +} + + +} } // namespace Poco::Crypto diff --git a/Crypto/src/ECDSADigestEngine.cpp b/Crypto/src/ECDSADigestEngine.cpp new file mode 100644 index 000000000..59512770c --- /dev/null +++ b/Crypto/src/ECDSADigestEngine.cpp @@ -0,0 +1,100 @@ +// +// ECDSADigestEngine.cpp +// +// +// Library: Crypto +// Package: ECDSA +// Module: ECDSADigestEngine +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#include "Poco/Crypto/ECDSADigestEngine.h" +#include + + +namespace Poco { +namespace Crypto { + + +ECDSADigestEngine::ECDSADigestEngine(const ECKey& key, const std::string &name): + _key(key), + _engine(name) +{ +} + + +ECDSADigestEngine::~ECDSADigestEngine() +{ +} + + +std::size_t ECDSADigestEngine::digestLength() const +{ + return _engine.digestLength(); +} + + +void ECDSADigestEngine::reset() +{ + _engine.reset(); + _digest.clear(); + _signature.clear(); +} + + +const DigestEngine::Digest& ECDSADigestEngine::digest() +{ + if (_digest.empty()) + { + _digest = _engine.digest(); + } + return _digest; +} + + +const DigestEngine::Digest& ECDSADigestEngine::signature() +{ + if (_signature.empty()) + { + digest(); + _signature.resize(_key.size()); + unsigned sigLen = static_cast(_signature.size()); + if (!ECDSA_sign(0, &_digest[0], static_cast(_digest.size()), + &_signature[0], &sigLen, _key.impl()->getECKey())) + { + throw OpenSSLException(); + } + if (sigLen < _signature.size()) _signature.resize(sigLen); + } + return _signature; +} + + +bool ECDSADigestEngine::verify(const DigestEngine::Digest& sig) +{ + digest(); + EC_KEY* pKey = _key.impl()->getECKey(); + if (pKey) + { + int ret = ECDSA_verify(0, &_digest[0], static_cast(_digest.size()), + &sig[0], static_cast(sig.size()), + pKey); + if (1 == ret) return true; + else if (0 == ret) return false; + } + throw OpenSSLException(); +} + + +void ECDSADigestEngine::updateImpl(const void* data, std::size_t length) +{ + _engine.update(data, length); +} + + +} } // namespace Poco::Crypto diff --git a/Crypto/src/ECKey.cpp b/Crypto/src/ECKey.cpp new file mode 100644 index 000000000..56b866377 --- /dev/null +++ b/Crypto/src/ECKey.cpp @@ -0,0 +1,75 @@ +// +// ECKey.cpp +// +// +// Library: Crypto +// Package: EC +// Module: ECKey +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#include "Poco/Crypto/ECKey.h" +#include + + +namespace Poco { +namespace Crypto { + + +ECKey::ECKey(const EVPPKey& key): + KeyPair(new ECKeyImpl(key)), + _pImpl(KeyPair::impl().cast()) +{ +} + + +ECKey::ECKey(const X509Certificate& cert): + KeyPair(new ECKeyImpl(cert)), + _pImpl(KeyPair::impl().cast()) +{ +} + + +ECKey::ECKey(const PKCS12Container& cont): + KeyPair(new ECKeyImpl(cont)), + _pImpl(KeyPair::impl().cast()) +{ +} + + +ECKey::ECKey(const std::string& eccGroup): + KeyPair(new ECKeyImpl(OBJ_txt2nid(eccGroup.c_str()))), + _pImpl(KeyPair::impl().cast()) +{ +} + + +ECKey::ECKey(const std::string& publicKeyFile, + const std::string& privateKeyFile, + const std::string& privateKeyPassphrase): + KeyPair(new ECKeyImpl(publicKeyFile, privateKeyFile, privateKeyPassphrase)), + _pImpl(KeyPair::impl().cast()) +{ +} + + +ECKey::ECKey(std::istream* pPublicKeyStream, + std::istream* pPrivateKeyStream, + const std::string& privateKeyPassphrase): + KeyPair(new ECKeyImpl(pPublicKeyStream, pPrivateKeyStream, privateKeyPassphrase)), + _pImpl(KeyPair::impl().cast()) +{ +} + + +ECKey::~ECKey() +{ +} + + +} } // namespace Poco::Crypto diff --git a/Crypto/src/ECKeyImpl.cpp b/Crypto/src/ECKeyImpl.cpp new file mode 100644 index 000000000..88f0277a6 --- /dev/null +++ b/Crypto/src/ECKeyImpl.cpp @@ -0,0 +1,357 @@ +// +// ECKeyImpl.cpp +// +// +// Library: Crypto +// Package: EC +// Module: ECKeyImpl +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#include "Poco/Crypto/ECKeyImpl.h" +#include "Poco/Crypto/X509Certificate.h" +#include "Poco/Crypto/PKCS12Container.h" +#include "Poco/FileStream.h" +#include "Poco/StreamCopier.h" +#include +#include +#if OPENSSL_VERSION_NUMBER >= 0x00908000L +#include +#endif + + +namespace Poco { +namespace Crypto { + + +ECKeyImpl::ECKeyImpl(const EVPPKey& key): + KeyPairImpl("ec", KT_EC_IMPL), + _pEC(EVP_PKEY_get1_EC_KEY(const_cast((const EVP_PKEY*)key))) +{ + if (!_pEC) throw OpenSSLException("ECKeyImpl(const EVPPKey&)"); +} + + +ECKeyImpl::ECKeyImpl(const X509Certificate& cert): + KeyPairImpl("ec", KT_EC_IMPL), + _pEC(0) +{ + const X509* pCert = cert.certificate(); + if (pCert) + { + EVP_PKEY* pKey = X509_get_pubkey(const_cast(pCert)); + if (pKey) + { + _pEC = EVP_PKEY_get1_EC_KEY(pKey); + EVP_PKEY_free(pKey); + return; + } + } + throw OpenSSLException("ECKeyImpl(const X509Certificate&)"); +} + + +ECKeyImpl::ECKeyImpl(const PKCS12Container& cont): + KeyPairImpl("ec", KT_EC_IMPL), + _pEC(EVP_PKEY_get1_EC_KEY(cont.getKey())) +{ + if (!_pEC) throw OpenSSLException(); +} + + +ECKeyImpl::ECKeyImpl(int curve): + KeyPairImpl("ec", KT_EC_IMPL), + _pEC(EC_KEY_new_by_curve_name(curve)) +{ + if (!EC_KEY_generate_key(_pEC)) + throw OpenSSLException("ECKeyImpl(int)"); +} + + +ECKeyImpl::ECKeyImpl(const std::string& publicKeyFile, + const std::string& privateKeyFile, + const std::string& privateKeyPassphrase): KeyPairImpl("ec", KT_EC_IMPL), _pEC(0) +{ + if (loadKey(PEM_read_PrivateKey, privateKeyFile, privateKeyPassphrase)) + return; // private key is enough + + // no private key, this must be public key only, otherwise throw + if (!loadKey(PEM_read_PUBKEY, publicKeyFile)) + { + throw OpenSSLException("ECKeyImpl(const string&, const string&, const string&"); + } +} + + +ECKeyImpl::ECKeyImpl(std::istream* pPublicKeyStream, + std::istream* pPrivateKeyStream, + const std::string& privateKeyPassphrase): KeyPairImpl("ec", KT_EC_IMPL), _pEC(0) +{ + if (loadKey(PEM_read_bio_PrivateKey, pPrivateKeyStream, privateKeyPassphrase)) + return; // private key is enough + + // no private key, this must be public key only, otherwise throw + if (!loadKey(PEM_read_bio_PUBKEY, pPublicKeyStream)) + { + throw OpenSSLException("ECKeyImpl(istream*, istream*, const string&"); + } +} + + +ECKeyImpl::~ECKeyImpl() +{ + freeEC(); +} + + +void ECKeyImpl::freeEC() +{ + if (_pEC) + { + EC_KEY_free(_pEC); + _pEC = 0; + } +} + + +int ECKeyImpl::passCB(char* buf, int size, int, void* pass) +{ + int len = (int) strlen((char*)pass); + if (len > size) len = size; + memcpy(buf, pass, len); + return len; +} + + +bool ECKeyImpl::loadKey(PEM_read_Key_fn func, const std::string& keyFile, const std::string& pass) +{ + if (!keyFile.empty()) + { + EVP_PKEY* pKey = EVP_PKEY_new(); + if (pKey) + { + FILE* pFile = fopen(keyFile.c_str(), "r"); + if (pFile) + { + func(pFile, &pKey, passCB, pass.empty() ? (void*)0 : (void*)pass.c_str()); + _pEC = EVP_PKEY_get1_EC_KEY(pKey); + EVP_PKEY_free(pKey); + if (!_pEC) goto error; + return true; + } + else + { + EVP_PKEY_free(pKey); + throw IOException("ECKeyImpl, cannot open file", keyFile); + } + } + else goto error; + } + return false; + +error: + throw OpenSSLException("ECKeyImpl(const string&, const string&, const string&)"); +} + + +bool ECKeyImpl::loadKey(PEM_read_bio_Key_fn func, std::istream* pIstr, const std::string& pass) +{ + if (pIstr) + { + std::ostringstream ostr; + Poco::StreamCopier::copyStream(*pIstr, ostr); + std::string key = ostr.str(); + BIO *pBIO = BIO_new_mem_buf(const_cast(key.data()), static_cast(key.size())); + if (pBIO) + { + EVP_PKEY* pKey = EVP_PKEY_new(); + if (pKey) + { + if (func(pBIO, &pKey, passCB, pass.empty() ? (void*)0 : (void*)pass.c_str())) + { + _pEC = EVP_PKEY_get1_EC_KEY(pKey); + EVP_PKEY_free(pKey); + BIO_free(pBIO); + if (!_pEC) goto error; + return true; + } + goto error; + } + else + { + BIO_free(pBIO); + goto error; + } + } + else goto error; + } + return false; + +error: + throw OpenSSLException("ECKeyImpl::ECKeyImpl(const string&, const string&, const string&)"); +} + + +int ECKeyImpl::size() const +{ + int sz = -1; + EVP_PKEY* pKey = EVP_PKEY_new(); + if (pKey && EVP_PKEY_set1_EC_KEY(pKey, _pEC)) + { + sz = EVP_PKEY_bits(pKey); + EVP_PKEY_free(pKey); + return sz; + } + throw OpenSSLException("ECKeyImpl::size()"); +} + + +std::string ECKeyImpl::groupName() const +{ + if (_pEC) + { + const EC_GROUP* ecGroup = EC_KEY_get0_group(_pEC); + if (ecGroup) + { + return OBJ_nid2sn(EC_GROUP_get_curve_name(ecGroup)); + } + else + { + throw OpenSSLException("ECKeyImpl::groupName()"); + } + } + throw NullPointerException("ECKeyImpl::groupName() => _pEC"); +} + + +void ECKeyImpl::save(const std::string& publicKeyFile, + const std::string& privateKeyFile, + const std::string& privateKeyPassphrase) +{ + if (!publicKeyFile.empty()) + { + BIO* bio = BIO_new(BIO_s_file()); + if (!bio) throw Poco::IOException("Cannot create BIO for writing public key file", publicKeyFile); + try + { + if (BIO_write_filename(bio, const_cast(publicKeyFile.c_str()))) + { + EVPPKey pKey(_pEC); + if (!PEM_write_bio_PUBKEY(bio, pKey)) + { + throw Poco::WriteFileException("Failed to write public key to file", publicKeyFile); + } + } + else throw Poco::CreateFileException("Cannot create public key file"); + } + catch (...) + { + BIO_free(bio); + throw; + } + BIO_free(bio); + } + + if (!privateKeyFile.empty()) + { + BIO* bio = BIO_new(BIO_s_file()); + if (!bio) throw Poco::IOException("Cannot create BIO for writing private key file", privateKeyFile); + try + { + if (BIO_write_filename(bio, const_cast(privateKeyFile.c_str()))) + { + EVPPKey pKey(_pEC); + int rc = 0; + if (privateKeyPassphrase.empty()) + { + rc = PEM_write_bio_PrivateKey(bio, pKey, 0, 0, 0, 0, 0); + } + else + { + rc = PEM_write_bio_PrivateKey(bio, pKey, EVP_des_ede3_cbc(), + reinterpret_cast(const_cast(privateKeyPassphrase.c_str())), + static_cast(privateKeyPassphrase.length()), 0, 0); + } + if (!rc) + throw Poco::FileException("Failed to write private key to file", privateKeyFile); + } + else throw Poco::CreateFileException("Cannot create private key file", privateKeyFile); + } + catch (...) + { + BIO_free(bio); + throw; + } + BIO_free(bio); + } +} + + +void ECKeyImpl::save(std::ostream* pPublicKeyStream, + std::ostream* pPrivateKeyStream, + const std::string& privateKeyPassphrase) +{ + if (pPublicKeyStream) + { + BIO* bio = BIO_new(BIO_s_mem()); + if (!bio) throw Poco::IOException("Cannot create BIO for writing public key"); + EVPPKey pKey(_pEC); + if (!PEM_write_bio_PUBKEY(bio, pKey)) + { + BIO_free(bio); + throw Poco::WriteFileException("Failed to write public key to stream"); + } + char* pData; + long size = BIO_get_mem_data(bio, &pData); + pPublicKeyStream->write(pData, static_cast(size)); + BIO_free(bio); + } + + if (pPrivateKeyStream) + { + BIO* bio = BIO_new(BIO_s_mem()); + if (!bio) throw Poco::IOException("Cannot create BIO for writing public key"); + EVPPKey pKey(_pEC); + int rc = 0; + if (privateKeyPassphrase.empty()) + rc = PEM_write_bio_PrivateKey(bio, pKey, 0, 0, 0, 0, 0); + else + rc = PEM_write_bio_PrivateKey(bio, pKey, EVP_des_ede3_cbc(), + reinterpret_cast(const_cast(privateKeyPassphrase.c_str())), + static_cast(privateKeyPassphrase.length()), 0, 0); + if (!rc) + { + BIO_free(bio); + throw Poco::FileException("Failed to write private key to stream"); + } + char* pData; + long size = BIO_get_mem_data(bio, &pData); + pPrivateKeyStream->write(pData, static_cast(size)); + BIO_free(bio); + } +} + + +ECKeyImpl::ByteVec ECKeyImpl::convertToByteVec(const BIGNUM* bn) +{ + int numBytes = BN_num_bytes(bn); + ByteVec byteVector(numBytes); + + ByteVec::value_type* buffer = new ByteVec::value_type[numBytes]; + BN_bn2bin(bn, buffer); + + for (int i = 0; i < numBytes; ++i) + byteVector[i] = buffer[i]; + + delete [] buffer; + + return byteVector; +} + + +} } // namespace Poco::Crypto diff --git a/Crypto/src/EVPPKey.cpp b/Crypto/src/EVPPKey.cpp new file mode 100644 index 000000000..58aae6ed8 --- /dev/null +++ b/Crypto/src/EVPPKey.cpp @@ -0,0 +1,134 @@ +// +// EVPPKey.cpp +// +// +// Library: Crypto +// Package: CryptoCore +// Module: EVPPKey +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#include "Poco/Crypto/EVPPKey.h" +#include "Poco/NumberFormatter.h" + + +namespace Poco { +namespace Crypto { + + + EVPPKey::EVPPKey(const std::string& ecCurveName): _pEVPPKey(0) +{ + newECKey(ecCurveName.c_str()); +} + + +EVPPKey::EVPPKey(const char* ecCurveName): _pEVPPKey(0) +{ + newECKey(ecCurveName); +} + + +EVPPKey::EVPPKey(EVP_PKEY* pEVPPKey): _pEVPPKey(0) +{ + duplicate(pEVPPKey); +} + + +EVPPKey::EVPPKey(const EVPPKey& other) +{ + duplicate(other._pEVPPKey); +} + + +EVPPKey& EVPPKey::operator=(const EVPPKey& other) +{ + duplicate(other._pEVPPKey); + return *this; +} + + +#ifdef POCO_ENABLE_CPP11 + +EVPPKey::EVPPKey(EVPPKey&& other): _pEVPPKey(other._pEVPPKey) +{ + other._pEVPPKey = nullptr; +} + + +EVPPKey& EVPPKey::operator=(EVPPKey&& other) +{ + _pEVPPKey = other._pEVPPKey; + other._pEVPPKey = nullptr; + return *this; +} + +#endif // POCO_ENABLE_CPP11 + +EVPPKey::~EVPPKey() +{ + if (_pEVPPKey) EVP_PKEY_free(_pEVPPKey); +} + + +void EVPPKey::duplicate(EVP_PKEY* pEVPPKey) +{ + if (!pEVPPKey) throw NullPointerException("EVPPKey::duplicate(): " + "provided key pointer is null."); + + _pEVPPKey = EVP_PKEY_new(); + if (!_pEVPPKey) throw NullPointerException("EVPPKey::duplicate(): " + "EVP_PKEY_new() returned null."); + + switch (pEVPPKey->type) + { + case EVP_PKEY_RSA: + { + RSA* pRSA = EVP_PKEY_get1_RSA(pEVPPKey); + if (pRSA) + { + EVP_PKEY_set1_RSA(_pEVPPKey, pRSA); + RSA_free(pRSA); + } + else throw OpenSSLException(); + break; + } + case EVP_PKEY_EC: + { + EC_KEY* pEC = EVP_PKEY_get1_EC_KEY(pEVPPKey); + if (pEC) + { + EVP_PKEY_set1_EC_KEY(_pEVPPKey, pEC); + EC_KEY_free(pEC); + } + else throw OpenSSLException(); + break; + } + default: + throw NotImplementedException("EVPPKey:duplicate(); Key type: " + + NumberFormatter::format(pEVPPKey->type)); + } +} + + +void EVPPKey::newECKey(const char* ecCurveName) +{ + int curveID = OBJ_txt2nid(ecCurveName); + EC_KEY* pEC = EC_KEY_new_by_curve_name(curveID); + if (!pEC) goto err; + if (!EC_KEY_generate_key(pEC)) goto err; + _pEVPPKey = EVP_PKEY_new(); + if (!_pEVPPKey) goto err; + if (!EVP_PKEY_set1_EC_KEY(_pEVPPKey, pEC)) goto err; + EC_KEY_free(pEC); + return; +err: + throw OpenSSLException(); +} + + +} } // namespace Poco::Crypto diff --git a/Crypto/src/KeyPair.cpp b/Crypto/src/KeyPair.cpp new file mode 100644 index 000000000..1c650806b --- /dev/null +++ b/Crypto/src/KeyPair.cpp @@ -0,0 +1,34 @@ +// +// KeyPair.cpp +// +// +// Library: Crypto +// Package: CryptoCore +// Module: KeyPair +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#include "Poco/Crypto/KeyPair.h" +#include + + +namespace Poco { +namespace Crypto { + + +KeyPair::KeyPair(KeyPairImpl::Ptr pKeyPairImpl): _pImpl(pKeyPairImpl) +{ +} + + +KeyPair::~KeyPair() +{ +} + + +} } // namespace Poco::Crypto diff --git a/Crypto/src/KeyPairImpl.cpp b/Crypto/src/KeyPairImpl.cpp new file mode 100644 index 000000000..c782f0427 --- /dev/null +++ b/Crypto/src/KeyPairImpl.cpp @@ -0,0 +1,35 @@ +// +// KeyPairImpl.cpp +// +// +// Library: Crypto +// Package: CryptoCore +// Module: KeyPairImpl +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#include "Poco/Crypto/KeyPairImpl.h" + + +namespace Poco { +namespace Crypto { + + +KeyPairImpl::KeyPairImpl(const std::string& name, Type type): + _name(name), + _type(type) +{ +} + + +KeyPairImpl::~KeyPairImpl() +{ +} + + +} } // namespace Poco::Crypto diff --git a/Crypto/src/PKCS12Container.cpp b/Crypto/src/PKCS12Container.cpp new file mode 100644 index 000000000..7a014c08f --- /dev/null +++ b/Crypto/src/PKCS12Container.cpp @@ -0,0 +1,135 @@ +// +// PKCS12Container.cpp +// +// +// Library: Crypto +// Package: Certificate +// Module: PKCS12Container +// +// Copyright (c) 2006-2009, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#include "Poco/Crypto/PKCS12Container.h" +#include "Poco/NumberFormatter.h" +#include "Poco/StreamCopier.h" +#include +#include + + +namespace Poco { +namespace Crypto { + + + PKCS12Container::PKCS12Container(std::istream& istr, const std::string& password): _pKey(0) +{ + std::ostringstream ostr; + Poco::StreamCopier::copyStream(istr, ostr); + const std::string& cont = ostr.str(); + + BIO *pBIO = BIO_new_mem_buf(const_cast(cont.data()), static_cast(cont.size())); + if (pBIO) + { + PKCS12* pPKCS12 = 0; + d2i_PKCS12_bio(pBIO, &pPKCS12); + BIO_free(pBIO); + if (!pPKCS12) throw OpenSSLException(); + load(pPKCS12, password); + } + else + { + throw OpenSSLException(); + } +} + + +PKCS12Container::PKCS12Container(const std::string& path, const std::string& password): _pKey(0) +{ + FILE* pFile = fopen(path.c_str(), "rb"); + if (pFile) + { + PKCS12* pPKCS12 = d2i_PKCS12_fp(pFile, NULL); + fclose (pFile); + if (!pPKCS12) throw OpenSSLException(); + load(pPKCS12, password); + } + else + { + throw Poco::OpenFileException("PKCS12Container: " + path); + } +} + + +PKCS12Container::PKCS12Container(const PKCS12Container& cont) +{ +} + + +PKCS12Container& PKCS12Container::operator = (const PKCS12Container& cert) +{ + return *this; +} + + +PKCS12Container::~PKCS12Container() +{ + if (_pKey) EVP_PKEY_free(_pKey); +} + + +void PKCS12Container::load(PKCS12* pPKCS12, const std::string& password) +{ + if (pPKCS12) + { + X509* pCert = 0; + STACK_OF(X509)* pCA = 0; + if (PKCS12_parse(pPKCS12, password.c_str(), &_pKey, &pCert, &pCA)) + { + if (pCert) + { + STACK_OF(PKCS12_SAFEBAG)* pBags = 0; + _pX509Cert.reset(new X509Certificate(pCert, true)); + PKCS12_SAFEBAG* pBag = PKCS12_add_cert(&pBags, pCert); + if (pBag) + { + char*pBuffer = PKCS12_get_friendlyname(pBag); + if(pBuffer) + { + _pkcsFriendlyname = pBuffer; + CRYPTO_free(pBuffer); + }else _pkcsFriendlyname.clear(); + if(pBags) sk_PKCS12_SAFEBAG_pop_free(pBags, PKCS12_SAFEBAG_free); + } + else throw OpenSSLException(); + } + else _pX509Cert.reset(); + + _caCertList.clear(); + if (pCA) + { + int certCount = sk_X509_num(pCA); + for (int i = 0; i < certCount; ++i) + { + _caCertList.push_back(X509Certificate(sk_X509_value(pCA, i), true)); + } + } + } + else + { + throw OpenSSLException(); + } + PKCS12_free(pPKCS12); + sk_X509_pop_free(pCA, X509_free); + X509_free(pCert); + } + else + { + throw NullPointerException("PKCS12Container: struct PKCS12"); + } +} + + +} } // namespace Poco::Crypto diff --git a/Crypto/src/X509Certificate.cpp b/Crypto/src/X509Certificate.cpp index e8c362a64..864eaef62 100644 --- a/Crypto/src/X509Certificate.cpp +++ b/Crypto/src/X509Certificate.cpp @@ -18,6 +18,10 @@ #include "Poco/DateTimeParser.h" #include #include +#ifdef _WIN32 +// fix for WIN32 header conflict +#undef X509_NAME +#endif #include #include #include @@ -29,7 +33,7 @@ namespace Crypto { X509Certificate::X509Certificate(std::istream& istr): _pCert(0) -{ +{ load(istr); } @@ -103,17 +107,17 @@ X509Certificate::~X509Certificate() void X509Certificate::load(std::istream& istr) { poco_assert (!_pCert); - + std::stringstream certStream; Poco::StreamCopier::copyStream(istr, certStream); std::string cert = certStream.str(); - + BIO *pBIO = BIO_new_mem_buf(const_cast(cert.data()), static_cast(cert.size())); if (!pBIO) throw Poco::IOException("Cannot create BIO for reading certificate"); _pCert = PEM_read_bio_X509(pBIO, 0, 0, 0); BIO_free(pBIO); - - if (!_pCert) throw Poco::IOException("Faild to load certificate from stream"); + + if (!_pCert) throw Poco::IOException("Failed to load certificate from stream"); init(); } @@ -130,10 +134,10 @@ void X509Certificate::load(const std::string& path) BIO_free(pBIO); throw Poco::OpenFileException("Cannot open certificate file for reading", path); } - + _pCert = PEM_read_bio_X509(pBIO, 0, 0, 0); BIO_free(pBIO); - + if (!_pCert) throw Poco::ReadFileException("Faild to load certificate from", path); init(); @@ -205,24 +209,24 @@ std::string X509Certificate::commonName() const std::string X509Certificate::issuerName(NID nid) const { if (X509_NAME* issuer = X509_get_issuer_name(_pCert)) - { + { char buffer[NAME_BUFFER_SIZE]; if (X509_NAME_get_text_by_NID(issuer, nid, buffer, sizeof(buffer)) >= 0) return std::string(buffer); - } - return std::string(); + } + return std::string(); } std::string X509Certificate::subjectName(NID nid) const { if (X509_NAME* subj = X509_get_subject_name(_pCert)) - { + { char buffer[NAME_BUFFER_SIZE]; if (X509_NAME_get_text_by_NID(subj, nid, buffer, sizeof(buffer)) >= 0) return std::string(buffer); - } - return std::string(); + } + return std::string(); } @@ -230,16 +234,16 @@ void X509Certificate::extractNames(std::string& cmnName, std::set& { domainNames.clear(); if (STACK_OF(GENERAL_NAME)* names = static_cast(X509_get_ext_d2i(_pCert, NID_subject_alt_name, 0, 0))) - { + { for (int i = 0; i < sk_GENERAL_NAME_num(names); ++i) - { + { const GENERAL_NAME* name = sk_GENERAL_NAME_value(names, i); if (name->type == GEN_DNS) { const char* data = reinterpret_cast(ASN1_STRING_data(name->d.ia5)); std::size_t len = ASN1_STRING_length(name->d.ia5); domainNames.insert(std::string(data, len)); - } + } } GENERAL_NAMES_free(names); } @@ -290,4 +294,19 @@ bool X509Certificate::equals(const X509Certificate& otherCertificate) const } +void X509Certificate::print(std::ostream& out) const +{ + out << "subjectName: " << subjectName() << std::endl; + out << "issuerName: " << issuerName() << std::endl; + out << "commonName: " << commonName() << std::endl; + out << "country: " << subjectName(X509Certificate::NID_COUNTRY) << std::endl; + out << "localityName: " << subjectName(X509Certificate::NID_LOCALITY_NAME) << std::endl; + out << "stateOrProvince: " << subjectName(X509Certificate::NID_STATE_OR_PROVINCE) << std::endl; + out << "organizationName: " << subjectName(X509Certificate::NID_ORGANIZATION_NAME) << std::endl; + out << "organizationUnitName: " << subjectName(X509Certificate::NID_ORGANIZATION_UNIT_NAME) << std::endl; + out << "emailAddress: " << subjectName(X509Certificate::NID_PKCS9_EMAIL_ADDRESS) << std::endl; + out << "serialNumber: " << subjectName(X509Certificate::NID_SERIAL_NUMBER) << std::endl; +} + + } } // namespace Poco::Crypto diff --git a/Crypto/testsuite/TestSuite.progen b/Crypto/testsuite/TestSuite.progen index 0ac15ac2f..8bc21fb4a 100644 --- a/Crypto/testsuite/TestSuite.progen +++ b/Crypto/testsuite/TestSuite.progen @@ -6,11 +6,13 @@ 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 +openssl = ${vc.project.pocobase}\\openssl +vc.project.compiler.include = ${openssl}\\VS_120\\include;${vc.project.pocobase}\\Foundation\\include +vc.project.compiler.defines = _CRT_SECURE_NO_WARNINGS 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_shared = +vc.project.linker.dependencies.release_shared = +vc.project.linker.dependencies.debug_static_md = +vc.project.linker.dependencies.release_static_md = +vc.project.linker.dependencies.debug_static_mt = Crypt32.lib +vc.project.linker.dependencies.release_static_mt = Crypt32.lib diff --git a/Crypto/testsuite/TestSuite_CE_VS90.vcproj b/Crypto/testsuite/TestSuite_CE_VS90.vcproj index 8743db5b9..3c8ae2416 100644 --- a/Crypto/testsuite/TestSuite_CE_VS90.vcproj +++ b/Crypto/testsuite/TestSuite_CE_VS90.vcproj @@ -33,8 +33,8 @@ Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" - PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);_CONSOLE;_CRT_SECURE_NO_WARNINGS;" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\openssl\VS_120\include;..\..\Foundation\include" + PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" StringPooling="true" MinimalRebuild="false" RuntimeLibrary="3" @@ -57,7 +57,7 @@ - + + @@ -479,6 +481,12 @@ Name="Source Files"> + + + diff --git a/Crypto/testsuite/TestSuite_VS90.vcproj b/Crypto/testsuite/TestSuite_VS90.vcproj index a2db02f67..7ebf4143f 100644 --- a/Crypto/testsuite/TestSuite_VS90.vcproj +++ b/Crypto/testsuite/TestSuite_VS90.vcproj @@ -32,8 +32,8 @@ - + + @@ -460,6 +462,12 @@ Name="Source Files"> + + + diff --git a/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj b/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj index b86c91fb5..ab743399b 100644 --- a/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj @@ -1,30 +1,12 @@ - - 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 +18,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,225 +30,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_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 0a1f786c0..eb9cd265f 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} + {a8e88daa-75bc-4378-a5a6-fff13aea35e7} - {f592a32a-be3f-4814-ba52-998a00700151} + {3fad8301-d338-4d71-8109-8a88b43d91c4} - {a849c00f-88db-4597-b917-e47a1a90b49d} + {70ab924b-ec37-4e2b-8bb2-e72c24d7902e} - {45568015-ddf6-4d65-ac5d-a992c9951415} + {1770bc94-9782-40f9-aeee-4d27580dd758} - {caa322b1-b4da-4d3c-a366-284041ad6a95} + {d97fde99-0cca-4627-95c5-87072b3b09c0} - {08f3a7df-9ca5-428f-b451-86cf927e7cf3} + {ccb4433d-463f-4ec0-ad48-57791e5b1b25} - {a3778731-dbd3-4a6f-bc1d-78c7581f0e0c} + {d1562360-1a88-4217-9707-1b8c5bd0e69e} - {aa1b2657-0bd2-42dd-8b21-be405bbaf9ae} + {2f77f332-d830-4ba0-a7a0-b8d693e5e7f3} @@ -33,6 +33,12 @@ Crypto\Header Files + + Crypto\Header Files + + + Crypto\Header Files + Crypto\Header Files @@ -41,12 +47,18 @@ - - Crypto\Header Files - Crypto\Source Files + + Crypto\Source Files + + + Crypto\Source Files + + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj index 66bbef31a..e703ff702 100644 --- a/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -1,30 +1,12 @@ - - 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 +18,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 +30,14 @@ 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..f83a92343 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} + {38da1e98-4fbd-4854-88a1-26bd204fba31} - {5f220c7e-21a7-4dae-a27e-d89dbd6c0e39} + {572c0cbc-c2c9-4de8-9921-3f7fa1eeebed} - {76055bb4-7a56-43da-b3a8-79c12963f5e5} + {2a4c5ba5-520b-4f20-9993-1e79a972f1be} - {e54e847e-662d-4d9a-b946-6be77f0a1ac7} + {4da2191f-9751-4421-8de8-35b99d0eaea2} - {601da967-92a2-49f0-8c5d-3e26c1300e1e} + {245c8829-5e7b-42be-8994-3e08210e9955} - {ad1ae979-501e-4496-9015-77c6053bc132} + {a9975d5f-6c13-43e6-a9d3-df06707768c6} - {e8743be1-25e4-4f6e-b859-67054ff511e6} + {48accdca-b8f9-4247-8b6b-b2eee949d88b} - {c655d458-12dc-413c-9f81-6e76a5d784cb} + {89a0ee91-f2eb-48fd-b86e-18a704d66919} @@ -33,6 +33,12 @@ Crypto\Header Files + + Crypto\Header Files + + + Crypto\Header Files + Crypto\Header Files @@ -41,12 +47,18 @@ - - Crypto\Header Files - Crypto\Source Files + + Crypto\Source Files + + + Crypto\Source Files + + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_vs100.vcxproj b/Crypto/testsuite/TestSuite_vs100.vcxproj index 8c8bb7c52..81653754b 100644 --- a/Crypto/testsuite/TestSuite_vs100.vcxproj +++ b/Crypto/testsuite/TestSuite_vs100.vcxproj @@ -114,8 +114,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +150,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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,8 +180,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +217,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -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,8 +248,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -284,8 +284,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -314,12 +314,16 @@ + + - + + + diff --git a/Crypto/testsuite/TestSuite_vs100.vcxproj.filters b/Crypto/testsuite/TestSuite_vs100.vcxproj.filters index b75e212f3..a4f6d189d 100644 --- a/Crypto/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {d5fdb1be-4d52-4f29-94ca-df06a1ce2806} + {ac0796d1-5991-4754-be00-9f72915f86a0} - {e8e2d305-215e-4f5a-86cf-459d2d5ad2af} + {10e50644-e2ed-40dc-997e-8fb2f14f7085} - {9e9876e7-a3c3-4da5-b66d-4e4d00f081cf} + {105e62ac-55a9-45d0-8a7b-25bc18f43d5f} - {756653a7-42df-4419-9fe8-07eab92513bb} + {29eb5cf1-84d1-4e99-be7b-9b12a31f8f2b} - {ff459343-640a-447e-8f12-382dfa31a4fa} + {77c6fd76-8ff0-4e99-b95a-9e96a3d0cadb} - {ca609043-0121-4498-8691-2f6f68b6590a} + {dea17c81-1a87-4eea-84da-93a5d920b037} - {0573ce8e-93d8-4f3b-b253-8854496427ec} + {2204a122-c707-41a0-b94d-9dc7233f23c3} - {00011579-73fd-4260-825b-33579a3d8276} + {1ab98cef-1c64-4957-a9fc-180081597c51} @@ -33,6 +33,12 @@ Crypto\Header Files + + Crypto\Header Files + + + Crypto\Header Files + Crypto\Header Files @@ -41,12 +47,18 @@ - - Crypto\Header Files - Crypto\Source Files + + Crypto\Source Files + + + Crypto\Source Files + + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj b/Crypto/testsuite/TestSuite_vs110.vcxproj index 9dbb4072e..6f4cbaaef 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,8 +132,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +165,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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,8 +192,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +226,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -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,8 +254,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -287,8 +287,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -314,12 +314,16 @@ + + - + + + diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_vs110.vcxproj.filters index ef936d6a4..02bb615a5 100644 --- a/Crypto/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {75186b32-dd31-42f4-a826-46258d4456fe} + {f4961fc2-2dae-4ace-9dee-01edbf2addd6} - {e0798e60-92d2-49ed-beeb-1b24a419873f} + {88ab3a10-1321-4160-b89d-bd12ca653787} - {32d32c88-3c8f-4e03-b3e7-7d2edeeaa292} + {2f5c7f75-7c22-45da-9689-30e2262e4052} - {90a40fec-a587-44b2-9786-58e9da2bf1b6} + {917d632f-b260-4f18-9fce-f323ea62d292} - {9f1b8180-6a0a-401f-ae7b-f8a5dbd11846} + {a79ad540-a384-4f9e-8d46-4e619b739ef5} - {44df3094-d197-4ad5-b760-32d1da1bd08e} + {45c172b4-f265-4b47-9e44-99471b2db933} - {46deea92-96d5-41de-9ad8-07455e9c0856} + {5113fe6d-5cc3-462e-a1eb-70ad5a8ce4bd} - {1c6cd050-d954-459f-991a-4de4d98bf0f4} + {84ac70a8-fe3b-4b19-a045-affd8f1f6071} @@ -33,6 +33,12 @@ Crypto\Header Files + + Crypto\Header Files + + + Crypto\Header Files + Crypto\Header Files @@ -41,12 +47,18 @@ - - Crypto\Header Files - Crypto\Source Files + + Crypto\Source Files + + + Crypto\Source Files + + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_vs120.vcxproj b/Crypto/testsuite/TestSuite_vs120.vcxproj index f7fb82f84..457476620 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,8 +126,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +159,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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,8 +186,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +219,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -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,8 +246,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,8 +279,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -305,16 +305,20 @@ - + + + - - + + + + diff --git a/Crypto/testsuite/TestSuite_vs120.vcxproj.filters b/Crypto/testsuite/TestSuite_vs120.vcxproj.filters index 42c524380..d3ca8697f 100644 --- a/Crypto/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {636193c2-d550-47fe-aefe-ee3aae7133d1} + {98f00684-6492-4518-8f3c-a05dc2a9b059} - {e560cb66-9a22-44ef-971b-3194fd280f23} + {0a5298c0-de0a-4c61-af1d-2c5cd68575f9} - {02a63d46-2034-493c-b459-877f0ae706b6} + {002e2046-3ab1-4e66-ada9-89c614613faa} - {ac0494aa-57c1-47a1-b8b0-acc147937072} + {9ed1359b-9546-4cb7-8e45-b957cf9d89ac} - {e039dfdb-4880-4fa5-8140-86d8e393f36e} + {f1f2583d-0c14-4f1b-bf78-abbd5d0ba100} - {d62fd92d-2e44-49fd-9dda-3bfed06d0250} + {b10a1de9-88ed-496e-8d2f-727724736de8} - {a0ebd5cb-4ad7-4b39-981e-992e87409b71} + {a9a73ce5-7956-4b5a-9ad9-5c72ad8b7d90} - {c30aa842-d56f-4f92-956b-f232962b311e} + {f3e19b6d-6edf-447b-843d-239c8f14dea7} @@ -33,6 +33,12 @@ Crypto\Header Files + + Crypto\Header Files + + + Crypto\Header Files + Crypto\Header Files @@ -41,12 +47,18 @@ - - Crypto\Header Files - Crypto\Source Files + + Crypto\Source Files + + + Crypto\Source Files + + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_vs140.vcxproj b/Crypto/testsuite/TestSuite_vs140.vcxproj index 83844baae..8812fc34a 100644 --- a/Crypto/testsuite/TestSuite_vs140.vcxproj +++ b/Crypto/testsuite/TestSuite_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25123.0 TestSuited TestSuited TestSuited @@ -126,8 +126,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +159,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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,8 +186,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +219,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -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,8 +246,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,8 +279,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -307,6 +307,8 @@ + + @@ -314,6 +316,8 @@ + + diff --git a/Crypto/testsuite/TestSuite_vs140.vcxproj.filters b/Crypto/testsuite/TestSuite_vs140.vcxproj.filters index f8ed281d0..d947d4edd 100644 --- a/Crypto/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {61fb6ffb-fe50-4482-a046-0d769c492f53} + {389f4398-1452-4e56-b8f1-94417e940bb6} - {9610ea05-dc14-49e9-a926-5e98a89bc04f} + {711b5aea-4f90-47eb-bf75-e2d601316767} - {1eed8071-169b-4e89-b338-99e5308da457} + {8a9f2f5c-849e-4ca4-b880-83015d0571ba} - {f10e7158-e0cd-402c-a4a4-b936db69c2c9} + {8d74fd83-87e4-4975-aba8-9bed97d72b29} - {20fc7713-94f3-4a70-8c44-ee13eba7cb2f} + {cc3253ae-672a-448d-8b2b-93cc10344750} - {b95c32c9-b37c-4e68-985e-9d186cc22f32} + {e4b058fa-9f59-41a3-9062-27917ac48ba7} - {bcb57581-3d0b-4ad0-b469-d5fd0c8170ca} + {1acb3930-fe10-457b-b461-b1e7f6ccfbdc} - {0d5cc51e-49f0-42bb-b947-35dec89c2dc0} + {80798073-1734-484b-952c-82109b3d1e8d} @@ -33,6 +33,12 @@ Crypto\Header Files + + Crypto\Header Files + + + Crypto\Header Files + Crypto\Header Files @@ -41,12 +47,18 @@ - - Crypto\Header Files - Crypto\Source Files + + Crypto\Source Files + + + Crypto\Source Files + + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_vs150.vcxproj b/Crypto/testsuite/TestSuite_vs150.vcxproj index e3d73ae95..9485585cc 100644 --- a/Crypto/testsuite/TestSuite_vs150.vcxproj +++ b/Crypto/testsuite/TestSuite_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.26228.10 TestSuited TestSuited TestSuited @@ -126,8 +126,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +159,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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,8 +186,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +219,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -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,8 +246,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,8 +279,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -307,6 +307,8 @@ + + @@ -314,6 +316,8 @@ + + diff --git a/Crypto/testsuite/TestSuite_vs150.vcxproj.filters b/Crypto/testsuite/TestSuite_vs150.vcxproj.filters index f8ed281d0..268003d1f 100644 --- a/Crypto/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {61fb6ffb-fe50-4482-a046-0d769c492f53} + {db551b75-b962-4f95-90ee-44b449c64500} - {9610ea05-dc14-49e9-a926-5e98a89bc04f} + {708aa7ed-0e69-4359-a8f0-d1934cbb65e6} - {1eed8071-169b-4e89-b338-99e5308da457} + {612df6a1-1429-42e5-a577-947ba7e029cf} - {f10e7158-e0cd-402c-a4a4-b936db69c2c9} + {ab6326ac-c92a-4d10-adf6-a289f8f3c78b} - {20fc7713-94f3-4a70-8c44-ee13eba7cb2f} + {669cd839-9776-4768-aae5-2bff3a711904} - {b95c32c9-b37c-4e68-985e-9d186cc22f32} + {fd2b559f-ac80-4ece-a91a-bfe9c877ef9a} - {bcb57581-3d0b-4ad0-b469-d5fd0c8170ca} + {0e00c5a8-faa2-4cb4-8be5-2742523eea23} - {0d5cc51e-49f0-42bb-b947-35dec89c2dc0} + {f9afb8c1-c324-49e2-af93-ef2638ea644f} @@ -33,6 +33,12 @@ Crypto\Header Files + + Crypto\Header Files + + + Crypto\Header Files + Crypto\Header Files @@ -41,12 +47,18 @@ - - Crypto\Header Files - Crypto\Source Files + + Crypto\Source Files + + + Crypto\Source Files + + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj index 45ccb1168..d041d425b 100644 --- a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj @@ -114,8 +114,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +150,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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,8 +180,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +217,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -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,8 +248,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -284,8 +284,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -314,12 +314,16 @@ + + - + + + diff --git a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters index 2d21d474b..69206d22e 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} + {02a9eacf-30be-4a5e-bdcc-1cc9ea4807a0} - {443cbc00-e53a-4e01-b3dd-271356ff645a} + {5d231887-d9a9-4c62-8487-0403f4f68912} - {9a8bfe0d-8239-4186-807b-b3bfec38203e} + {922897e1-1867-40b5-9cfe-536dca802007} - {624dbf88-a08e-4f3a-8444-60c68fc27b01} + {5e4846b1-373a-486b-ae59-b412e7a50a9d} - {6fbdd066-54ba-4f58-b462-9bf7f2fd74fa} + {c2ddef7c-a64c-4dc2-b13c-64c7c7e24129} - {694152e2-1123-4722-8eba-4454ef60c594} + {ee56f021-a5cb-4ca4-abda-3d6e3eb934f0} - {7d507c3b-649e-4dce-9597-9f227cf0bab8} + {60f2194e-ec34-46f2-aeee-8022fb3c0f43} - {52e9ebde-5ea9-42d5-99ca-0d0803d01e98} + {093e956a-98cf-4975-ac56-88936a245ee4} @@ -33,6 +33,12 @@ Crypto\Header Files + + Crypto\Header Files + + + Crypto\Header Files + Crypto\Header Files @@ -41,12 +47,18 @@ - - Crypto\Header Files - Crypto\Source Files + + Crypto\Source Files + + + Crypto\Source Files + + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj index a922344a3..84aaa07a4 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,8 +132,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +165,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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,8 +192,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +226,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -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,8 +254,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -287,8 +287,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -314,12 +314,16 @@ + + - + + + diff --git a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters index bae062648..f84d7c1e1 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} + {3b577deb-1389-4111-b6ba-581f87ce61d1} - {9f491e61-c862-4600-84a8-262070ed0b60} + {dd4329af-8e38-42e3-a8dc-058e6e3b7460} - {f7fe5515-566a-4600-b8c3-b88080b48695} + {607b66e2-e1b4-425d-9172-3680a8930e22} - {28c08c8d-0298-45e4-b59b-82d177017dd1} + {d285ca5d-4d0f-4b56-a1da-89aecab4972c} - {a9ebc8db-adf5-4fbb-a09f-a65197bb3a56} + {fc178a63-9cd3-4315-97ec-fe42768910b3} - {8bf70d70-d6aa-496a-bf34-17d82c887c4c} + {72733724-3186-4711-b38e-2810a31b532f} - {9d5db3e7-11f9-44fd-93c5-e61b2e6b92f1} + {661dd1a9-5ee1-4720-807a-2bd5e09f09b3} - {78ff8144-27d2-4977-898f-32355e013285} + {62b95cb9-a259-4912-8dcd-47cb26d1824b} @@ -33,6 +33,12 @@ Crypto\Header Files + + Crypto\Header Files + + + Crypto\Header Files + Crypto\Header Files @@ -41,12 +47,18 @@ - - Crypto\Header Files - Crypto\Source Files + + Crypto\Source Files + + + Crypto\Source Files + + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj index c8e7361b0..5196b7186 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,8 +126,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +159,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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,8 +186,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +219,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -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,8 +246,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,8 +279,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -305,16 +305,20 @@ - + + + - - + + + + diff --git a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters index f4ee15136..e7c8cfead 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} + {e7a7d946-193e-4e76-ba30-a624d2c175ab} - {d0d193dc-1f3d-44e8-a50d-6b51a1b07fbe} + {c1edb2fc-d6a5-4045-b3e8-9c60702c9f62} - {9897665a-c828-48fd-9ca7-eea368d77631} + {5668bc1b-baa4-41d8-a78b-b3367fb04223} - {37a5ff2a-125e-4e60-b0bf-dc57d06b499a} + {4b99d7aa-672e-4493-8413-c28514d1f986} - {35f22eca-9df9-483c-8574-dd2e4b9880e4} + {f4f166c9-df00-4c64-a354-3292f1c3282f} - {9cdf7054-e611-4059-a8b7-aa0858edba4d} + {3edc2983-3b40-4570-947c-1657d8f583a7} - {28247888-ce7f-4d88-8d5c-1da16ab25ef3} + {12a5fa4a-aeaf-41dc-bac8-8d63e469ece1} - {031510f2-0be4-48ee-84f5-93dbb5809da4} + {32726db4-1bba-416d-83ed-02888817d969} @@ -33,6 +33,12 @@ Crypto\Header Files + + Crypto\Header Files + + + Crypto\Header Files + Crypto\Header Files @@ -41,12 +47,18 @@ - - Crypto\Header Files - Crypto\Source Files + + Crypto\Source Files + + + Crypto\Source Files + + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_x64_vs140.vcxproj b/Crypto/testsuite/TestSuite_x64_vs140.vcxproj index e90f11dc2..e2a5ac42b 100644 --- a/Crypto/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25123.0 TestSuited TestSuited TestSuited @@ -126,8 +126,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +159,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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,8 +186,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +219,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -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,8 +246,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,8 +279,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -307,6 +307,8 @@ + + @@ -314,6 +316,8 @@ + + diff --git a/Crypto/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs140.vcxproj.filters index 685533dac..ef7b8bc57 100644 --- a/Crypto/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {608af652-abaa-4915-84a7-0251c890a5c9} + {9d21838f-5808-4d0a-b217-8d503b9cf7cb} - {c0c8cb35-ad2c-4170-9cdf-1f4ff7d9d59f} + {2e3190be-dbab-48bb-996f-ecaa8c4a5e68} - {8861b1b1-3be8-4969-a9e1-d89551881f66} + {eada8a19-85b3-4250-9d05-967901c7971e} - {cc1c2ad7-2b73-45c0-9163-72046e57f0d7} + {3012c8ab-17d6-489f-b35e-a2fe24a1f9c4} - {68025167-d3bd-44da-a950-ccb493132036} + {816cdddc-8b3f-4d2a-8712-a41da800ab58} - {0af2dfb5-86c4-4c43-a58a-ab90d3770360} + {21302cb4-8494-40a7-b5d7-1e4a5edcd028} - {fe6f875e-9a35-466c-933b-f596c85cc3b3} + {91797da6-9ef0-4b34-b708-539b3fa4a27a} - {cfce35b0-e0c5-4558-884c-322c96e8a196} + {9396643f-7d5d-4cf4-a91c-65eaaaeb679c} @@ -33,6 +33,12 @@ Crypto\Header Files + + Crypto\Header Files + + + Crypto\Header Files + Crypto\Header Files @@ -41,12 +47,18 @@ - - Crypto\Header Files - Crypto\Source Files + + Crypto\Source Files + + + Crypto\Source Files + + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_x64_vs150.vcxproj b/Crypto/testsuite/TestSuite_x64_vs150.vcxproj index b2fc3c3d7..81ef97d44 100644 --- a/Crypto/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.26228.10 TestSuited TestSuited TestSuited @@ -126,8 +126,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +159,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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,8 +186,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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,8 +219,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -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,8 +246,8 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -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;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,8 +279,8 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\VS_120\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -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;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -307,6 +307,8 @@ + + @@ -314,6 +316,8 @@ + + diff --git a/Crypto/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs150.vcxproj.filters index 685533dac..843d5753e 100644 --- a/Crypto/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {608af652-abaa-4915-84a7-0251c890a5c9} + {fd4a1cab-7f08-4756-8de7-54aadab1b0a0} - {c0c8cb35-ad2c-4170-9cdf-1f4ff7d9d59f} + {5c094994-f3a2-4c47-b47d-fcd4aa629a19} - {8861b1b1-3be8-4969-a9e1-d89551881f66} + {826f8316-a708-4e6e-aab5-a0769f8c96a3} - {cc1c2ad7-2b73-45c0-9163-72046e57f0d7} + {46c0964f-9339-457d-99ee-883e084ea07e} - {68025167-d3bd-44da-a950-ccb493132036} + {7285d47c-78c6-474d-940b-c3d8b4811db5} - {0af2dfb5-86c4-4c43-a58a-ab90d3770360} + {67802d70-8c8c-4d15-bf99-b23b2658a85f} - {fe6f875e-9a35-466c-933b-f596c85cc3b3} + {c25c08d6-7ed0-4a80-9091-d86cc66545b1} - {cfce35b0-e0c5-4558-884c-322c96e8a196} + {7941db2a-c5fe-4cef-a9d3-624d69c61469} @@ -33,6 +33,12 @@ Crypto\Header Files + + Crypto\Header Files + + + Crypto\Header Files + Crypto\Header Files @@ -41,12 +47,18 @@ - - Crypto\Header Files - Crypto\Source Files + + Crypto\Source Files + + + Crypto\Source Files + + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_x64_vs90.vcproj b/Crypto/testsuite/TestSuite_x64_vs90.vcproj index 9079582f6..1b6079889 100644 --- a/Crypto/testsuite/TestSuite_x64_vs90.vcproj +++ b/Crypto/testsuite/TestSuite_x64_vs90.vcproj @@ -32,8 +32,8 @@ - + + @@ -460,6 +462,12 @@ Name="Source Files"> + + + diff --git a/Crypto/testsuite/data/certs-only.p12 b/Crypto/testsuite/data/certs-only.p12 new file mode 100644 index 0000000000000000000000000000000000000000..eac7d357f0ab4c75f39e47d81dd29d161050d88c GIT binary patch literal 7272 zcmV-u9GBxTf*fQ50Ru3C94ZD0Duzgg_YDCD0ic2$8w7$J7chbx6EK1t4+aS;hDe6@ z4FLxRpn@C#FoGNW0s#Opf*bV)2`Yw2hW8Bt2LUh~1_~;MNQUh>vzuH2_Ru&Lj&T5O)Wyzcbu4lf z{s*HazYQH*!vxLh2Y($;}`Rl_oWK;>X<(OXJg`X#lOag(i=qW`mqGzO10; zU^tFSl~|~g@Tjnyz=ZcYmd_?%DJclS<=tQV@In{Wdm^r}+5eSL&hQBxLNpo(2@mvb zN#Kq0Wz`)qDGrqJ&-PAZ9OwV@X7G@UuPtCeeI2CWk-T%@{Lq7@+KxXd^O7?eB}Kyb z7irJcWl?nx%f|!P?`Wo^OhY-5GY=lxV}n@Q3*~wMVln1nn18q6*YX!)t*#sASd@z>!2gG^^9{cTi8tG z&Alajak`<5m1_hj0%YSR@>kR4hD0l`iquPtkzWCZHr#l;xOCuEK!Tvasb0lWcdo9| zgk2VuQtz~u)xg8**9T7h4FLwk2%lFgbIXw5tx*gI{C5Ch(X9O)1Xs2CkU}A+yzz(n59~Tw_a0;sQFICYi{$UWRshcZ{lv z3O^9@48Auw$Yx%BxE$?9LHyM64Uwf+jtttoTgrV8x|g7kh&Z`rAvXi-QSjVp=b*6X zoZx;9IEOA|ZQ^O)7c;|wV1)J#G_5>R-wZ-!mf4xWsS8TSc@Y)MvLEkOMw(QQ z164QE<`ee3F+R^pSQAs+C8g_{!>Ukxi8Z!Wy?0XP@-f#Cc-cY#r!&9{V{6FkI;FzB zzM9kEje3f)Mf)qC*Z!bDQem7E+7e%2?+TXl-IeVJn!-s!r3_^)a96oxH`hV&FCg8x zS;6<*eOVlF(%PZ!e*O>uJJ-_kBkjXu>nC?77lv{INx z-;};PV#J^EfW*s0RXo7y5+%FBJO-MRU*9JAFnlO@>2=8D`KT zf}suWo}@vF-UuXKr(}eY)5P)h%XT0FF`xf)kvW_NuHySLfL3Iv*+9^EV-o3=e#wx= zh>*MINnyAin@Y61k?W|Y|43-8k zKGv<~IJmGyTv?zz+1=`keMzv{5{f#T)-DY@dEnyJ zfK5tBp9zcEi|kgC1uZRgeE~Ul{_fqHBRqAmMKIr*O%WCux>ACEz6wu{Z0wDkKNXTVMEmN`4vY-EvRt@2u7REQ4m^zsQ z%&ptxq7NfRcz7?hhCuM(z`EV|(h*1+D+ymC_iN0#VDYls>?rkzoV04E<7s1BdU%x2{8H{z_+uyZ; zw4^jE305zOHd3tMzPnp{urlOGL!a0_rk$KA$sy2a%T!X`<>HO-Z_w;P z7b&0#=ev>6K^JhqWmfn>{sMoTk`KgNrTU*a$-T3 z_TUj4lr=j^A2Oi{R7<} z61*r)SL_gmGb!%V=9@4FZzNTm#;)Q zk|bU?Rq0G$xGP?Twl%K>vszsZdB@O>x@mZdt@+QoFR#zneTQ)CcZ?X$%IKeI z8!*#|TtbAEE%qu1ZS9^%8c=QpOT>yN=BV!ePe%||fY?AP5+sx9w|ulSf;KNZRcXTa zocZKrfWqAfd7}C@pHa_|jBBM|`W4G8^zwn~#rn%CBb(#lZ0&r@)EgMnfrAO}jt2Z4 zs)G#@(5&U#ZkQ(eV1zq$cXubZxCJOt)db*ATBc@f?SSoHGs*lW`uT{{RxY*M{8NjZ=iWxINOqCqgw5Bewf=2nL&`K3+}Yyfw`nto{$kKK zESRJE1d{@+uS_N0JJfVM&@c6p*VPuWp?L{rnaY(M>{ll+o@|s4YXo>u4ujRY6mnXxFjpIy+D22um_ge~($JVy$wbx~M!s*SF zTO0)Ltqck=qV^&({T~}sWAGNho1)Y7-MmX_-#x{>mb1*D)s*)wmL~M(52=MDUFqr~ zpx|{gVh-Hj^vD(djwvC$*+zy61L5`+`tBSP>u?|bhH9*x}Fe7>*1$|NtN^1=aW>m8y{JPgY5%0m{VHo zl+7y3!6VXi%4W=(F|5j&*kX%HmYf z^R+@~kv$2o%Tka?vX*q{Xyz>a96rt*TJt4q_BB5(nKFFT0u_Td8lkEgL02GzFEZR= z+HEb7Zj}Wqve00_qoP4?+F<#hYY(%odPmmO3LU+YXN@K`(n)E*U|QXN)gJvv;OD&u z1by@ZI`fUed8L%nlyj;|{nh17LsQP!m^80h17HMk|H>ZCUgk)^Z~~NDx|$KmD! zy?~uzWg$0zqJxz$G{k~$$?<7qi_{kClKE11c20@--ksa*7{ z7EIRvZ_=67r9(&l+;&g{ess-9=DesdT^+KQsdj#=Y4 z&^e5wc{C`4OR^CfWtgoJ^&AVkN0E>Sc;}4hS`Ab(3GvF_N||uwrkAwa!_lm};CbA}y$894pVZ)k)s5@uiI{d1hhX z(t9b;P!RB_|03`H$KIAWdSkxXoYiJqv$qh3q=l;bVAT*01#AOy5)MDrF^D4fzda`Z znLxI-)|s}PhkWKvBl_tPo*^t_;Z_*xJ-saYkxO<}DcD)VfuwRbk3nYpB>1XX%V7yH z3Z+{5rFPbR-LGGX9NXNQKrbQ`qmev5=kpVHp&D*1{kQ#m3GvZ-WLmN_S0}^Ue-72_ zrbWlw{tCvEB>)j_08uUf16o^!xtqMqr;kIny``@6S7h~3=8M0k`R z^~ln;SpjYMVwQS&J`(xmaT=3I^%{?zR`>$Lcp#Am^ltrNbri~mQcpT&@;~2lQ6eJ@j;sNQ zTtMgwmwdpYW$Slz1JoL5xvW3V)n_!?eg;oBEDYl@jyk*~w3<1gB0V`#V;>l4&X{~* zR=3O?odw(D$Znr}&0*LWAA7uD+R}bN0f47m);5hi7Oh}P(^pFPx#$w1`>0oC5`0Es zVMA|uewVr8IZ{ZIfardMJ~NH>X6;(cRqGgdxX; zIeO!p!!h&5{zQs}31SO3ud_;51%lD90?BRXefbvXn6z^3$Q>8^Ex&M2#)(b&#O>7N zk6}B$cXhiNWh2oiu)@EnYyoV4aQBw$NYaH?7#sXY_dXd*9~+pJvH*F(HHv0TNoKj$ z^=p6_@5k-YgeEa+4+W_NeHuY2m8Oikj9@QU38K>23VdZw?gue&)q}2b`bNE>?fjsz z+17u8(mDQz*Uz+n?vg@*+F-yU)9Fs(G$&d6*9twhKU&Jvbr%Pc)|q7{-te4aak0fs;ZB_Rt2QVpAXoOp+1VFpIF z+Dq(Z{RgECE&$@GYNX@f!Ii*S#K{kg$;&{QK1xvHimVp= z;pZ4ZHOgJ@n-*}C%wfRO*xbyRfDAal<{IQMKLFgPkOm7i@28vkNmX>?EJ~@fdQG zqTLd^|Bz3xv8Wy8BRBp@VB60SpG8?ndwCrDJ4L3|@i)5(EGUHyg}8ht!rB0`>q?H@ zBVW(b-lbrZGSn_CXgyAyg#>h>Z~Po%f>c4-w_hvZNtJnh{lGLT{c#Y)oNt!6(M5Nx zKPVh{wM#z8`bWX4{5(FziyM9GWI~`=j?XsNf8Wa0M~0|gdp~tXY3DJ&YWenqD!nWX zBj?Ae=N4DfMthiReX?f|tZYXk>EEsVI#pK`3*Wjc^{tB-Dj^UYPrWcPpWZl^+A;h) zMosU8f~lAJ3rG1_I#ylhPc61Y%HeZP&$;<+sA-JBh}fgPov(Cyzs6t`?Yr^M2pJ4R z+O)*&A4QVdVepDox##^%w8i)im~X2}Mjlju-wP*^&2Z%%!i@JqM1hiZw$|*wEGuUJKS10wq47xIO%(Jv}>5e*W?w zQqs^;^jv+xZt6^^pBWm>JmbX}KVHWJeQka`j{IUI@?g4kztLaF=GizWIBlWou?m*L z;POcH9%078`(SU#Fic-5vc=N9nzn$roiahjr2*5%1wGNY0!gqcn>T-RQDliz9~4N7 z+*;Zov&humE(Bg_>8R~j7tiXzS*BdnvT{nu46)5lr2alXQw;`dk5!CIE3h-ng5wU}PFNy%jgAdr`g|;i$m@7Tp1v<14t($r z*MD{P7FEIiIPzcUpA3J(46?C1aX3Y)5qf;RscTTjTR63zNZ78$OgS27`jV3UKu23H zp}G?KkR|+H!4B+Uks}?V0&x$eEAA9nC1zk2#X#3b-~^@QeN!Q?YQ!GTRU+TO;OGHf zIgnaxGR0fU8m!OIgBsgn^G#%_f1{NOBaM}f*rI!*~zdBpB?qb{gVz-6S3!||yKZTGaFYKpg?nRePUC1Xa&pdsR=9SqD7TEJe zU|Fwj4oZo%q^@0PXH|QA6&@swbC@fmq@YbygHNhbcdBNi4UR1IihVmeKGNohJRHiR z#*HYP%Rw}I8oYLif2w8@8ejtWg0dSe>-GZ3=34-)oaRs^mHoZom5~nXAT(E4%7L63 zJ!u?6hDa4xzqB%PVUPr#qPc)B1uf&rom;)FRppXp>hk($$U% zOfF*M`prd_JqyB~i?#@+m_{65tdFj@zu7_=ck|MM4hi_v685#ak|ok0dxP1lhl(5g zK*OFvxk4HuGPBoFFCYCclpW?oRcbgV&4!!fI8O=_W z(nwaBeWoJ}Zu>K55EVNU^G7^y?)R6~1T%xG9*|8O8Udsgh%;I-tc>AdIcIfa1JUT0+4Mg%WLzsaSq za}LU!LAGcenxJ8vLQw!OD6Jzj@cl6KqLRNmN%kj$7WA{G@ik~e;m{*UUDL{5<^l4~ z#9HsdN^5`AH&E|+iwQx`mTyNMKn94uMqKQe+)%t(Sn>zx!@hLvF4eTnEApenw!{dR zd`T+?N2pP|bWvDlJ55b}*c~nI(^#RUEKiN2C1i&yg4;9gU{NFZ{R-bM3xqhT<&{f5 z5)|^ag1km%GY3GIJlZ)i2zIVpxWDaBV_g8g4kb2;GAbP~z^9s;e#z#W;QMF!T^J5Ii9ZQAlLa=_ig$x*3 z`&lGDG=obiF)s!(6on&KDz)!du0XV79id`EH)(9B^3&et#He2g30OENERbltf?%u zA&sL}aU(FnCIS|S1UO3|O}9r8g3L3ti-^^D2TS-bPP|f&?H}m?kdZ$30gC$ginb!r z7r*Ro5n#x+Lkd@sQ@CkTH+gA-)?jB`Ue$_rn~#!kW@OqIBQp1$*NH83#D2hUPOhm@4UnnIz>Jnd z3qWD6+#1h*KUXO7<$t1K@t}@RXM9_Pl{7ZY2t{MX*Q-_{2*+B?K18_WJlv$%5NKfr z_N=ZNe`&k5YTIHQRQb>`DYYRKc8kuXI9yVpKxfPYmE(qs<-I6GKn@t-n=>zHVR;;P zclo8UFPWvk&`NXOlc4K_t2UbLc-uF8*yS0f5>UCEi`+~s;Z=(2EC9CTdBSRCML8k# z!t1z=(!hHN?}eHz^pfp6{`EXG@@Q|{nW>glwS}pqb|teuTlqlF&tN2X_9F3pf?WiK zu0boFK(0gHl?AQz60$$A`lu(r7UHfSnR!}t5lh2pm9ieG=?$!m3}=PufZ(o<+UMrP zlHOnmrFYughj#Sdi1*aYU+XaxOp+>YGZtXPdp6*P|H~A6Yft;0N~+?hmQ@!v^K{ro zFflM8FbM_)D-Ht!8U+9Z6f^>=ToV0tf*5 C@+GnW literal 0 HcmV?d00001 diff --git a/Crypto/testsuite/data/full.p12 b/Crypto/testsuite/data/full.p12 new file mode 100644 index 0000000000000000000000000000000000000000..a328c5b11a964a2965f294e0f365d6e24db3e683 GIT binary patch literal 5880 zcmY+IWl$V|vZY~wVS)wM;O>JYXmFRo65N9m+#Lq@;F93(9^9Sat^))ZJXmns+^XHZ z?^V~St~#f>f1V#77)tmTfQST!61D-~u!PBl-C`o5BIZH~E0CdtCI9RKFce4hzY#DO ziUa;lYf{w@0dCWzp7K(zn+0Rs^T#zF>h$YA%W_0}-}03d`wDE6JgK4TUNcB4-n zgOK$SD95?H%yksi&c(YS*^J%+U+M|oG%Q*CQf?V=LB5HzV`mVcgTxzu-NqET)23_K z_WJNTM~a8yuzKRJJLNlQl`}O``ZJ!$z@Pu1o}r;r_9sw?d8l?fIp2u2$sucq1{xSe z#k1-Hdp1~3_XD@KhjrE(u?0K5-W0(BDgg#IDe&Ljm2*E&$lQSA&Gc+m)$;I64@N`R)`P7Pj7CCZhpTkMFC9k$jV3l5xI5+vkZ zCz*m5(maO}^Cg}8M#mjV?2$Xa&`a3OYsj?mjJCR|n<%2_a%Xlh0PyWc6vNYwf9{*EU+?RD3#>t?3unSb7F zLXF;_qEg8Egb)F>GmyJx_KBc$%CZD@uz~t_klUr)-X=pL_qH|dowWJXkFlLus7TB2 zwE4OL584`EL0B4-5NF;IN4mDxMsEMcQMn0;WYu^=HoSY|YD0%^{gC>cjXk<-7f*N4 zJwxd}Dq(}s!jI*W(iaWoDtB^y+f;Gbl*IP73!7|+19r1)0V(k06cL2oJfd^vezsqU z$zhX|Y@9B$%nDnys;03)SKKeoRAj8iqbIdq3T9o_-H7ycQmWx{$V+ zK()kdFNt%eW=mlnJ#p%I4KIUTN>V)Rk}3xpb4SX?ArZuE{AweHtM@(KE_)MeoOcsm zyuUeX=b0O3KB_v1Y*pi`mnbip${SKwONnY}599kR`mRtBr2uov;q*bz)#kh6e));H zsdoZr4_XqEtw8ou&`}RnlyMj+elIW_Qln|=Pzgd&A}TceY-1c5c!Jx^yC3kSIPjFz5&Q}oq|kp=_#~hBc~|j z2;_>Gn4^v;IPFE0^T%+}o*6kbGj`xt44ONpk!bb?;F?Jfq}cb4ojRUHM2PY{sqgzQ zpsL&gFqRqrYxF}SLLV}IY*GA8@`pQ5bzvtJcqbv!I#~)A^mg%sft zAnBt*!#XNUDDK^7lDrkj$?JoA-^<7yvxJ7H_Lr{H3@e)^`~q~bqvRu8kW<3UjN>wL zBa>s+Sdo3H(Hpb~97swH+H@LDa_7FGG(L#-l>=Jw15D=PD%+Owtra2hI7rHX7QJJh z=26Z5mA5Y+AD|Uj!s+P;z#t&y6IPsXvt%H=d^=0P`885)Q4l>)W7ct4`dzkJE0UU| zIxKo9(8O$v`Y9cwxuWSK)p-5C^UM)23;6wv2d++kH+Nmg)?2XY9cJPE9u{6?zwj=C zyWMUP8>p8>^{f)`K1`9MC49+$Z_o9b{ZjV*;|_^}vnxdl`j4HThcJntJyZXZpt)r& zOb;t)(x8IeUvI|~+L5i@Q)3uL_|wd#cuicHh**|w^PpEQrx#`-DH9AIn|Pg%!KzMu z-u&5M9M%NATkKPh7JY?G#HUZlmj%kn)YWx5%`Lk1rE58CeIV1J3mgmJC0D(iRjga% zFTa~fLKQtmmsDA=o~b@dkUe5^#{C2Xr%ENmE)8s(6+nwxb05y1H|+3dtir967@Y{h zetqBNvr1S}2)mze%VOb*>tvo?4SSqYTf-xt`dmd{?wNFa`OMU&lCtSACuw}cy;RR* zZAU*pF#n4n*o!-NZ>GgfUTu8CTQjwDGT@3bh{7Q}vcQF&yNAx|9xLNp*)M$Fy8*z) zYd$w$h=}p$S+Z$NY>EwJ&}91XzENAyc&;iv+1VoC^FDQ=l=#ONsP!$$lG519~0^H;Wm9{f~_@y`goVa3-AxLgpGnq`Ynk7)c8H zHf7CK%^e*fV0iNzM_hOC!>RpYsX^Erj@*H|Ah07Q^LAWfK`b=3Fj`u7Kih2U7SI z@d@FzHID*7HgIsM(7Aci(JTg_+H;qW?elB=+(s5q@^szK=`TcMVWuk=_Q=lEK*fo4 z=gjix?C3!loO(0fsRe=ZB z$u+UUSN;59Tpm`{g2@NrKs@~BUe%v;L!H?&KzW+yJ>KB&c-rg@_*R-&>Ossxt3~vu z=soDmmWmcyTjIjDrt0jt=xb`&lDERV*DrcbSndufk@vUd%;rY9i2P?=&{Oq{W z1)i5oaiADTomW!P+{IM#LczC8f#d@M{-QJwd~kuG5>ezGz;)na^big^$X+E;dNGlt zwXX~@RcoX-A(K@_!;AzH978FHnW)|iPEqT(x<@^P+CMU7&&5cqbf>Q5-Cq{oPxz`H z0fo~42qG!oAYZnPBi1FM7xH!^LsT)M#DWH>JLcyzIeAlrISn5MwjwptZ+NVPPMdgG z)IoQ7s4_e>>V0f9E!FBel^)m9!tb?g!yitucV*0kI4K8#2I8(&ay5S72n7vk5>z7v znEo-H*2MqDGD>ofG44Mu zQ$@+G=TEqyX>;|BBpk}?m4d5VPQDov_mIY#EKSe>Sl#&@zqrZ}N;CvjO*B1beD4b& zL2(w|Z+2pEjN(f2FIkxFk(@Zcl(A~rF(7$cX#MW?)K9J1N$BRA)wGxb4v(7SpQvoU zW<83ptL{qLIE=xu12vmYkphx1p2jVr#w^y9l+jl=A9DBzph#6LY}bgD?s{2pZVCa( zz14nU#gftDq1;`3pkh!AnW#SM7WXHKf_U2OuA*F-3rj~Cp*pLO!I6jg-PosFmZ8dJ#`maMK08tBfZLF* zS~*_;%X$@8xX&8T_lyj$qahBzp%RFq36+3<>1nG_fOAQ+uYK&7q&}%FXq0X*xZ9vb zNIi8~YQnb2Lans8VYX@I9AHZ%SOlAL#=R>2md94ywU>Pd4aYBHO~O^k2Io`kJR` z{n+7@O>P=;@=W>kQ{_u1|Mf+M=Kh(Fx~HE+9yMf9Y5-%aAbd2!j9fGuA;UI!a$&9w|B zGo0+CF6!_qCR(}*9b^&nSKK72_*t=T89S_SFUH=r3s>gb4 zz4bmUizqPkr?|fSWALvGd|=3niH&!tCctiWqx2 z4|yk)ef+R2m`{$_EX&sL`^;tH1hLy1vG<}TjNas=An@fED(EX>t`2G!#prFp0*Z&L zTlSKnX|HfaK7ptc|XuCgOt||Q1DfSf(OQEOH0pPz$qHW^T*+Y7#-k9J0pAH8_LfC7aWkfh$7`!A)Xg%k9Oy}tefw?YTd8}M4kp_$9|mgL8Kgz+2Z3=%5VN1bzQ|!q zI}vvivl)EFI64C+o4)&mMdB{)3Z|0PXhBf_yo~UafPpHJlFw#GA{k>$Ce>l_%gQav z{Fm5AIegO}m`ly)ylDt`|6vpq{r>?T^cRc)>NP-fQp~) zRdsHqnu+?y?ZJ3IEI}OFMw-d3Atg0diN5E$vc+Pf)WNQ=6qickXt;)phE6&BWcxRm z4$D);(xx;BYL{EYhu$DDAebAk6FDNv%cynV5)Tb66z@&HD*J=JX6y&gk6*iAlBVUa3vn{WE))1UI4C6V2EkbjaKgi3Tj;h}Dyl56$kpztOgyA-^Ls@-(} z=2l`;eF)O`;%mL{mh;P1{vOf?{XC!;K1ut0X270{qO}!gFq7a9pY7bh?MxEgc_7y= z>FWzq?xkw8_8@%>PgC6%Ogit$|GqdTtIYW^<>+pOU?gFmI1GqtjVJ#a#abWiK~fO? zq93t+w{BDicU3CMq~`UaoswTl8Tv2|(2 zqYwD8_{2eYS-kFH;+6T)khc#w`YX<{^DXTX3ognQ<#i+o$sC4ThJA!_H@4*C!pTDE z>gm3#pp{aDb87!*CBUM_lZQrr86b(p2N885r{BnCDLy!lvtH{#e5$a2lx60}o93L7ET&nv>b5XUSM8~(>pxO_}{^umw zkJmw6??o$S&=bO)LT8NAjZb)JICARsoK;zEn#Pk?TZqe4<9yHq605d%+-e((=m>(M9o z{<6tbzWXy8fDe|`b~uFP>!#UO?#yun^-J$^vd*KQMl#8gU7t6KH7Y%(4Xn|1!(G$A z4mlKl%G6I;5N{R$vdLz`$DPsI=nmu!x=teRg8*NfV6s0N`oSUNdE;!6w4m=yBm6|M-%zH)5Pr|s6-(TRNY15PIpriQhH-Xq_M*a9i2jH0&0zosAJ&Mt zR}fuMD)*++ez>K5Qm%A0I)nqEU%cux(Fa&Ey`s4^()D1d-h1Fl{M%F2hV0CHX`U6B zZLc=kfm0zqbx|&S$YK9^O3 zrL(34L~2Nr1={UNDDb3(hUgcd*m21(PQNEC9tob)xCg|SE%^_9%Ee>A*guJpkxt+e z1C#v!c6@`+g+YOa;ErH|@b%w#focC65pWSAaddTest(CryptoTest::suite()); pSuite->addTest(RSATest::suite()); + pSuite->addTest(ECTest::suite()); pSuite->addTest(DigestEngineTest::suite()); - + pSuite->addTest(PKCS12ContainerTest::suite()); return pSuite; } diff --git a/Crypto/testsuite/src/ECTest.cpp b/Crypto/testsuite/src/ECTest.cpp new file mode 100644 index 000000000..e2aff33b0 --- /dev/null +++ b/Crypto/testsuite/src/ECTest.cpp @@ -0,0 +1,327 @@ +// +// ECTest.cpp +// +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#include "ECTest.h" +#include "CppUnit/TestCaller.h" +#include "CppUnit/TestSuite.h" +#include "Poco/Crypto/ECKey.h" +#include "Poco/Crypto/EVPPKey.h" +#include "Poco/Crypto/ECDSADigestEngine.h" +#include +#include +#include +#include + + +using namespace Poco::Crypto; + + +ECTest::ECTest(const std::string& name): CppUnit::TestCase(name) +{ +} + + +ECTest::~ECTest() +{ +} + + +void ECTest::testEVPPKey() +{ + try + { + EVPPKey* pKey = new EVPPKey("secp521r1"); + assert (pKey != 0); + assert (pKey->type() == EVP_PKEY_EC); + + BIO* bioPriv1 = BIO_new(BIO_s_mem()); + BIO* bioPub1 = BIO_new(BIO_s_mem()); + assert (0 != PEM_write_bio_PrivateKey(bioPriv1, *pKey, NULL, NULL, 0, 0, NULL)); + assert (0 != PEM_write_bio_PUBKEY(bioPub1, *pKey)); + char* pPrivData1; + long sizePriv1 = BIO_get_mem_data(bioPriv1, &pPrivData1); + char* pPubData1; + long sizePub1 = BIO_get_mem_data(bioPub1, &pPubData1); + + // construct EVPPKey from EVP_PKEY* + EVPPKey evpPKey(pKey->operator EVP_PKEY*()); + assert (evpPKey.type() == EVP_PKEY_EC); + // EVPPKey makes duplicate, so freeing the original must be ok + delete pKey; + + BIO* bioPriv2 = BIO_new(BIO_s_mem()); + BIO* bioPub2 = BIO_new(BIO_s_mem()); + assert (0 != PEM_write_bio_PrivateKey(bioPriv2, evpPKey, NULL, NULL, 0, 0, NULL)); + assert (0 != PEM_write_bio_PUBKEY(bioPub2, evpPKey)); + char* pPrivData2; + long sizePriv2 = BIO_get_mem_data(bioPriv2, &pPrivData2); + char* pPubData2; + long sizePub2 = BIO_get_mem_data(bioPub2, &pPubData2); + + assert (sizePriv1 && (sizePriv1 == sizePriv2)); + assert (0 == memcmp(pPrivData1, pPrivData2, sizePriv1)); + assert (sizePub1 && (sizePub1 == sizePub2)); + assert (0 == memcmp(pPubData1, pPubData2, sizePub1)); + + BIO_free(bioPub2); + BIO_free(bioPriv2); + + // copy + EVPPKey evpPKey2(evpPKey); + assert (evpPKey2.type() == EVP_PKEY_EC); + bioPriv2 = BIO_new(BIO_s_mem()); + bioPub2 = BIO_new(BIO_s_mem()); + assert (0 != PEM_write_bio_PrivateKey(bioPriv2, evpPKey2, NULL, NULL, 0, 0, NULL)); + assert (0 != PEM_write_bio_PUBKEY(bioPub2, evpPKey2)); + sizePriv2 = BIO_get_mem_data(bioPriv2, &pPrivData2); + sizePub2 = BIO_get_mem_data(bioPub2, &pPubData2); + + assert (sizePriv1 && (sizePriv1 == sizePriv2)); + assert (0 == memcmp(pPrivData1, pPrivData2, sizePriv1)); + assert (sizePub1 && (sizePub1 == sizePub2)); + assert (0 == memcmp(pPubData1, pPubData2, sizePub1)); + +#ifdef POCO_ENABLE_CPP11 + + BIO_free(bioPub2); + BIO_free(bioPriv2); + + // move + EVPPKey evpPKey3(std::move(evpPKey2)); + assert (evpPKey3.type() == EVP_PKEY_EC); + bioPriv2 = BIO_new(BIO_s_mem()); + bioPub2 = BIO_new(BIO_s_mem()); + assert (0 != PEM_write_bio_PrivateKey(bioPriv2, evpPKey3, NULL, NULL, 0, 0, NULL)); + assert (0 != PEM_write_bio_PUBKEY(bioPub2, evpPKey3)); + sizePriv2 = BIO_get_mem_data(bioPriv2, &pPrivData2); + sizePub2 = BIO_get_mem_data(bioPub2, &pPubData2); + + assert (sizePriv1 && (sizePriv1 == sizePriv2)); + assert (0 == memcmp(pPrivData1, pPrivData2, sizePriv1)); + assert (sizePub1 && (sizePub1 == sizePub2)); + assert (0 == memcmp(pPubData1, pPubData2, sizePub1)); +#endif POCO_ENABLE_CPP11 + + BIO_free(bioPub2); + BIO_free(bioPriv2); + BIO_free(bioPub1); + BIO_free(bioPriv1); + } + catch (Poco::Exception& ex) + { + std::cerr << ex.displayText() << std::endl; + throw; + } +} + + +void ECTest::testECNewKeys() +{ + try + { + ECKey key("secp521r1"); + std::ostringstream strPub; + std::ostringstream strPriv; + key.save(&strPub, &strPriv, "testpwd"); + std::string pubKey = strPub.str(); + std::string privKey = strPriv.str(); + + // now do the round trip + std::istringstream iPub(pubKey); + std::istringstream iPriv(privKey); + ECKey key2(&iPub, &iPriv, "testpwd"); + + std::istringstream iPriv2(privKey); + ECKey key3(0, &iPriv2, "testpwd"); + std::ostringstream strPub3; + key3.save(&strPub3); + std::string pubFromPrivate = strPub3.str(); + assert (pubFromPrivate == pubKey); + } + catch (Poco::Exception& ex) + { + std::cerr << ex.displayText() << std::endl; + throw; + } +} + + +void ECTest::testECNewKeysNoPassphrase() +{ + try + { + ECKey key("secp521r1"); + std::ostringstream strPub; + std::ostringstream strPriv; + key.save(&strPub, &strPriv); + std::string pubKey = strPub.str(); + std::string privKey = strPriv.str(); + + // now do the round trip + std::istringstream iPub(pubKey); + std::istringstream iPriv(privKey); + ECKey key2(&iPub, &iPriv); + + std::istringstream iPriv2(privKey); + ECKey key3(0, &iPriv2); + std::ostringstream strPub3; + key3.save(&strPub3); + std::string pubFromPrivate = strPub3.str(); + assert (pubFromPrivate == pubKey); + } + catch (Poco::Exception& ex) + { + std::cerr << ex.displayText() << std::endl; + throw; + } +} + + +void ECTest::testECDSASignSha256() +{ + try + { + std::string msg("Test this sign message"); + ECKey key("secp521r1"); + ECDSADigestEngine eng(key, "SHA256"); + eng.update(msg.c_str(), static_cast(msg.length())); + const Poco::DigestEngine::Digest& sig = eng.signature(); + + // verify + std::ostringstream strPub; + key.save(&strPub); + std::string pubKey = strPub.str(); + std::istringstream iPub(pubKey); + ECKey keyPub(&iPub); + ECDSADigestEngine eng2(keyPub, "SHA256"); + eng2.update(msg.c_str(), static_cast(msg.length())); + assert(eng2.verify(sig)); + } + catch (Poco::Exception& ex) + { + std::cerr << ex.displayText() << std::endl; + throw; + } +} + + +void ECTest::testECDSASignManipulated() +{ + try + { + std::string msg("Test this sign message"); + std::string msgManip("Test that sign message"); + ECKey key("secp521r1"); + ECDSADigestEngine eng(key, "SHA256"); + eng.update(msg.c_str(), static_cast(msg.length())); + const Poco::DigestEngine::Digest& sig = eng.signature(); + std::string hexDig = Poco::DigestEngine::digestToHex(sig); + + // verify + std::ostringstream strPub; + key.save(&strPub); + std::string pubKey = strPub.str(); + std::istringstream iPub(pubKey); + ECKey keyPub(&iPub); + ECDSADigestEngine eng2(keyPub, "SHA256"); + eng2.update(msgManip.c_str(), static_cast(msgManip.length())); + assert (!eng2.verify(sig)); + } + catch (Poco::Exception& ex) + { + std::cerr << ex.displayText() << std::endl; + throw; + } +} + + +void ECTest::testECCipher() +{/* + Cipher::Ptr pCipher = CipherFactory::defaultFactory().createCipher(ECKey(ECKey::KL_1024, ECKey::EXP_SMALL)); + for (std::size_t n = 1; n <= 1200; n++) + { + std::string val(n, 'x'); + std::string enc = pCipher->encryptString(val); + std::string dec = pCipher->decryptString(enc); + assert (dec == val); + } +*/} + + +void ECTest::testECCipherLarge() +{/* + std::vector sizes; + sizes.push_back (2047); + sizes.push_back (2048); + sizes.push_back (2049); + sizes.push_back (4095); + sizes.push_back (4096); + sizes.push_back (4097); + sizes.push_back (8191); + sizes.push_back (8192); + sizes.push_back (8193); + sizes.push_back (16383); + sizes.push_back (16384); + sizes.push_back (16385); + + Cipher::Ptr pCipher = CipherFactory::defaultFactory().createCipher(ECKey(ECKey::KL_1024, ECKey::EXP_SMALL)); + for (std::vector::const_iterator it = sizes.begin(); it != sizes.end(); ++it) + { + std::string val(*it, 'x'); + std::string enc = pCipher->encryptString(val); + std::string dec = pCipher->decryptString(enc); + assert (dec == val); + } +*/} + + +void ECTest::testECCertificate() +{/* + std::istringstream str(anyPem); + X509Certificate cert(str); + ECKey publicKey(cert); + std::istringstream str2(anyPem); + ECKey privateKey(0, &str2, "test"); + Cipher::Ptr pCipher = CipherFactory::defaultFactory().createCipher(publicKey); + Cipher::Ptr pCipher2 = CipherFactory::defaultFactory().createCipher(privateKey); + std::string val("lets do some encryption"); + + std::string enc = pCipher->encryptString(val); + std::string dec = pCipher2->decryptString(enc); + assert (dec == val); +*/} + + +void ECTest::setUp() +{ +} + + +void ECTest::tearDown() +{ +} + + +CppUnit::Test* ECTest::suite() +{ + CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ECTest"); + + CppUnit_addTest(pSuite, ECTest, testEVPPKey); + CppUnit_addTest(pSuite, ECTest, testECNewKeys); + CppUnit_addTest(pSuite, ECTest, testECNewKeysNoPassphrase); + CppUnit_addTest(pSuite, ECTest, testECDSASignSha256); + CppUnit_addTest(pSuite, ECTest, testECDSASignManipulated); + CppUnit_addTest(pSuite, ECTest, testECCipher); + CppUnit_addTest(pSuite, ECTest, testECCipherLarge); + CppUnit_addTest(pSuite, ECTest, testECCertificate); + + return pSuite; +} diff --git a/Crypto/testsuite/src/ECTest.h b/Crypto/testsuite/src/ECTest.h new file mode 100644 index 000000000..5bef22193 --- /dev/null +++ b/Crypto/testsuite/src/ECTest.h @@ -0,0 +1,46 @@ +// +// ECTest.h +// +// +// Definition of the ECTest class. +// +// Copyright (c) 2008, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#ifndef ECTest_INCLUDED +#define ECTest_INCLUDED + + +#include "Poco/Crypto/Crypto.h" +#include "CppUnit/TestCase.h" + + +class ECTest: public CppUnit::TestCase +{ +public: + ECTest(const std::string& name); + ~ECTest(); + + void testEVPPKey(); + void testECNewKeys(); + void testECNewKeysNoPassphrase(); + void testECDSASignSha256(); + void testECDSASignManipulated(); + void testECCipher(); + void testECCipherLarge(); + void testECCertificate(); + + void setUp(); + void tearDown(); + + static CppUnit::Test* suite(); + +private: +}; + + +#endif // ECTest_INCLUDED diff --git a/Crypto/testsuite/src/PKCS12ContainerTest.cpp b/Crypto/testsuite/src/PKCS12ContainerTest.cpp new file mode 100644 index 000000000..c7f20324f --- /dev/null +++ b/Crypto/testsuite/src/PKCS12ContainerTest.cpp @@ -0,0 +1,244 @@ +// +// PKCS12ContainerTest.cpp +// +// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#include "PKCS12ContainerTest.h" +#include "CppUnit/TestCaller.h" +#include "CppUnit/TestSuite.h" +#include "Poco/Crypto/X509Certificate.h" +#include "Poco/Crypto/PKCS12Container.h" +#include "Poco/Environment.h" +#include "Poco/Path.h" +#include "Poco/File.h" +#include +#include +#include + + +using Poco::Crypto::PKCS12Container; +using Poco::Crypto::X509Certificate; +using Poco::Environment; +using Poco::Path; +using Poco::File; + + +PKCS12ContainerTest::PKCS12ContainerTest(const std::string& name): CppUnit::TestCase(name) +{ +} + + +PKCS12ContainerTest::~PKCS12ContainerTest() +{ +} + + +void PKCS12ContainerTest::testFullPKCS12() +{ + try + { + std::string file = getTestFilesPath("full"); + full(PKCS12Container(file.c_str(), "crypto")); + + std::ifstream ifs(file.c_str(), std::ios::binary); + full(PKCS12Container(ifs, "crypto")); + } + catch (Poco::Exception& ex) + { + std::cerr << ex.displayText() << std::endl; + throw; + } +} + + +void PKCS12ContainerTest::full(const PKCS12Container& pkcs12) +{ + assert ("vally" == pkcs12.getFriendlyName()); + + assert (pkcs12.hasKey()); + assert (pkcs12.hasX509Certificate()); + X509Certificate x509 = pkcs12.getX509Certificate(); + + std::string subjectName(x509.subjectName()); + std::string issuerName(x509.issuerName()); + std::string commonName(x509.commonName()); + std::string country(x509.subjectName(X509Certificate::NID_COUNTRY)); + std::string localityName(x509.subjectName(X509Certificate::NID_LOCALITY_NAME)); + std::string stateOrProvince(x509.subjectName(X509Certificate::NID_STATE_OR_PROVINCE)); + std::string organizationName(x509.subjectName(X509Certificate::NID_ORGANIZATION_NAME)); + std::string organizationUnitName(x509.subjectName(X509Certificate::NID_ORGANIZATION_UNIT_NAME)); + std::string emailAddress(x509.subjectName(X509Certificate::NID_PKCS9_EMAIL_ADDRESS)); + std::string serialNumber(x509.subjectName(X509Certificate::NID_SERIAL_NUMBER)); + + assert (subjectName == "/C=CH/ST=Zug/O=Crypto Vally/CN=CV Server"); + assert (issuerName == "/C=CH/ST=Zug/O=Crypto Vally/CN=CV Intermediate CA v3"); + assert (commonName == "CV Server"); + assert (country == "CH"); + assert (localityName.empty()); + assert (stateOrProvince == "Zug"); + assert (organizationName == "Crypto Vally"); + assert (organizationUnitName.empty()); + assert (emailAddress.empty()); + assert (serialNumber.empty()); + + PKCS12Container::CAList caList = pkcs12.getCACerts(); + assert (2 == caList.size()); + + assert (caList[0].subjectName() == "/C=CH/ST=Zug/O=Crypto Vally/CN=CV Root CA v3"); + assert (caList[0].issuerName() == "/C=CH/ST=Zug/O=Crypto Vally/CN=CV Root CA v3"); + assert (caList[0].commonName() == "CV Root CA v3"); + assert (caList[0].subjectName(X509Certificate::NID_COUNTRY) == "CH"); + assert (caList[0].subjectName(X509Certificate::NID_LOCALITY_NAME).empty()); + assert (caList[0].subjectName(X509Certificate::NID_STATE_OR_PROVINCE) == "Zug"); + assert (caList[0].subjectName(X509Certificate::NID_ORGANIZATION_NAME) == "Crypto Vally"); + assert (caList[0].subjectName(X509Certificate::NID_ORGANIZATION_UNIT_NAME).empty()); + assert (caList[0].subjectName(X509Certificate::NID_PKCS9_EMAIL_ADDRESS).empty()); + assert (caList[0].subjectName(X509Certificate::NID_SERIAL_NUMBER).empty()); + + assert (caList[1].subjectName() == "/C=CH/ST=Zug/O=Crypto Vally/CN=CV Intermediate CA v3"); + assert (caList[1].issuerName() == "/C=CH/ST=Zug/O=Crypto Vally/CN=CV Root CA v3"); + assert (caList[1].commonName() == "CV Intermediate CA v3"); + assert (caList[1].subjectName(X509Certificate::NID_COUNTRY) == "CH"); + assert (caList[1].subjectName(X509Certificate::NID_LOCALITY_NAME).empty()); + assert (caList[1].subjectName(X509Certificate::NID_STATE_OR_PROVINCE) == "Zug"); + assert (caList[1].subjectName(X509Certificate::NID_ORGANIZATION_NAME) == "Crypto Vally"); + assert (caList[1].subjectName(X509Certificate::NID_ORGANIZATION_UNIT_NAME).empty()); + assert (caList[1].subjectName(X509Certificate::NID_PKCS9_EMAIL_ADDRESS).empty()); + assert (caList[1].subjectName(X509Certificate::NID_SERIAL_NUMBER).empty()); +} + + +void PKCS12ContainerTest::testCertsOnlyPKCS12() +{ + try + { + std::string file = getTestFilesPath("certs-only"); + certsOnly(PKCS12Container(file.c_str(), "crypto")); + + std::ifstream ifs(file.c_str(), std::ios::binary); + certsOnly(PKCS12Container(ifs, "crypto")); + } + catch (Poco::Exception& ex) + { + std::cerr << ex.displayText() << std::endl; + throw; + } +} + + +void PKCS12ContainerTest::certsOnly(const PKCS12Container& pkcs12) +{ + assert (!pkcs12.hasKey()); + assert (!pkcs12.hasX509Certificate()); + + PKCS12Container::CAList caList = pkcs12.getCACerts(); + + assert (5 == caList.size()); + + assert (caList[0].subjectName() == "/C=US/O=Let's Encrypt/CN=Let's Encrypt Authority X3"); + assert (caList[0].issuerName() == "/C=US/O=Internet Security Research Group/CN=ISRG Root X1"); + assert (caList[0].commonName() == "Let's Encrypt Authority X3"); + assert (caList[0].subjectName(X509Certificate::NID_COUNTRY) == "US"); + assert (caList[0].subjectName(X509Certificate::NID_LOCALITY_NAME).empty()); + assert (caList[0].subjectName(X509Certificate::NID_STATE_OR_PROVINCE).empty()); + assert (caList[0].subjectName(X509Certificate::NID_ORGANIZATION_NAME) == "Let's Encrypt"); + assert (caList[0].subjectName(X509Certificate::NID_ORGANIZATION_UNIT_NAME).empty()); + assert (caList[0].subjectName(X509Certificate::NID_PKCS9_EMAIL_ADDRESS).empty()); + assert (caList[0].subjectName(X509Certificate::NID_SERIAL_NUMBER).empty()); + + assert (caList[1].subjectName() == "/C=US/O=Let's Encrypt/CN=Let's Encrypt Authority X3"); + assert (caList[1].issuerName() == "/O=Digital Signature Trust Co./CN=DST Root CA X3"); + assert (caList[1].commonName() == "Let's Encrypt Authority X3"); + assert (caList[1].subjectName(X509Certificate::NID_COUNTRY) == "US"); + assert (caList[1].subjectName(X509Certificate::NID_LOCALITY_NAME).empty()); + assert (caList[1].subjectName(X509Certificate::NID_STATE_OR_PROVINCE).empty()); + assert (caList[1].subjectName(X509Certificate::NID_ORGANIZATION_NAME) == "Let's Encrypt"); + assert (caList[1].subjectName(X509Certificate::NID_ORGANIZATION_UNIT_NAME).empty()); + assert (caList[1].subjectName(X509Certificate::NID_PKCS9_EMAIL_ADDRESS).empty()); + assert (caList[1].subjectName(X509Certificate::NID_SERIAL_NUMBER).empty()); + + assert (caList[2].subjectName() == "/C=US/O=Internet Security Research Group/CN=ISRG Root X1"); + assert (caList[2].issuerName() == "/C=US/O=Internet Security Research Group/CN=ISRG Root X1"); + assert (caList[2].commonName() == "ISRG Root X1"); + assert (caList[2].subjectName(X509Certificate::NID_COUNTRY) == "US"); + assert (caList[2].subjectName(X509Certificate::NID_LOCALITY_NAME).empty()); + assert (caList[2].subjectName(X509Certificate::NID_STATE_OR_PROVINCE).empty()); + assert (caList[2].subjectName(X509Certificate::NID_ORGANIZATION_NAME) == "Internet Security Research Group"); + assert (caList[2].subjectName(X509Certificate::NID_ORGANIZATION_UNIT_NAME).empty()); + assert (caList[2].subjectName(X509Certificate::NID_PKCS9_EMAIL_ADDRESS).empty()); + assert (caList[2].subjectName(X509Certificate::NID_SERIAL_NUMBER).empty()); + + assert (caList[3].subjectName() == "/C=CH/ST=Zug/O=Crypto Vally/CN=CV Root CA v3"); + assert (caList[3].issuerName() == "/C=CH/ST=Zug/O=Crypto Vally/CN=CV Root CA v3"); + assert (caList[3].commonName() == "CV Root CA v3"); + assert (caList[3].subjectName(X509Certificate::NID_COUNTRY) == "CH"); + assert (caList[3].subjectName(X509Certificate::NID_LOCALITY_NAME).empty()); + assert (caList[3].subjectName(X509Certificate::NID_STATE_OR_PROVINCE) == "Zug"); + assert (caList[3].subjectName(X509Certificate::NID_ORGANIZATION_NAME) == "Crypto Vally"); + assert (caList[3].subjectName(X509Certificate::NID_ORGANIZATION_UNIT_NAME).empty()); + assert (caList[3].subjectName(X509Certificate::NID_PKCS9_EMAIL_ADDRESS).empty()); + assert (caList[3].subjectName(X509Certificate::NID_SERIAL_NUMBER).empty()); + + assert (caList[4].subjectName() == "/C=CH/ST=Zug/O=Crypto Vally/CN=CV Intermediate CA v3"); + assert (caList[4].issuerName() == "/C=CH/ST=Zug/O=Crypto Vally/CN=CV Root CA v3"); + assert (caList[4].commonName() == "CV Intermediate CA v3"); + assert (caList[4].subjectName(X509Certificate::NID_COUNTRY) == "CH"); + assert (caList[4].subjectName(X509Certificate::NID_LOCALITY_NAME).empty()); + assert (caList[4].subjectName(X509Certificate::NID_STATE_OR_PROVINCE) == "Zug"); + assert (caList[4].subjectName(X509Certificate::NID_ORGANIZATION_NAME) == "Crypto Vally"); + assert (caList[4].subjectName(X509Certificate::NID_ORGANIZATION_UNIT_NAME).empty()); + assert (caList[4].subjectName(X509Certificate::NID_PKCS9_EMAIL_ADDRESS).empty()); + assert (caList[4].subjectName(X509Certificate::NID_SERIAL_NUMBER).empty()); + +} + + +void PKCS12ContainerTest::setUp() +{ +} + + +void PKCS12ContainerTest::tearDown() +{ +} + + +std::string PKCS12ContainerTest::getTestFilesPath(const std::string& name) +{ + std::ostringstream ostr; + ostr << "data/" << name << ".p12"; + std::string fileName(ostr.str()); + Poco::Path path(fileName); + if (Poco::File(path).exists()) + { + return fileName; + } + + ostr.str(""); + ostr << "/Crypto/testsuite/data/" << name << ".p12"; + fileName = Poco::Environment::get("POCO_BASE") + ostr.str(); + path = fileName; + + if (!Poco::File(path).exists()) + { + std::cerr << "Can't find " << fileName << std::endl; + throw Poco::NotFoundException("cannot locate directory containing valid Crypto test files"); + } + return fileName; +} + + +CppUnit::Test* PKCS12ContainerTest::suite() +{ + CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("PKCS12ContainerTest"); + + CppUnit_addTest(pSuite, PKCS12ContainerTest, testFullPKCS12); + CppUnit_addTest(pSuite, PKCS12ContainerTest, testCertsOnlyPKCS12); + + return pSuite; +} diff --git a/Crypto/testsuite/src/PKCS12ContainerTest.h b/Crypto/testsuite/src/PKCS12ContainerTest.h new file mode 100644 index 000000000..00bf4fcd6 --- /dev/null +++ b/Crypto/testsuite/src/PKCS12ContainerTest.h @@ -0,0 +1,48 @@ +// +// PKCS12ContainerTest.h +// +// Definition of the PKCS12ContainerTest class. +// +// Copyright (c) 2012, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// SPDX-License-Identifier: BSL-1.0 +// + + +#ifndef PKCS12ContainerTest_INCLUDED +#define PKCS12ContainerTest_INCLUDED + + +#include "Poco/Crypto/Crypto.h" +#include "CppUnit/TestCase.h" + + +namespace Poco { +namespace Crypto { + class PKCS12Container; +} +} + +class PKCS12ContainerTest: public CppUnit::TestCase +{ +public: + PKCS12ContainerTest(const std::string& name); + ~PKCS12ContainerTest(); + + void testFullPKCS12(); + void testCertsOnlyPKCS12(); + + void setUp(); + void tearDown(); + + static CppUnit::Test* suite(); + +private: + std::string getTestFilesPath(const std::string& name); + void certsOnly(const Poco::Crypto::PKCS12Container& pkcs12); + void full(const Poco::Crypto::PKCS12Container& pkcs12); +}; + + +#endif // PKCS12ContainerTest_INCLUDED diff --git a/ProGen/src/ProGen.cpp b/ProGen/src/ProGen.cpp index 38c7254d7..1cbe899cc 100644 --- a/ProGen/src/ProGen.cpp +++ b/ProGen/src/ProGen.cpp @@ -717,6 +717,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); @@ -739,6 +740,16 @@ protected: 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()) { @@ -953,6 +964,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); } }