Skip to content

Commit bce73e2

Browse files
smasherprogsmasherprog
committed
Removed crypopp source
Added nuget package
1 parent a43ae2a commit bce73e2

File tree

298 files changed

+92
-87246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+92
-87246
lines changed

Diff for: ‎RemoteDesktopServer.sln

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0
2+
# Visual Studio 14
3+
VisualStudioVersion = 14.0.24720.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteDesktop_Library", "RemoteDesktop_Library\RemoteDesktop_Library.vcxproj", "{D75E5AD6-EE2A-46CE-8EAF-9BD3D5777B37}"
66
EndProject
7-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "cryptopp\cryptlib.vcxproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}"
8-
EndProject
97
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteDesktop_ServerP2P", "RemoteDesktop_ServerP2P\RemoteDesktop_ServerP2P.vcxproj", "{A7E8BD14-EB3F-4CEA-876B-790218414B70}"
108
EndProject
119
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteDesktop_ServerGateway", "RemoteDesktop_ServerGateway\RemoteDesktop_ServerGateway.vcxproj", "{0A233DF0-1595-4E67-A13B-791A5247F0AB}"
@@ -31,14 +29,6 @@ Global
3129
{D75E5AD6-EE2A-46CE-8EAF-9BD3D5777B37}.Release|Win32.Build.0 = Release|Win32
3230
{D75E5AD6-EE2A-46CE-8EAF-9BD3D5777B37}.Release|x64.ActiveCfg = Release|x64
3331
{D75E5AD6-EE2A-46CE-8EAF-9BD3D5777B37}.Release|x64.Build.0 = Release|x64
34-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32
35-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.Build.0 = Debug|Win32
36-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.ActiveCfg = Debug|x64
37-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.Build.0 = Debug|x64
38-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.ActiveCfg = Release|Win32
39-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.Build.0 = Release|Win32
40-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.ActiveCfg = Release|x64
41-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.Build.0 = Release|x64
4232
{A7E8BD14-EB3F-4CEA-876B-790218414B70}.Debug|Win32.ActiveCfg = Debug|Win32
4333
{A7E8BD14-EB3F-4CEA-876B-790218414B70}.Debug|Win32.Build.0 = Debug|Win32
4434
{A7E8BD14-EB3F-4CEA-876B-790218414B70}.Debug|x64.ActiveCfg = Debug|x64

Diff for: ‎RemoteDesktopServer_Library/RemoteDesktopServer_Library.vcxproj

+10
Original file line numberDiff line numberDiff line change
@@ -264,11 +264,21 @@
264264
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
265265
<ImportGroup Label="ExtensionTargets">
266266
<Import Project="..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets" Condition="Exists('..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets')" />
267+
<Import Project="..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.targets" Condition="Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.targets')" />
268+
<Import Project="..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.targets" Condition="Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.targets')" />
269+
<Import Project="..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.targets" Condition="Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.targets')" />
270+
<Import Project="..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.targets" Condition="Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.targets')" />
271+
<Import Project="..\packages\cryptopp.5.6.3.2\build\native\cryptopp.targets" Condition="Exists('..\packages\cryptopp.5.6.3.2\build\native\cryptopp.targets')" />
267272
</ImportGroup>
268273
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
269274
<PropertyGroup>
270275
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
271276
</PropertyGroup>
272277
<Error Condition="!Exists('..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets'))" />
278+
<Error Condition="!Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.targets'))" />
279+
<Error Condition="!Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.targets'))" />
280+
<Error Condition="!Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.targets'))" />
281+
<Error Condition="!Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.targets'))" />
282+
<Error Condition="!Exists('..\packages\cryptopp.5.6.3.2\build\native\cryptopp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.5.6.3.2\build\native\cryptopp.targets'))" />
273283
</Target>
274284
</Project>

Diff for: ‎RemoteDesktopServer_Library/packages.config

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="cryptopp" version="5.6.3.2" targetFramework="native" />
4+
<package id="cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32" version="5.6.3" targetFramework="native" />
5+
<package id="cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64" version="5.6.3" targetFramework="native" />
6+
<package id="cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32" version="5.6.3" targetFramework="native" />
7+
<package id="cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64" version="5.6.3" targetFramework="native" />
38
<package id="Libjpeg-Turbo" version="1.4.2.15" targetFramework="native" />
49
</packages>

