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

Fixed use of rdpSettings, prefer getter/setter

Browse Source
This commit is contained in:
akallabeth 2022-03-24 11:07:49 +01:00 committed by akallabeth
parent d22ef1786b
commit 7b5ebced28
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libfreerdp/core/nla.c
View File

@ -2190,11 +2190,11 @@ static BOOL nla_encode_ts_credentials(rdpNla* nla)
smartcardCreds.domainHint = settings->DomainHint;*/
smartcardCreds.cspData = &cspData;
cspData.keySpec = settings->KeySpec;
cspData.cspName = settings->CspName;
cspData.readerName = settings->ReaderName;
cspData.cardName = settings->CardName;
cspData.containerName = settings->ContainerName;
cspData.keySpec = freerdp_settings_get_uint32(settings, FreeRDP_KeySpec);
cspData.cspName = freerdp_settings_get_string(settings, FreeRDP_CspName);
cspData.readerName = freerdp_settings_get_string(settings, FreeRDP_ReaderName);
cspData.cardName = freerdp_settings_get_string(settings, FreeRDP_CardName);
cspData.containerName = freerdp_settings_get_string(settings, FreeRDP_ContainerName);
length = ber_sizeof_nla_TSSmartCardCreds(&smartcardCreds);
credsContentStream = Stream_New(NULL, length);

8
libfreerdp/core/smartcardlogon.c
View File

@ -530,12 +530,15 @@ BOOL smartcard_enumerateCerts(const rdpSettings* settings, SmartcardCerts** scCe
BOOL ret;
LPWSTR csp;
const char* asciiCsp;
const char* ReaderName = freerdp_settings_get_string(settings, FreeRDP_ReaderName);
const char* Username = freerdp_settings_get_string(settings, FreeRDP_Username);
const char* CspName = freerdp_settings_get_string(settings, FreeRDP_CspName);
WINPR_ASSERT(settings);
WINPR_ASSERT(scCerts);
WINPR_ASSERT(retCount);
asciiCsp = settings->CspName ? settings->CspName : MS_SCARD_PROV_A;
asciiCsp = CspName ? CspName : MS_SCARD_PROV_A;
if (settings->SmartcardEmulation)
return smartcard_sw_enumerateCerts(settings, scCerts, retCount);
@ -546,8 +549,7 @@ BOOL smartcard_enumerateCerts(const rdpSettings* settings, SmartcardCerts** scCe
return FALSE;
}
ret = smartcard_hw_enumerateCerts(settings, csp, settings->ReaderName, settings->Username,
scCerts, retCount);
ret = smartcard_hw_enumerateCerts(settings, csp, ReaderName, Username, scCerts, retCount);
free(csp);
return ret;
}