diff --git a/ChangeLog b/ChangeLog index 5e4ad26..a68b23f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +v1.23.0: + Obsolete. Please use v2.0 or above. This is a branch + where no new features will be introduced, only + bugfixes to versions below 1.22. + + Reintroduce --ssl as alias to --tls. + + v1.22: 17AUG2021 sslh-select now supports UDP protocols. Probes specified in the `protocols` diff --git a/sslh-conf.c b/sslh-conf.c index 9c52cc6..5ce3326 100644 --- a/sslh-conf.c +++ b/sslh-conf.c @@ -1,5 +1,5 @@ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) - * on Tue Aug 24 13:53:04 2021. + * on Tue Jan 2 21:42:30 2024. # conf2struct: generate libconf parsers that read to structs # Copyright (C) 2018-2021 Yves Rutschle @@ -459,6 +459,7 @@ struct arg_file* sslhcfg_conffile; struct arg_str* sslhcfg_listen; struct arg_str* sslhcfg_ssh; struct arg_str* sslhcfg_tls; + struct arg_str* sslhcfg_ssl; struct arg_str* sslhcfg_openvpn; struct arg_str* sslhcfg_tinc; struct arg_str* sslhcfg_xmpp; @@ -1094,6 +1095,15 @@ static struct compound_cl_target sslhcfg_openvpn_targets [] = { { 0 } }; +static struct compound_cl_target sslhcfg_ssl_targets [] = { + { & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" }, + { & table_sslhcfg_protocols[1], 1, .value.def_string = "0" }, + { & table_sslhcfg_protocols[2], 2, .value.def_string = "0" }, + { & table_sslhcfg_protocols[9], 0, .value.def_int = 1 }, + { & table_sslhcfg_protocols[7], 0, .value.def_bool = 1 }, + { 0 } +}; + static struct compound_cl_target sslhcfg_tls_targets [] = { { & table_sslhcfg_protocols[0], 0, .value.def_string = "tls" }, { & table_sslhcfg_protocols[1], 1, .value.def_string = "0" }, @@ -1156,6 +1166,18 @@ static struct compound_cl_arg compound_cl_args[] = { .override_const = "tls", }, + { /* arg: ssl */ + .regex = "(.+):(\\w+)", + .arg_cl = & sslhcfg_ssl, + .base_entry = & table_sslhcfg [14], + .targets = sslhcfg_ssl_targets, + + + .override_desc = & table_sslhcfg_protocols [0], + .override_matchindex = 0, + .override_const = "tls", + }, + { /* arg: openvpn */ .regex = "(.+):(\\w+)", .arg_cl = & sslhcfg_openvpn, @@ -1924,6 +1946,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg) sslhcfg_listen = arg_strn("p", "listen", "", 0, 10, "Listen on host:port"), sslhcfg_ssh = arg_strn(NULL, "ssh", "", 0, 10, "Set up ssh target"), sslhcfg_tls = arg_strn(NULL, "tls", "", 0, 10, "Set up TLS/SSL target"), + sslhcfg_ssl = arg_strn(NULL, "ssl", "", 0, 10, "Set up TLS/SSL target"), sslhcfg_openvpn = arg_strn(NULL, "openvpn", "", 0, 10, "Set up OpenVPN target"), sslhcfg_tinc = arg_strn(NULL, "tinc", "", 0, 10, "Set up tinc target"), sslhcfg_xmpp = arg_strn(NULL, "xmpp", "", 0, 10, "Set up XMPP target"), diff --git a/sslh-conf.h b/sslh-conf.h index 7e09ccc..a742e6c 100644 --- a/sslh-conf.h +++ b/sslh-conf.h @@ -1,5 +1,5 @@ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) - * on Tue Aug 24 13:53:04 2021. + * on Tue Jan 2 21:42:30 2024. # conf2struct: generate libconf parsers that read to structs # Copyright (C) 2018-2021 Yves Rutschle diff --git a/sslhconf.cfg b/sslhconf.cfg index ed5b588..fc18ade 100644 --- a/sslhconf.cfg +++ b/sslhconf.cfg @@ -155,6 +155,19 @@ cl_groups: ( { path: "tfo_ok"; value: 1 } ); }, + # Redundant with the --tls setting before, for backwards compatibility + { name: "ssl"; pattern: "(.+):(\w+)"; description: "Set up TLS/SSL target"; + list: "protocols"; + override: "name"; + argdesc: ""; + targets: ( + { path: "name"; value: "tls" }, + { path: "host"; value: "$1" }, + { path: "port"; value: "$2" }, + { path: "log_level"; value: 1 }, + { path: "tfo_ok"; value: 1 } + ); + }, { name: "openvpn"; pattern: "(.+):(\w+)"; description: "Set up OpenVPN target"; list: "protocols"; override: "name";