Diff for: ‎RemoteDesktopViewer.sln

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0
2+
# Visual Studio 14
3+
VisualStudioVersion = 14.0.24720.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteDesktopViewer_Library", "RemoteDesktopViewer_Library\RemoteDesktopViewer_Library.vcxproj", "{02BCCAAD-CF8A-4FA9-A5CB-4947F2FD472A}"
66
ProjectSection(ProjectDependencies) = postProject
@@ -9,8 +9,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteDesktopViewer_Library
99
EndProject
1010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteDesktop_Library", "RemoteDesktop_Library\RemoteDesktop_Library.vcxproj", "{D75E5AD6-EE2A-46CE-8EAF-9BD3D5777B37}"
1111
EndProject
12-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "cryptopp\cryptlib.vcxproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}"
13-
EndProject
1412
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RemoteDesktop_Viewer", "RemoteDesktop_Viewer\RemoteDesktop_Viewer.csproj", "{A943BA20-DC1C-46E3-9DF7-69B716A60B6C}"
1513
ProjectSection(ProjectDependencies) = postProject
1614
{02BCCAAD-CF8A-4FA9-A5CB-4947F2FD472A} = {02BCCAAD-CF8A-4FA9-A5CB-4947F2FD472A}
@@ -42,14 +40,6 @@ Global
4240
{D75E5AD6-EE2A-46CE-8EAF-9BD3D5777B37}.Release|Win32.Build.0 = Release|Win32
4341
{D75E5AD6-EE2A-46CE-8EAF-9BD3D5777B37}.Release|x64.ActiveCfg = Release|x64
4442
{D75E5AD6-EE2A-46CE-8EAF-9BD3D5777B37}.Release|x64.Build.0 = Release|x64
45-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32
46-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.Build.0 = Debug|Win32
47-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.ActiveCfg = Debug|x64
48-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.Build.0 = Debug|x64
49-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.ActiveCfg = Release|Win32
50-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.Build.0 = Release|Win32
51-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.ActiveCfg = Release|x64
52-
{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.Build.0 = Release|x64
5343
{A943BA20-DC1C-46E3-9DF7-69B716A60B6C}.Debug|Win32.ActiveCfg = Debug|x86
5444
{A943BA20-DC1C-46E3-9DF7-69B716A60B6C}.Debug|Win32.Build.0 = Debug|x86
5545
{A943BA20-DC1C-46E3-9DF7-69B716A60B6C}.Debug|x64.ActiveCfg = Debug|x64

Diff for: ‎RemoteDesktopViewer_Library/RemoteDesktopViewer_Library.vcxproj

+10
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,21 @@
203203
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
204204
<ImportGroup Label="ExtensionTargets">
205205
<Import Project="..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets" Condition="Exists('..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets')" />
206+
<Import Project="..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.targets" Condition="Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.targets')" />
207+
<Import Project="..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.targets" Condition="Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.targets')" />
208+
<Import Project="..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.targets" Condition="Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.targets')" />
209+
<Import Project="..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.targets" Condition="Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.targets')" />
210+
<Import Project="..\packages\cryptopp.5.6.3.2\build\native\cryptopp.targets" Condition="Exists('..\packages\cryptopp.5.6.3.2\build\native\cryptopp.targets')" />
206211
</ImportGroup>
207212
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
208213
<PropertyGroup>
209214
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
210215
</PropertyGroup>
211216
<Error Condition="!Exists('..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets'))" />
217+
<Error Condition="!Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.targets'))" />
218+
<Error Condition="!Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.targets'))" />
219+
<Error Condition="!Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.targets'))" />
220+
<Error Condition="!Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.targets'))" />
221+
<Error Condition="!Exists('..\packages\cryptopp.5.6.3.2\build\native\cryptopp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.5.6.3.2\build\native\cryptopp.targets'))" />
212222
</Target>
213223
</Project>

Diff for: ‎RemoteDesktopViewer_Library/packages.config

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="cryptopp" version="5.6.3.2" targetFramework="native" />
4+
<package id="cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32" version="5.6.3" targetFramework="native" />
5+
<package id="cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64" version="5.6.3" targetFramework="native" />
6+
<package id="cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32" version="5.6.3" targetFramework="native" />
7+
<package id="cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64" version="5.6.3" targetFramework="native" />
38
<package id="Libjpeg-Turbo" version="1.4.2.15" targetFramework="native" />
49
</packages>

Diff for: ‎RemoteDesktop_Library/Encryption.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ using CryptoPP::GCM;
1616
using CryptoPP::OID;
1717
using namespace CryptoPP::ASN1;
1818

19-
#include "..\cryptopp\fhmqv.h"
20-
#include "..\cryptopp\eccrypto.h"
19+
#include "fhmqv.h"
20+
#include "cryptopp/eccrypto.h"
2121
using CryptoPP::ECP;
2222
using CryptoPP::FHMQV;
2323

24-
#include "..\cryptopp\secblock.h"
24+
#include "cryptopp/secblock.h"
2525
using CryptoPP::SecByteBlock;
2626

2727
namespace RemoteDesktop{

Diff for: ‎RemoteDesktop_Library/RemoteDesktop_Library.vcxproj

+10-5
Original file line numberDiff line numberDiff line change
@@ -290,22 +290,27 @@
290290
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
291291
</ClCompile>
292292
</ItemGroup>
293-
<ItemGroup>
294-
<ProjectReference Include="..\cryptopp\cryptlib.vcxproj">
295-
<Project>{3423ec9a-52e4-4a4d-9753-edebc38785ef}</Project>
296-
</ProjectReference>
297-
</ItemGroup>
298293
<ItemGroup>
299294
<None Include="packages.config" />
300295
</ItemGroup>
301296
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
302297
<ImportGroup Label="ExtensionTargets">
303298
<Import Project="..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets" Condition="Exists('..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets')" />
299+
<Import Project="..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.targets" Condition="Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.targets')" />
300+
<Import Project="..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.targets" Condition="Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.targets')" />
301+
<Import Project="..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.targets" Condition="Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.targets')" />
302+
<Import Project="..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.targets" Condition="Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.targets')" />
303+
<Import Project="..\packages\cryptopp.5.6.3.2\build\native\cryptopp.targets" Condition="Exists('..\packages\cryptopp.5.6.3.2\build\native\cryptopp.targets')" />
304304
</ImportGroup>
305305
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
306306
<PropertyGroup>
307307
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
308308
</PropertyGroup>
309309
<Error Condition="!Exists('..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets'))" />
310+
<Error Condition="!Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-Win32.targets'))" />
311+
<Error Condition="!Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-dyn-x64.targets'))" />
312+
<Error Condition="!Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-Win32.targets'))" />
313+
<Error Condition="!Exists('..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.5.6.3\build\native\cryptopp.v140.windesktop.msvcstl.dyn.rt-static-x64.targets'))" />
314+
<Error Condition="!Exists('..\packages\cryptopp.5.6.3.2\build\native\cryptopp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cryptopp.5.6.3.2\build\native\cryptopp.targets'))" />
310315
</Target>
311316
</Project>

Diff for: ‎cryptopp/fhmqv.h renamed to ‎RemoteDesktop_Library/fhmqv.h

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#ifndef CRYPTOPP_FHMQV_H
22
#define CRYPTOPP_FHMQV_H
33

4-
#include "gfpcrypt.h"
5-
#include "algebra.h"
6-
#include "sha.h"
4+
#include "cryptopp/gfpcrypt.h"
5+
#include "cryptopp/algebra.h"
6+
#include "cryptopp/sha.h"
7+
#include "cryptopp/eccrypto.h"
78
#include <assert.h>
89

910
NAMESPACE_BEGIN(CryptoPP)
@@ -274,6 +275,12 @@ class FHMQV_Domain : public AuthenticatedKeyAgreementDomain
274275

275276
typedef FHMQV_Domain<DL_GroupParameters_GFP_DefaultSafePrime> FullyHashedMQV;
276277

278+
template <class EC, class COFACTOR_OPTION = CPP_TYPENAME DL_GroupParameters_EC<EC>::DefaultCofactorOption, class HASH = SHA256>
279+
struct FHMQV
280+
{
281+
typedef FHMQV_Domain<DL_GroupParameters_EC<EC>, COFACTOR_OPTION, HASH> Domain;
282+
};
283+
277284
NAMESPACE_END
278285

279286
#endif

0 commit comments

Comments
 (0)