mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libfreerdp-core/server: do not force encryption for local unix connection.

This commit is contained in:
Vic Lee 2012-05-22 23:21:09 +08:00
parent ada9936a66
commit 95f5e1156e
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/freerdp/settings.h
View File

@ -292,7 +292,8 @@ struct rdp_settings
ALIGN64 char* tsg_hostname; /* 65 */
ALIGN64 char* tsg_username; /* 66 */
ALIGN64 char* tsg_password; /* 67 */
ALIGN64 uint64 paddingC[80 - 68]; /* 68 */
ALIGN64 boolean local; /* 68 */
ALIGN64 uint64 paddingC[80 - 69]; /* 69 */
/* User Interface Parameters */
ALIGN64 boolean sw_gdi; /* 80 */

9
libfreerdp-core/nego.c
View File

@ -600,9 +600,12 @@ boolean nego_send_negotiation_response(rdpNego* nego)
settings->tls_security = false;
settings->nla_security = false;
settings->rdp_security = true;
settings->encryption = true;
settings->encryption_method = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS;
settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
if (!settings->local)
{
settings->encryption = true;
settings->encryption_method = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS;
settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
}
}
else if (settings->selected_protocol == PROTOCOL_TLS)
{

1
libfreerdp-core/peer.c
View File

@ -26,6 +26,7 @@ static boolean freerdp_peer_initialize(freerdp_peer* client)
{
client->context->rdp->settings->server_mode = true;
client->context->rdp->settings->frame_acknowledge = 0;
client->context->rdp->settings->local = client->local;
client->context->rdp->state = CONNECTION_STATE_INITIAL;
if (client->context->rdp->settings->rdp_key_file != NULL)