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

[channels] make settings opaque

Browse Source
This commit is contained in:
akallabeth
2023-10-13 09:32:46 +02:00
committed by akallabeth
parent 130501fcd5
commit eb445f7c43
6 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
channels/remdesk/client/remdesk_main.c
View File

@@ -83,9 +83,8 @@ static UINT remdesk_generate_expert_blob(remdeskPlugin* remdesk)
if (remdesk->ExpertBlob)
return CHANNEL_RC_OK;
if (settings->RemoteAssistancePassword)
password = settings->RemoteAssistancePassword;
else
password = freerdp_settings_get_string(settings, FreeRDP_RemoteAssistancePassword);
if (!password)
password = freerdp_settings_get_string(settings, FreeRDP_Password);
if (!password)
@@ -94,13 +93,14 @@ static UINT remdesk_generate_expert_blob(remdeskPlugin* remdesk)
return ERROR_INTERNAL_ERROR;
}
name = settings->Username;
name = freerdp_settings_get_string(settings, FreeRDP_Username);
if (!name)
name = "Expert";
remdesk->EncryptedPassStub = freerdp_assistance_encrypt_pass_stub(
password, settings->RemoteAssistancePassStub, &(remdesk->EncryptedPassStubSize));
const char* stub = freerdp_settings_get_string(settings, FreeRDP_RemoteAssistancePassStub);
remdesk->EncryptedPassStub =
freerdp_assistance_encrypt_pass_stub(password, stub, &(remdesk->EncryptedPassStubSize));
if (!remdesk->EncryptedPassStub)
{
@@ -369,7 +369,8 @@ static UINT remdesk_send_ctl_authenticate_pdu(remdeskPlugin* remdesk)
settings = remdesk->rdpcontext->settings;
WINPR_ASSERT(settings);
pdu.raConnectionString = settings->RemoteAssistanceRCTicket;
pdu.raConnectionString =
freerdp_settings_get_string(settings, FreeRDP_RemoteAssistanceRCTicket);
raConnectionStringW = ConvertUtf8ToWCharAlloc(pdu.raConnectionString, &cbRaConnectionStringW);
if (!raConnectionStringW || (cbRaConnectionStringW > UINT32_MAX / sizeof(WCHAR)))
@@ -429,7 +430,8 @@ static UINT remdesk_send_ctl_remote_control_desktop_pdu(remdeskPlugin* remdesk)
settings = remdesk->rdpcontext->settings;
WINPR_ASSERT(settings);
pdu.raConnectionString = settings->RemoteAssistanceRCTicket;
pdu.raConnectionString =
freerdp_settings_get_string(settings, FreeRDP_RemoteAssistanceRCTicket);
raConnectionStringW = ConvertUtf8ToWCharAlloc(pdu.raConnectionString, &length);
if (!raConnectionStringW)