mirrors/FreeRDP
0
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2024-12-03 14:53:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4979 from hardening/CAL

Browse Source 
license: support CAL license
This commit is contained in:
akallabeth 2018-11-14 13:45:31 +01:00 committed by GitHub
commit 268a2c0cf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 581 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/common/cmdline.c
View File

@ -2688,6 +2688,10 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
settings->DesktopOrientation = val;
}
CommandLineSwitchCase(arg, "old-license")
{
settings->OldLicenseBehaviour = TRUE;
}
CommandLineSwitchCase(arg, "scale")
{
unsigned long scaleFactor = strtoul(arg->Value, NULL, 0);

1
client/common/cmdline.h
View File

@ -126,6 +126,7 @@ static COMMAND_LINE_ARGUMENT_A args[] =
{ "nsc", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, "nscodec", "NSCodec support" },
{ "offscreen-cache", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueTrue, NULL, -1, NULL, "offscreen bitmap cache" },
{ "orientation", COMMAND_LINE_VALUE_REQUIRED, "0|90|180|270", NULL, NULL, -1, NULL, "Orientation of display in degrees" },
{ "old-license", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueFalse, NULL, -1, NULL, "Use the old license workflow (no CAL and hwId set to 0)"},
{ "p", COMMAND_LINE_VALUE_REQUIRED, "<password>", NULL, NULL, -1, NULL, "Password" },
{ "parallel", COMMAND_LINE_VALUE_OPTIONAL, "<name>[,<path>]", NULL, NULL, -1, NULL, "Redirect parallel device" },
{ "parent-window", COMMAND_LINE_VALUE_REQUIRED, "<window-id>", NULL, NULL, -1, NULL, "Parent window id" },

3
include/freerdp/settings.h
View File

@ -1173,7 +1173,8 @@ struct rdp_settings
ALIGN64 BOOL AuthenticationOnly; /* 1603 */
ALIGN64 BOOL CredentialsFromStdin; /* 1604 */
ALIGN64 BOOL UnmapButtons; /* 1605 */
UINT64 padding1664[1664 - 1606]; /* 1606 */
ALIGN64 BOOL OldLicenseBehaviour; /* 1606 */
UINT64 padding1664[1664 - 1607]; /* 1607 */
/* Names */
ALIGN64 char* ComputerName; /* 1664 */

826
libfreerdp/core/license.c
View File

File diff suppressed because it is too large Load Diff

1
libfreerdp/core/license.h
View File

@ -196,6 +196,7 @@ struct rdp_license
LICENSE_BLOB* PlatformChallenge;
LICENSE_BLOB* EncryptedPremasterSecret;
LICENSE_BLOB* EncryptedPlatformChallenge;
LICENSE_BLOB *EncryptedPlatformChallengeResponse;
LICENSE_BLOB* EncryptedHardwareId;
SCOPE_LIST* ScopeList;
UINT32 PacketHeaderLength;