mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4143 from bmiklautz/pass_is_sc_pin

Browse Source 
Add support for "password is pin"
This commit is contained in:
David Fort 2017-09-25 09:09:55 +02:00 committed by GitHub
commit db3fe812b3
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/common/cmdline.c
View File

@ -196,6 +196,7 @@ static COMMAND_LINE_ARGUMENT_A args[] =
{ "scale-desktop", COMMAND_LINE_VALUE_REQUIRED, "<scale amount (%%)>", "100", NULL, -1, NULL, "Scaling factor for desktop applications (value between 100 and 500)" }, { "scale-desktop", COMMAND_LINE_VALUE_REQUIRED, "<scale amount (%%)>", "100", NULL, -1, NULL, "Scaling factor for desktop applications (value between 100 and 500)" },
{ "scale-device", COMMAND_LINE_VALUE_REQUIRED, "<scale amount (%%)>", "100", NULL, -1, NULL, "Scaling factor for app store applications (100, 140, or 180)" }, { "scale-device", COMMAND_LINE_VALUE_REQUIRED, "<scale amount (%%)>", "100", NULL, -1, NULL, "Scaling factor for app store applications (100, 140, or 180)" },
{ "action-script", COMMAND_LINE_VALUE_REQUIRED, "<file name>", "~/.config/freerdp/action.sh", NULL, -1, NULL, "Action script" }, { "action-script", COMMAND_LINE_VALUE_REQUIRED, "<file name>", "~/.config/freerdp/action.sh", NULL, -1, NULL, "Action script" },
{ "password-is-pin", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueFalse, NULL, -1, NULL, "Use smart card authentication with password as smart card PIN"},
{ NULL, 0, NULL, NULL, NULL, -1, NULL, NULL } { NULL, 0, NULL, NULL, NULL, -1, NULL, NULL }
}; };
@ -1000,6 +1001,10 @@ static int freerdp_client_command_line_post_filter(void* context,
settings->MultitransportFlags = (TRANSPORT_TYPE_UDP_FECR | settings->MultitransportFlags = (TRANSPORT_TYPE_UDP_FECR |
TRANSPORT_TYPE_UDP_FECL | TRANSPORT_TYPE_UDP_PREFERRED); TRANSPORT_TYPE_UDP_FECL | TRANSPORT_TYPE_UDP_PREFERRED);
} }
CommandLineSwitchCase(arg, "password-is-pin")
{
settings->PasswordIsSmartcardPin = TRUE;
}
CommandLineSwitchEnd(arg) CommandLineSwitchEnd(arg)
return status ? 1 : 0; return status ? 1 : 0;
} }

3
libfreerdp/core/info.c
View File

@ -675,6 +675,9 @@ static void rdp_write_info_packet(rdpRdp* rdp, wStream* s)
if (settings->LogonNotify) if (settings->LogonNotify)
flags |= INFO_LOGONNOTIFY; flags |= INFO_LOGONNOTIFY;
if (settings->PasswordIsSmartcardPin)
flags |= INFO_PASSWORD_IS_SC_PIN;
if (settings->Domain) if (settings->Domain)
{ {
cbDomain = ConvertToUnicode(CP_UTF8, 0, settings->Domain, -1, &domainW, 0) * 2; cbDomain = ConvertToUnicode(CP_UTF8, 0, settings->Domain, -1, &domainW, 0) * 2;