mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only enable deprecated commandline with WITH_FREERDP_DEPRECATED

Browse Source
This commit is contained in:
Armin Novak 2022-10-19 14:00:48 +02:00 committed by akallabeth
parent 1c8bcbeb6a
commit ed3bc5c51a
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/common/cmdline.c
View File

@ -1679,6 +1679,8 @@ static int parse_tls_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_
else if (strncmp("enforce-tlsv1_2", arg->Value, 16) == 0)
rc = parse_tls_enforce(settings, &arg->Value[15]);
}
#if defined(WITH_FREERDP_DEPRECATED)
CommandLineSwitchCase(arg, "tls-ciphers")
{
WLog_WARN(TAG, "Option /tls-ciphers is deprecated, use /tls:ciphers instead");
@ -1699,6 +1701,7 @@ static int parse_tls_options(rdpSettings* settings, const COMMAND_LINE_ARGUMENT_
WLog_WARN(TAG, "Option /enforce-tlsv1_2 is deprecated, use /tls:enforce-tlsv1_2 instead");
rc = parse_tls_enforce(settings, arg->Value);
}
#endif
CommandLineSwitchDefault(arg)
{
}
@ -3021,6 +3024,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
}
free(ptr);
}
#if defined(WITH_FREERDP_DEPRECATED)
CommandLineSwitchCase(arg, "tls-ciphers")
{
int rc = parse_tls_options(settings, arg);
@ -3045,6 +3049,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
if (rc != 0)
return rc;
}
#endif
CommandLineSwitchCase(arg, "cert")
{
int rc = 0;
@ -3090,6 +3095,8 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
if (rc)
return rc;
}
#if defined(WITH_FREERDP_DEPRECATED)
CommandLineSwitchCase(arg, "cert-name")
{
WLog_WARN(TAG, "/cert-name is deprecated, use /cert:name instead");
@ -3111,6 +3118,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
WLog_WARN(TAG, "/cert-deny is deprecated, use /cert:deny instead");
settings->AutoDenyCertificate = enable;
}
#endif
CommandLineSwitchCase(arg, "authentication")
{
settings->Authentication = enable;

4
client/common/cmdline.h
View File

@ -91,6 +91,7 @@ static const COMMAND_LINE_ARGUMENT_A global_cmd_args[] = {
"subsequent connections if the certificate does not match"
" * fingerprints ... A list of certificate hashes that are accepted unconditionally for a "
"connection" },
#if defined(WITH_FREERDP_DEPRECATED)
{ "cert-deny", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, NULL,
"[deprecated, use /cert:deny] Automatically abort connection for any certificate that can "
"not be validated." },
@ -100,6 +101,7 @@ static const COMMAND_LINE_ARGUMENT_A global_cmd_args[] = {
"[deprecated, use /cert:name:<name>] Certificate name" },
{ "cert-tofu", COMMAND_LINE_VALUE_FLAG, NULL, NULL, NULL, -1, NULL,
"[deprecated, use /cert:tofu] Automatically accept certificate on first connect" },
#endif
{ "client-build-number", COMMAND_LINE_VALUE_REQUIRED, "<number>", NULL, NULL, -1, NULL,
"Client Build Number sent to server (influences smartcard behaviour, see [MS-RDPESC])" },
{ "client-hostname", COMMAND_LINE_VALUE_REQUIRED, "<name>", NULL, NULL, -1, NULL,
@ -380,6 +382,7 @@ static const COMMAND_LINE_ARGUMENT_A global_cmd_args[] = {
" * secrets-file:<filename>"
" * enforce-tlsv1_2 Force use of TLS1.2 for connection. Some servers have a buggy TLS "
"version negotiation and might fail without this" },
#if defined(WITH_FREERDP_DEPRECATED)
{ "tls-ciphers", COMMAND_LINE_VALUE_REQUIRED, "[netmon|ma|ciphers]", NULL, NULL, -1, NULL,
"[deprecated, use /tls:ciphers instead] Allowed TLS ciphers" },
{ "tls-seclevel", COMMAND_LINE_VALUE_REQUIRED, "<level>", "1", NULL, -1, NULL,
@ -391,6 +394,7 @@ static const COMMAND_LINE_ARGUMENT_A global_cmd_args[] = {
"[deprecated, use /tls:enforce-tlsv1_2 instead] Force use of TLS1.2 for connection. Some "
"servers have a buggy TLS version negotiation and "
"might fail without this" },
#endif
{ "toggle-fullscreen", COMMAND_LINE_VALUE_BOOL, NULL, BoolValueTrue, NULL, -1, NULL,
"Alt+Ctrl+Enter to toggle fullscreen" },
{ "tune", COMMAND_LINE_VALUE_REQUIRED, "<setting:value>,<setting:value>", "", NULL, -1, NULL,