morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11435 from hardening/smartcard_hints

Browse Source 
nla: send user and domain hints with smartcard logon
This commit is contained in:
akallabeth
2025-03-27 16:01:45 +01:00
committed by GitHub
parent 73e4c11fa1 b67a1aed7e
commit 168d63299e
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libfreerdp/core/nla.c
View File

@@ -1536,7 +1536,7 @@ static BOOL nla_encode_ts_credentials(rdpNla* nla)
struct
{
WinPrAsn1_tagId tag;
size_t setting_id;
FreeRDP_Settings_Keys_String setting_id;
} cspData_fields[] = { { 1, FreeRDP_CardName },
{ 2, FreeRDP_ReaderName },
{ 3, FreeRDP_ContainerName },
@@ -1552,7 +1552,7 @@ static BOOL nla_encode_ts_credentials(rdpNla* nla)
octet_string.data =
(BYTE*)freerdp_settings_get_string_as_utf16(settings, FreeRDP_Password, &ss);
octet_string.len = ss * sizeof(WCHAR);
const BOOL res = WinPrAsn1EncContextualOctetString(enc, 0, &octet_string) > 0;
BOOL res = WinPrAsn1EncContextualOctetString(enc, 0, &octet_string) > 0;
free(octet_string.data);
if (!res)
goto out;
@@ -1573,7 +1573,7 @@ static BOOL nla_encode_ts_credentials(rdpNla* nla)
size_t len = 0;
octet_string.data = (BYTE*)freerdp_settings_get_string_as_utf16(
settings, (FreeRDP_Settings_Keys_String)cspData_fields[i].setting_id, &len);
settings, cspData_fields[i].setting_id, &len);
octet_string.len = len * sizeof(WCHAR);
if (octet_string.len)
{
@@ -1589,6 +1589,30 @@ static BOOL nla_encode_ts_credentials(rdpNla* nla)
if (!WinPrAsn1EncEndContainer(enc))
goto out;
/* userHint [2] OCTET STRING OPTIONAL, */
if (freerdp_settings_get_string(settings, FreeRDP_Username))
{
octet_string.data =
(BYTE*)freerdp_settings_get_string_as_utf16(settings, FreeRDP_Username, &ss);
octet_string.len = ss * sizeof(WCHAR);
res = WinPrAsn1EncContextualOctetString(enc, 2, &octet_string) > 0;
free(octet_string.data);
if (!res)
goto out;
}
/* domainHint [3] OCTET STRING OPTIONAL */
if (freerdp_settings_get_string(settings, FreeRDP_Domain))
{
octet_string.data =
(BYTE*)freerdp_settings_get_string_as_utf16(settings, FreeRDP_Domain, &ss);
octet_string.len = ss * sizeof(WCHAR);
res = WinPrAsn1EncContextualOctetString(enc, 3, &octet_string) > 0;
free(octet_string.data);
if (!res)
goto out;
}
/* End TSSmartCardCreds */
if (!WinPrAsn1EncEndContainer(enc))
goto out;