From e67d6ff905e841614fe5ed50a788d7d6e7727dbc Mon Sep 17 00:00:00 2001 From: yrutschle Date: Thu, 30 Jul 2020 09:45:50 +0200 Subject: [PATCH] removed obsolete support for . Use instead --- probe.c | 1 - sslh-main.c | 26 -------------------------- 2 files changed, 27 deletions(-) diff --git a/probe.c b/probe.c index 45421e4..818d619 100644 --- a/probe.c +++ b/probe.c @@ -53,7 +53,6 @@ static struct protocol_probe_desc builtins[] = { { "xmpp", is_xmpp_protocol }, { "http", is_http_protocol }, { "tls", is_tls_protocol }, - { "ssl", is_tls_protocol }, { "adb", is_adb_protocol }, { "socks5", is_socks5_protocol }, { "anyprot", is_true } diff --git a/sslh-main.c b/sslh-main.c index 1d02348..8c42653 100644 --- a/sslh-main.c +++ b/sslh-main.c @@ -115,32 +115,6 @@ static void printsettings(void) } -/* To be removed in v1.21 */ -const char* ssl_err_msg = "Usage of 'ssl' setting is deprecated and will be removed in v1.21. Please use 'tls' instead\n"; -void ssl_to_tls(char* setting) -{ - if (!strcmp(setting, "ssl")) { - strcpy(setting, "tls"); /* legacy configuration */ - log_message(LOG_INFO, ssl_err_msg); - } -} - - -/* Turn 'ssl' command line option to 'tls'. To be removed in v1.21 */ -void cmd_ssl_to_tls(int argc, char* argv[]) -{ - int i; - for (i = 0; i < argc; i++) { - if (!strcmp(argv[i], "--ssl")) { - strcpy(argv[i], "--tls"); - /* foreground option not parsed yet, syslog not open, just print on - * stderr and hope for the best */ - fprintf(stderr, "%s", ssl_err_msg); - } - } -} - - /* Extract configuration on addresses and ports on which to listen. * out: newly allocated list of addrinfo to listen to */