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

Rename secure_checksum settings field to salted_checksum (the same for --secure-checksum flag) to match ENC_SALTED_CHECKSUM flag's name.

This commit is contained in:
Pawel Jakub Dawidek 2012-02-10 20:25:50 +01:00
parent 7ef1e0c8ca
commit 957bad3d52
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/freerdp/settings.h
View File

@ -302,7 +302,7 @@ struct rdp_settings
boolean nla_security; /* 146 */
boolean rdp_security; /* 147 */
uint32 ntlm_version; /* 148 */
boolean secure_checksum; /* 149 */
boolean salted_checksum; /* 149 */
uint32 paddingF[160 - 150]; /* 150 */
/* Session */

4
libfreerdp-core/connection.c
View File

@ -227,7 +227,7 @@ static boolean rdp_client_establish_keys(rdpRdp* rdp)
}
rdp->do_crypt = true;
if (rdp->settings->secure_checksum)
if (rdp->settings->salted_checksum)
rdp->do_secure_checksum = true;
if (rdp->settings->encryption_method == ENCRYPTION_METHOD_FIPS)
@ -294,7 +294,7 @@ static boolean rdp_server_establish_keys(rdpRdp* rdp, STREAM* s)
}
rdp->do_crypt = true;
if (rdp->settings->secure_checksum)
if (rdp->settings->salted_checksum)
rdp->do_secure_checksum = true;
if (rdp->settings->encryption_method == ENCRYPTION_METHOD_FIPS)

2
libfreerdp-core/settings.c
View File

@ -57,7 +57,7 @@ rdpSettings* settings_new(void* instance)
settings->kbd_fn_keys = 0;
settings->kbd_layout = 0;
settings->encryption = false;
settings->secure_checksum = false;
settings->salted_checksum = false;
settings->port = 3389;
settings->desktop_resize = true;

6
libfreerdp-utils/args.c
View File

@ -101,7 +101,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
" --ntlm: force NTLM authentication protocol version (1 or 2)\n"
" --ignore-certificate: ignore verification of logon certificate\n"
" --sec: force protocol security (rdp, tls or nla)\n"
" --secure-checksum: use salted checksums with Standard RDP encryption\n"
" --salted-checksum: use salted checksums with Standard RDP encryption\n"
" --version: print version information\n"
"\n", argv[0]);
return FREERDP_ARGS_PARSE_HELP; //TODO: What is the correct return
@ -617,9 +617,9 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
}
num_extensions++;
}
else if (strcmp("--secure-checksum", argv[index]) == 0)
else if (strcmp("--salted-checksum", argv[index]) == 0)
{
settings->secure_checksum = true;
settings->salted_checksum = true;
}
else if (strcmp("--version", argv[index]) == 0)
{