From 957bad3d526f0cae192a1477bd2d0c7541fa75bd Mon Sep 17 00:00:00 2001
From: Pawel Jakub Dawidek <pawel@dawidek.net>
Date: Fri, 10 Feb 2012 20:25:50 +0100
Subject: [PATCH] Rename secure_checksum settings field to salted_checksum (the
 same for --secure-checksum flag) to match ENC_SALTED_CHECKSUM flag's name.

---
 include/freerdp/settings.h   | 2 +-
 libfreerdp-core/connection.c | 4 ++--
 libfreerdp-core/settings.c   | 2 +-
 libfreerdp-utils/args.c      | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h
index 5a9acd8a3..56f198021 100644
--- a/include/freerdp/settings.h
+++ b/include/freerdp/settings.h
@@ -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 */
diff --git a/libfreerdp-core/connection.c b/libfreerdp-core/connection.c
index fb4fde3f2..92ece9f9b 100644
--- a/libfreerdp-core/connection.c
+++ b/libfreerdp-core/connection.c
@@ -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)
diff --git a/libfreerdp-core/settings.c b/libfreerdp-core/settings.c
index dbafa5b11..24dc31ec1 100644
--- a/libfreerdp-core/settings.c
+++ b/libfreerdp-core/settings.c
@@ -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;
 
diff --git a/libfreerdp-utils/args.c b/libfreerdp-utils/args.c
index cf10519d6..901eb66c8 100644
--- a/libfreerdp-utils/args.c
+++ b/libfreerdp-utils/args.c
@@ -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)
 		{