diff options
| author | speidy <speidy@gmail.com> | 2014-09-20 10:44:23 +0400 |
|---|---|---|
| committer | speidy <speidy@gmail.com> | 2014-09-20 10:44:23 +0400 |
| commit | 5c46c5a64de7f019ea96a11315a008dd5eb94532 (patch) | |
| tree | 120eede6bb7560e40c7df2e53da5c2796d5569a6 | |
| parent | a5a460e5ec4c34126e03375b949e5918326b5e31 (diff) | |
Revert "added --sec none option"
This reverts commit a62a3afcf2c690798b6c46e2a88296b379152ff8.
| -rw-r--r-- | libfreerdp-core/nego.c | 7 | ||||
| -rw-r--r-- | libfreerdp-utils/args.c | 14 |
2 files changed, 9 insertions, 12 deletions
diff --git a/libfreerdp-core/nego.c b/libfreerdp-core/nego.c index 04aacca..ef92bc3 100644 --- a/libfreerdp-core/nego.c +++ b/libfreerdp-core/nego.c @@ -103,6 +103,13 @@ tbool nego_connect(rdpNego* nego) nego->transport->settings->selected_protocol = nego->selected_protocol; nego->transport->settings->negotiationFlags = nego->flags; + if(nego->selected_protocol == PROTOCOL_RDP) + { + nego->transport->settings->encryption = true; + nego->transport->settings->encryption_method = ENCRYPTION_METHOD_40BIT | ENCRYPTION_METHOD_128BIT | ENCRYPTION_METHOD_FIPS; + nego->transport->settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE; + } + return true; } diff --git a/libfreerdp-utils/args.c b/libfreerdp-utils/args.c index 2b44494..7064bf5 100644 --- a/libfreerdp-utils/args.c +++ b/libfreerdp-utils/args.c @@ -120,7 +120,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv, " --tsg <TSG Username>:<Password>:<Domain>:<TSG Adress>: Connect through TSG\n" " --ntlm: force NTLM authentication protocol version (1 or 2)\n" " --ignore-certificate: ignore verification of logon certificate\n" - " --sec: force protocol security (none, rdp, tls or nla)\n" + " --sec: force protocol security (rdp, tls or nla)\n" " --secure-checksum: use salted checksums with Standard RDP encryption\n" " --version: print version information\n" " --skip-bs: do not keep backing store\n" @@ -649,17 +649,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv, printf("missing protocol security\n"); return FREERDP_ARGS_PARSE_FAILURE; } - if (strncmp("none", argv[index], 1) == 0) - { - settings->rdp_security = true; - settings->tls_security = false; - settings->nla_security = false; - settings->encryption = true; - settings->encryption_method = ENCRYPTION_METHOD_NONE; - settings->encryption_level = ENCRYPTION_LEVEL_NONE; - printf("none set\n"); - } - else if (strncmp("rdp", argv[index], 1) == 0) /* Standard RDP */ + if (strncmp("rdp", argv[index], 1) == 0) /* Standard RDP */ { settings->rdp_security = true; settings->tls_security = false; |