mirror of
https://github.com/morgan9e/FreeRDP
synced 2026-04-14 00:14:11 +09:00
Merge pull request #12043 from akallabeth/cleanups-release
Cleanups release
This commit is contained in:
akallabeth
@@ -123,13 +123,20 @@ static BOOL mediaSupportDrops(CAM_MEDIA_FORMAT format)
|
||||
|
||||
static UINT ecam_dev_send_pending(CameraDevice* dev, int streamIndex, CameraDeviceStream* stream)
|
||||
{
|
||||
BYTE* encodedSample = NULL;
|
||||
size_t encodedSize = 0;
|
||||
WINPR_ASSERT(dev);
|
||||
WINPR_ASSERT(stream);
|
||||
|
||||
if (stream->samplesRequested <= 0)
|
||||
{
|
||||
WLog_DBG(TAG, "Frame drop: No sample requested");
|
||||
return CHANNEL_RC_OK;
|
||||
}
|
||||
|
||||
BYTE* encodedSample = Stream_Buffer(stream->pendingSample);
|
||||
size_t encodedSize = Stream_Length(stream->pendingSample);
|
||||
if (streamInputFormat(stream) != streamOutputFormat(stream))
|
||||
{
|
||||
if (!ecam_encoder_compress(stream, Stream_Buffer(stream->pendingSample),
|
||||
Stream_Length(stream->pendingSample), &encodedSample,
|
||||
if (!ecam_encoder_compress(stream, encodedSample, encodedSize, &encodedSample,
|
||||
&encodedSize))
|
||||
{
|
||||
WLog_DBG(TAG, "Frame drop or error in ecam_encoder_compress");
|
||||
@@ -139,11 +146,6 @@ static UINT ecam_dev_send_pending(CameraDevice* dev, int streamIndex, CameraDevi
|
||||
if (!stream->streaming)
|
||||
return CHANNEL_RC_OK;
|
||||
}
|
||||
else /* passthrough */
|
||||
{
|
||||
encodedSample = Stream_Buffer(stream->pendingSample);
|
||||
encodedSize = Stream_Length(stream->pendingSample);
|
||||
}
|
||||
|
||||
stream->samplesRequested--;
|
||||
stream->haveSample = FALSE;
|
||||
@@ -213,9 +215,7 @@ static UINT ecam_dev_sample_captured_callback(CameraDevice* dev, int streamIndex
|
||||
Stream_SealLength(stream->pendingSample);
|
||||
stream->haveSample = TRUE;
|
||||
|
||||
ret = CHANNEL_RC_OK;
|
||||
if (stream->samplesRequested)
|
||||
ret = ecam_dev_send_pending(dev, streamIndex, stream);
|
||||
ret = ecam_dev_send_pending(dev, streamIndex, stream);
|
||||
|
||||
out:
|
||||
LeaveCriticalSection(&stream->lock);
|
||||
@@ -351,7 +351,7 @@ static UINT ecam_dev_process_start_streams_request(CameraDevice* dev,
|
||||
return ERROR_INVALID_DATA;
|
||||
}
|
||||
|
||||
stream->pendingSample = Stream_New(NULL, mediaType.Width * mediaType.Height * 4ull);
|
||||
stream->pendingSample = Stream_New(NULL, 4ull * mediaType.Width * mediaType.Height);
|
||||
if (!stream->pendingSample)
|
||||
{
|
||||
WLog_ERR(TAG, "pending stream failed");
|
||||
|
||||
@@ -1561,6 +1561,180 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static BOOL nla_encode_ts_smartcard_credentials(rdpNla* nla, WinPrAsn1Encoder* enc)
|
||||
{
|
||||
struct
|
||||
{
|
||||
WinPrAsn1_tagId tag;
|
||||
FreeRDP_Settings_Keys_String setting_id;
|
||||
} cspData_fields[] = { { 1, FreeRDP_CardName },
|
||||
{ 2, FreeRDP_ReaderName },
|
||||
{ 3, FreeRDP_ContainerName },
|
||||
{ 4, FreeRDP_CspName } };
|
||||
WinPrAsn1_OctetString octet_string = { 0 };
|
||||
|
||||
WINPR_ASSERT(nla);
|
||||
WINPR_ASSERT(enc);
|
||||
WINPR_ASSERT(nla->rdpcontext);
|
||||
|
||||
const rdpSettings* settings = nla->rdpcontext->settings;
|
||||
WINPR_ASSERT(settings);
|
||||
|
||||
/* TSSmartCardCreds */
|
||||
if (!WinPrAsn1EncSeqContainer(enc))
|
||||
return FALSE;
|
||||
|
||||
/* pin [0] OCTET STRING */
|
||||
size_t ss = 0;
|
||||
octet_string.data =
|
||||
(BYTE*)freerdp_settings_get_string_as_utf16(settings, FreeRDP_Password, &ss);
|
||||
octet_string.len = ss * sizeof(WCHAR);
|
||||
BOOL res = WinPrAsn1EncContextualOctetString(enc, 0, &octet_string) > 0;
|
||||
free(octet_string.data);
|
||||
if (!res)
|
||||
return FALSE;
|
||||
|
||||
/* cspData [1] SEQUENCE */
|
||||
if (!WinPrAsn1EncContextualSeqContainer(enc, 1))
|
||||
return FALSE;
|
||||
|
||||
/* keySpec [0] INTEGER */
|
||||
if (!WinPrAsn1EncContextualInteger(
|
||||
enc, 0,
|
||||
WINPR_ASSERTING_INT_CAST(WinPrAsn1_INTEGER,
|
||||
freerdp_settings_get_uint32(settings, FreeRDP_KeySpec))))
|
||||
return FALSE;
|
||||
|
||||
for (size_t i = 0; i < ARRAYSIZE(cspData_fields); i++)
|
||||
{
|
||||
size_t len = 0;
|
||||
|
||||
octet_string.data = (BYTE*)freerdp_settings_get_string_as_utf16(
|
||||
settings, cspData_fields[i].setting_id, &len);
|
||||
octet_string.len = len * sizeof(WCHAR);
|
||||
if (octet_string.len)
|
||||
{
|
||||
const BOOL res2 =
|
||||
WinPrAsn1EncContextualOctetString(enc, cspData_fields[i].tag, &octet_string) > 0;
|
||||
free(octet_string.data);
|
||||
if (!res2)
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
/* End cspData */
|
||||
if (!WinPrAsn1EncEndContainer(enc))
|
||||
return FALSE;
|
||||
|
||||
/* 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)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* 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)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* End TSSmartCardCreds */
|
||||
return WinPrAsn1EncEndContainer(enc) != 0;
|
||||
}
|
||||
|
||||
static BOOL nla_encode_ts_password_credentials(rdpNla* nla, WinPrAsn1Encoder* enc)
|
||||
{
|
||||
WinPrAsn1_OctetString username = { 0 };
|
||||
WinPrAsn1_OctetString domain = { 0 };
|
||||
WinPrAsn1_OctetString password = { 0 };
|
||||
|
||||
WINPR_ASSERT(nla);
|
||||
WINPR_ASSERT(enc);
|
||||
WINPR_ASSERT(nla->rdpcontext);
|
||||
|
||||
const rdpSettings* settings = nla->rdpcontext->settings;
|
||||
WINPR_ASSERT(settings);
|
||||
|
||||
/* TSPasswordCreds */
|
||||
if (!WinPrAsn1EncSeqContainer(enc))
|
||||
return FALSE;
|
||||
|
||||
if (!settings->DisableCredentialsDelegation && nla->identity)
|
||||
{
|
||||
username.len = nla->identity->UserLength * sizeof(WCHAR);
|
||||
username.data = (BYTE*)nla->identity->User;
|
||||
|
||||
domain.len = nla->identity->DomainLength * sizeof(WCHAR);
|
||||
domain.data = (BYTE*)nla->identity->Domain;
|
||||
|
||||
password.len = nla->identity->PasswordLength * sizeof(WCHAR);
|
||||
password.data = (BYTE*)nla->identity->Password;
|
||||
}
|
||||
|
||||
if (WinPrAsn1EncContextualOctetString(enc, 0, &domain) == 0)
|
||||
return FALSE;
|
||||
if (WinPrAsn1EncContextualOctetString(enc, 1, &username) == 0)
|
||||
return FALSE;
|
||||
if (WinPrAsn1EncContextualOctetString(enc, 2, &password) == 0)
|
||||
return FALSE;
|
||||
|
||||
/* End TSPasswordCreds */
|
||||
return WinPrAsn1EncEndContainer(enc) != 0;
|
||||
}
|
||||
|
||||
static BOOL nla_encode_ts_remoteguard_credentials(rdpNla* nla, WinPrAsn1Encoder* enc)
|
||||
{
|
||||
WINPR_ASSERT(nla);
|
||||
WINPR_ASSERT(enc);
|
||||
|
||||
/* TSRemoteGuardCreds */
|
||||
if (!WinPrAsn1EncSeqContainer(enc))
|
||||
return FALSE;
|
||||
|
||||
/* logonCred [0] TSRemoteGuardPackageCred, */
|
||||
if (!WinPrAsn1EncContextualSeqContainer(enc, 0))
|
||||
return FALSE;
|
||||
|
||||
if (!nla_write_TSRemoteGuardKerbCred(nla, enc) || !WinPrAsn1EncEndContainer(enc))
|
||||
return FALSE;
|
||||
|
||||
/* TODO: compute the NTLM supplemental creds */
|
||||
MSV1_0_REMOTE_SUPPLEMENTAL_CREDENTIAL* ntlm = NULL;
|
||||
if (ntlm)
|
||||
{
|
||||
/* supplementalCreds [1] SEQUENCE OF TSRemoteGuardPackageCred OPTIONAL */
|
||||
if (!WinPrAsn1EncContextualSeqContainer(enc, 1))
|
||||
return FALSE;
|
||||
|
||||
if (!WinPrAsn1EncSeqContainer(enc)) /* start NTLM */
|
||||
return FALSE;
|
||||
|
||||
if (!nla_write_TSRemoteGuardNtlmCred(nla, enc, ntlm))
|
||||
return FALSE;
|
||||
|
||||
if (!WinPrAsn1EncEndContainer(enc)) /* end NTLM */
|
||||
return FALSE;
|
||||
|
||||
if (!WinPrAsn1EncEndContainer(enc)) /* supplementalCreds */
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* End TSRemoteGuardCreds */
|
||||
return WinPrAsn1EncEndContainer(enc) != 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Encode TSCredentials structure.
|
||||
* @param nla A pointer to the NLA to use
|
||||
@@ -1608,161 +1782,17 @@ static BOOL nla_encode_ts_credentials(rdpNla* nla)
|
||||
switch (credType)
|
||||
{
|
||||
case TSCREDS_SMARTCARD:
|
||||
{
|
||||
struct
|
||||
{
|
||||
WinPrAsn1_tagId tag;
|
||||
FreeRDP_Settings_Keys_String setting_id;
|
||||
} cspData_fields[] = { { 1, FreeRDP_CardName },
|
||||
{ 2, FreeRDP_ReaderName },
|
||||
{ 3, FreeRDP_ContainerName },
|
||||
{ 4, FreeRDP_CspName } };
|
||||
WinPrAsn1_OctetString octet_string = { 0 };
|
||||
|
||||
/* TSSmartCardCreds */
|
||||
if (!WinPrAsn1EncSeqContainer(enc))
|
||||
goto out;
|
||||
|
||||
/* pin [0] OCTET STRING */
|
||||
size_t ss = 0;
|
||||
octet_string.data =
|
||||
(BYTE*)freerdp_settings_get_string_as_utf16(settings, FreeRDP_Password, &ss);
|
||||
octet_string.len = ss * sizeof(WCHAR);
|
||||
BOOL res = WinPrAsn1EncContextualOctetString(enc, 0, &octet_string) > 0;
|
||||
free(octet_string.data);
|
||||
if (!res)
|
||||
goto out;
|
||||
|
||||
/* cspData [1] SEQUENCE */
|
||||
if (!WinPrAsn1EncContextualSeqContainer(enc, 1))
|
||||
goto out;
|
||||
|
||||
/* keySpec [0] INTEGER */
|
||||
if (!WinPrAsn1EncContextualInteger(
|
||||
enc, 0,
|
||||
WINPR_ASSERTING_INT_CAST(
|
||||
WinPrAsn1_INTEGER, freerdp_settings_get_uint32(settings, FreeRDP_KeySpec))))
|
||||
goto out;
|
||||
|
||||
for (size_t i = 0; i < ARRAYSIZE(cspData_fields); i++)
|
||||
{
|
||||
size_t len = 0;
|
||||
|
||||
octet_string.data = (BYTE*)freerdp_settings_get_string_as_utf16(
|
||||
settings, cspData_fields[i].setting_id, &len);
|
||||
octet_string.len = len * sizeof(WCHAR);
|
||||
if (octet_string.len)
|
||||
{
|
||||
const BOOL res2 = WinPrAsn1EncContextualOctetString(enc, cspData_fields[i].tag,
|
||||
&octet_string) > 0;
|
||||
free(octet_string.data);
|
||||
if (!res2)
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
/* End cspData */
|
||||
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))
|
||||
if (!nla_encode_ts_smartcard_credentials(nla, enc))
|
||||
goto out;
|
||||
break;
|
||||
}
|
||||
|
||||
case TSCREDS_USER_PASSWD:
|
||||
{
|
||||
WinPrAsn1_OctetString username = { 0 };
|
||||
WinPrAsn1_OctetString domain = { 0 };
|
||||
WinPrAsn1_OctetString password = { 0 };
|
||||
|
||||
/* TSPasswordCreds */
|
||||
if (!WinPrAsn1EncSeqContainer(enc))
|
||||
goto out;
|
||||
|
||||
if (!settings->DisableCredentialsDelegation && nla->identity)
|
||||
{
|
||||
username.len = nla->identity->UserLength * sizeof(WCHAR);
|
||||
username.data = (BYTE*)nla->identity->User;
|
||||
|
||||
domain.len = nla->identity->DomainLength * sizeof(WCHAR);
|
||||
domain.data = (BYTE*)nla->identity->Domain;
|
||||
|
||||
password.len = nla->identity->PasswordLength * sizeof(WCHAR);
|
||||
password.data = (BYTE*)nla->identity->Password;
|
||||
}
|
||||
|
||||
if (WinPrAsn1EncContextualOctetString(enc, 0, &domain) == 0)
|
||||
goto out;
|
||||
if (WinPrAsn1EncContextualOctetString(enc, 1, &username) == 0)
|
||||
goto out;
|
||||
if (WinPrAsn1EncContextualOctetString(enc, 2, &password) == 0)
|
||||
goto out;
|
||||
|
||||
/* End TSPasswordCreds */
|
||||
if (!WinPrAsn1EncEndContainer(enc))
|
||||
if (!nla_encode_ts_password_credentials(nla, enc))
|
||||
goto out;
|
||||
break;
|
||||
}
|
||||
|
||||
case TSCREDS_REMOTEGUARD:
|
||||
/* TSRemoteGuardCreds */
|
||||
if (!WinPrAsn1EncSeqContainer(enc))
|
||||
goto out;
|
||||
|
||||
/* logonCred [0] TSRemoteGuardPackageCred, */
|
||||
if (!WinPrAsn1EncContextualSeqContainer(enc, 0))
|
||||
goto out;
|
||||
|
||||
if (!nla_write_TSRemoteGuardKerbCred(nla, enc) || !WinPrAsn1EncEndContainer(enc))
|
||||
goto out;
|
||||
|
||||
/* TODO: compute the NTLM supplemental creds */
|
||||
MSV1_0_REMOTE_SUPPLEMENTAL_CREDENTIAL* ntlm = NULL;
|
||||
if (ntlm)
|
||||
{
|
||||
/* supplementalCreds [1] SEQUENCE OF TSRemoteGuardPackageCred OPTIONAL */
|
||||
if (!WinPrAsn1EncContextualSeqContainer(enc, 1))
|
||||
goto out;
|
||||
|
||||
if (!WinPrAsn1EncSeqContainer(enc)) /* start NTLM */
|
||||
goto out;
|
||||
|
||||
if (!nla_write_TSRemoteGuardNtlmCred(nla, enc, ntlm))
|
||||
goto out;
|
||||
|
||||
if (!WinPrAsn1EncEndContainer(enc)) /* end NTLM */
|
||||
goto out;
|
||||
|
||||
if (!WinPrAsn1EncEndContainer(enc)) /* supplementalCreds */
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* End TSRemoteGuardCreds */
|
||||
if (!WinPrAsn1EncEndContainer(enc))
|
||||
if (!nla_encode_ts_remoteguard_credentials(nla, enc))
|
||||
goto out;
|
||||
break;
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user