github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1012 from hardening/stableFixes

Browse Source 
backported changes on ber.c around 0x80 length
added a path to a RDP key file or the server crashes
This commit is contained in:
Bernhard Miklautz 2013-02-26 23:05:46 +01:00
commit 25260bd717
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libfreerdp-core/ber.c
View File

@ -63,7 +63,7 @@ int ber_write_length(STREAM* s, int length)
int _ber_skip_length(int length) int _ber_skip_length(int length)
{ {
if (length > 0x7F) if (length > 0x80)
return 3; return 3;
else else
return 1; return 1;
@ -71,7 +71,7 @@ int _ber_skip_length(int length)
int ber_get_content_length(int length) int ber_get_content_length(int length)
{ {
if (length - 1 > 0x7F) if (length > 0x81)
return length - 4; return length - 4;
else else
return length - 2; return length - 2;

1
server/X11/xf_peer.c
View File

@ -624,6 +624,7 @@ void* xf_peer_main_loop(void* arg)
settings->cert_file = freerdp_construct_path(server_file_path, "server.crt"); settings->cert_file = freerdp_construct_path(server_file_path, "server.crt");
settings->privatekey_file = freerdp_construct_path(server_file_path, "server.key"); settings->privatekey_file = freerdp_construct_path(server_file_path, "server.key");
settings->rdp_key_file = freerdp_construct_path(server_file_path, "server.key");
settings->nla_security = false; settings->nla_security = false;
settings->rfx_codec = true; settings->rfx_codec = true;