github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply suggestions

Browse Source 
Co-Authored-By: matt335672 <30179339+matt335672@users.noreply.github.com>
This commit is contained in:
gpotter2
2025-05-08 06:45:05 +02:00
parent f0bae0050c
commit 09e1173259
2 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libxrdp/xrdp_iso.c
+15 -30
View File
@@ -129,40 +129,25 @@ xrdp_iso_negotiate_security(struct xrdp_iso *self)
protostr);
security_type_mask &= self->requestedProtocol;
/* In VMConnect mode, we support everything. */
if (client_info->vmconnect && (self->requestedProtocol > PROTOCOL_RDP))
if (security_type_mask & PROTOCOL_HYBRID_EX)
{
if (security_type_mask & PROTOCOL_HYBRID_EX)
{
LOG(LOG_LEVEL_INFO, "Selected HYBRID_EX security");
self->selectedProtocol = PROTOCOL_HYBRID_EX;
got_protocol = 1;
}
else if (security_type_mask & PROTOCOL_HYBRID)
{
LOG(LOG_LEVEL_INFO, "Selected HYBRID security");
self->selectedProtocol = PROTOCOL_HYBRID;
got_protocol = 1;
}
else if (security_type_mask & PROTOCOL_SSL)
{
LOG(LOG_LEVEL_INFO, "Selected TLS security");
self->selectedProtocol = PROTOCOL_SSL;
got_protocol = 1;
}
else
{
/* Impossible */
LOG(LOG_LEVEL_ERROR, "Impossible case.");
rv = 1;
}
/* Currently supported by VMConnect mode only */
LOG(LOG_LEVEL_INFO, "Selected HYBRID_EX security");
self->selectedProtocol = PROTOCOL_HYBRID_EX;
got_protocol = 1;
}
else if (security_type_mask & PROTOCOL_HYBRID)
{
/* Currently supported by VMConnect mode only */
LOG(LOG_LEVEL_INFO, "Selected HYBRID security");
self->selectedProtocol = PROTOCOL_HYBRID;
got_protocol = 1;
}
/* Is there a match on SSL/TLS? */
else if ((security_type_mask & PROTOCOL_SSL) != 0)
{
/* Can we do TLS? (basic check) */
if (g_file_readable(client_info->certificate) &&
g_file_readable(client_info->key_file))
/* Can we do TLS? (basic check). VMConnect is exempt. */
if ((g_file_readable(client_info->certificate) &&
g_file_readable(client_info->key_file)) || client_info->vmconnect)
{
LOG(LOG_LEVEL_INFO, "Selected TLS security");
self->selectedProtocol = PROTOCOL_SSL;
xrdp/xrdp.ini.in
+2 -2
View File
@@ -27,8 +27,8 @@ port=3389
; prefer use vsock://<cid>:<port> above
use_vsock=false
; if used inside a Hyper-V VM with vmconnect, turn this on to enable
; wider protocol support.
; if used inside a Hyper-V VM through vmconnect and bound on vsock,
; turn this on to enable wider security protocol support.
#vmconnect=true
; Unprivileged User name and group to run the xrdp daemon.