From b2fd9d9daf14e5081002095de6757b4681e556dc Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:15:18 -0400 Subject: [PATCH 01/32] spelling: github Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- doc/FAQ.md | 2 +- genver.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index 8e91c48d..528c9d94 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -7,7 +7,7 @@ doesn't work, report how what was suggested here went. It's also worth reading [how to ask questions](http://www.catb.org/~esr/faqs/smart-questions.html) before posting on the mailing list or opening an issue in -Github. +GitHub. Getting more info ================= diff --git a/genver.sh b/genver.sh index 5eec682f..c6a6fae3 100755 --- a/genver.sh +++ b/genver.sh @@ -17,7 +17,7 @@ if [ ! -d .git ] || ! `(git status | grep -q "On branch") 2> /dev/null`; then release=`pwd | sed s/.*sslh-// | grep "[[:digit:]]"` if [ "x$release" = "x" ]; then - # If downloaded from the head, Github creates the + # If downloaded from the head, GitHub creates the # zip file with all files dated from the last # change: use the Makefile's modification time as a # release number From 3d959eb425afa8261cccd48b02f33abb81176bef Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:27:21 -0400 Subject: [PATCH 02/32] spelling: address Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- udp-listener.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/udp-listener.c b/udp-listener.c index 54881e2b..930d2d55 100644 --- a/udp-listener.c +++ b/udp-listener.c @@ -92,7 +92,7 @@ static void udp_protocol_list_init(void) } /* Configuration sanity check for UDP: - * - If there is a listening addres, there must be at least one target + * - If there is a listening address, there must be at least one target */ static void udp_sanity_check(void) { From a6a73f4d321292165db884f21ae210a0cf994520 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:27:50 -0400 Subject: [PATCH 03/32] spelling: arbitrary Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- echosrv-conf.c | 2 +- sslh-conf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/echosrv-conf.c b/echosrv-conf.c index dbd9b2ec..bac3f2bc 100644 --- a/echosrv-conf.c +++ b/echosrv-conf.c @@ -365,7 +365,7 @@ static int clcpy(config_type type, void* target, const void* cl_arg) return 0; } -/* Copy the value of a string argument to arbitary memory +/* Copy the value of a string argument to arbitrary memory * location that must be large enough, converting on the way * (i.e. CFG_INT gets atoi() and so on) */ /* 0: success diff --git a/sslh-conf.c b/sslh-conf.c index b60cfc1e..7b3af564 100644 --- a/sslh-conf.c +++ b/sslh-conf.c @@ -365,7 +365,7 @@ static int clcpy(config_type type, void* target, const void* cl_arg) return 0; } -/* Copy the value of a string argument to arbitary memory +/* Copy the value of a string argument to arbitrary memory * location that must be large enough, converting on the way * (i.e. CFG_INT gets atoi() and so on) */ /* 0: success From 32aaacf4e7416f9c38b9c2c5962f7e7e2158b22a Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:27:58 -0400 Subject: [PATCH 04/32] spelling: argument Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- argtable3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/argtable3.c b/argtable3.c index ba15bb52..e5855923 100644 --- a/argtable3.c +++ b/argtable3.c @@ -2927,7 +2927,7 @@ static int arg_file_scanfn(struct arg_file* parent, const char* argval) { } else if (!argval) { /* a valid argument with no argument value was given. */ /* This happens when an optional argument value was invoked. */ - /* leave parent arguiment value unaltered but still count the argument. */ + /* leave parent argument value unaltered but still count the argument. */ parent->count++; } else { parent->filename[parent->count] = argval; @@ -3173,7 +3173,7 @@ static int arg_int_scanfn(struct arg_int* parent, const char* argval) { } else if (!argval) { /* a valid argument with no argument value was given. */ /* This happens when an optional argument value was invoked. */ - /* leave parent arguiment value unaltered but still count the argument. */ + /* leave parent argument value unaltered but still count the argument. */ parent->count++; } else { long int val; From 40ddc4900a42d3aab036b42ddaf1238e1a839c5c Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:28:24 -0400 Subject: [PATCH 05/32] spelling: command Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- scripts/etc.sysconfig.sslh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/etc.sysconfig.sslh b/scripts/etc.sysconfig.sslh index 72d04b2b..322fddfc 100644 --- a/scripts/etc.sysconfig.sslh +++ b/scripts/etc.sysconfig.sslh @@ -18,7 +18,7 @@ #CONFIG=/etc/sslh.cfg # -# Extra option to pass on comand line +# Extra option to pass on command line # Those can supersede configuration file settings # #OPTIONS= From 306164531f5749e037769c7a0e0b4ae7d01b05df Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:30:29 -0400 Subject: [PATCH 06/32] spelling: defining Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- argtable3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/argtable3.h b/argtable3.h index 487c22d3..5565d030 100644 --- a/argtable3.h +++ b/argtable3.h @@ -95,7 +95,7 @@ typedef int(arg_comparefn)(const void* k1, const void* k2); typedef struct arg_hdr { char flag; /* Modifier flags: ARG_TERMINATOR, ARG_HASVALUE. */ const char* shortopts; /* String defining the short options */ - const char* longopts; /* String defiing the long options */ + const char* longopts; /* String defining the long options */ const char* datatype; /* Description of the argument data type */ const char* glossary; /* Description of the option as shown by arg_print_glossary function */ int mincount; /* Minimum number of occurences of this option accepted */ From cb52f3cdb4cab45b9d563404ba0658b2889c1255 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:30:44 -0400 Subject: [PATCH 07/32] spelling: deleterious Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- argtable3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/argtable3.c b/argtable3.c index e5855923..b3de5b1e 100644 --- a/argtable3.c +++ b/argtable3.c @@ -5956,7 +5956,7 @@ int arg_nullcheck(void** argtable) { * that entry were still allocated ok. Those subsequent allocations will not be * deallocated by arg_free(). * Despite the unlikeliness of the problem occurring, and the even unlikelier event - * that it has any deliterious effect, it is fixed regardless by replacing arg_free() + * that it has any deleterious effect, it is fixed regardless by replacing arg_free() * with the newer arg_freetable() function. * We still keep arg_free() for backwards compatibility. */ From 08bea0e15d3636d476b0a2474198042a755bf497 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:30:59 -0400 Subject: [PATCH 08/32] spelling: discrepancy Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- echosrv-conf.c | 2 +- hashtest/run | 2 +- sslh-conf.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/echosrv-conf.c b/echosrv-conf.c index bac3f2bc..e9b5197d 100644 --- a/echosrv-conf.c +++ b/echosrv-conf.c @@ -862,7 +862,7 @@ static int set_target_fields(void* target_addr, struct compound_cl_arg* arg, con if (pmatch[pmatch_cnt].rm_so == -1) { /* This should not happen as regexec() did * match before, unless there is a - * discrepency between the regex and the + * discrepancy between the regex and the * number of backreferences */ return 0; } diff --git a/hashtest/run b/hashtest/run index 58176008..724d03aa 100755 --- a/hashtest/run +++ b/hashtest/run @@ -5,7 +5,7 @@ # Tests scripts are in *.tst files. # Corresponding output is put in *.out. # Reference output is put in *.ref. -# Any discrepency will be reported! +# Any discrepancy will be reported! use strict; diff --git a/sslh-conf.c b/sslh-conf.c index 7b3af564..ef425892 100644 --- a/sslh-conf.c +++ b/sslh-conf.c @@ -1818,7 +1818,7 @@ static int set_target_fields(void* target_addr, struct compound_cl_arg* arg, con if (pmatch[pmatch_cnt].rm_so == -1) { /* This should not happen as regexec() did * match before, unless there is a - * discrepency between the regex and the + * discrepancy between the regex and the * number of backreferences */ return 0; } From 39de82ae1300ab432eed8839b8872ee38d5a4449 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:31:40 -0400 Subject: [PATCH 09/32] spelling: echosrv Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- echosrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/echosrv.c b/echosrv.c index 3e69d4c8..6b513eb0 100644 --- a/echosrv.c +++ b/echosrv.c @@ -1,6 +1,6 @@ /* echosrv: a simple line echo server with optional prefix adding. * - * echsrv --listen localhost6:1234 --prefix "ssl: " + * echosrv --listen localhost6:1234 --prefix "ssl: " * * This will bind to 1234, and echo every line pre-pending "ssl: ". This is * used for testing: we create several such servers with different prefixes, From f520c616ccc5ddc0b182a81ac0dfea59f311c824 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:33:25 -0400 Subject: [PATCH 10/32] spelling: explicitly Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2cecd34..83073981 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,7 +41,7 @@ v1.22: 17AUG2021 combined with incoming TLS with SNI. UDP clients and servers need to agree on the IPv4/IPv6 they use: use the same protocol on all sides! Often, this - means explicitely using 'ip4-localhost'. + means explicitly using 'ip4-localhost'. UDP sender-receiver pairs (connections, so to speak) are kept for 60s, which can be changed with `udp_timeout` in the configuration. @@ -294,7 +294,7 @@ v1.11: 21APR2012 --user isn't specified, just run as current user. No longer create PID file by default, it should be - explicitely set with --pidfile. + explicitly set with --pidfile. No longer log to syslog if in foreground. Logs are instead output to stderr. From 44bac28718f57c8d12a88a7b4ced8cf2560c4126 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:33:59 -0400 Subject: [PATCH 11/32] spelling: freebind Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 83073981..1de9a282 100644 --- a/ChangeLog +++ b/ChangeLog @@ -209,7 +209,7 @@ v1.16: 11FEB2014 actual errors if connections are dropped before getting to getpeername). - Set IP_FREEDBIND if available to bind to addresses + Set IP_FREEBIND if available to bind to addresses that don't yet exist. v1.15: 27JUL2013 From 2c48b8d83b9b5a3331b66131b9b662d0417b3e78 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:34:10 -0400 Subject: [PATCH 12/32] spelling: functionally Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1de9a282..31831517 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ v2.0: - New sslh-ev: this is functionaly equivalent to + New sslh-ev: this is functionally equivalent to sslh-select (mono-process, only forks for specified protocols), but based on libev, which should make it scalable to large numbers of connections. From 1eeba073964b2accce2b0f11d73a6b89cfec813e Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:34:49 -0400 Subject: [PATCH 13/32] spelling: inconsistency Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 31831517..651a82ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -385,7 +385,7 @@ v1.8: 15JUL2011 v1.7: 01FEB2010 Added CentOS init.d script (Andre Krajnik). - Fixed default ssl address inconsistancy, now + Fixed default ssl address inconsistency, now defaults to "localhost:443" and fixed documentation accordingly (pointed by Markus Schalke). From 8ef3e8ddd854e5a203a3f47673247334f9bb8097 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:35:30 -0400 Subject: [PATCH 14/32] spelling: increase Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- udp-listener.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/udp-listener.c b/udp-listener.c index 930d2d55..cb16f4ff 100644 --- a/udp-listener.c +++ b/udp-listener.c @@ -294,7 +294,7 @@ struct connection* udp_c2s_forward(int sockfd, struct loop_info* fd_info) res = new_source(fd_info->hash_sources, cnx); if (res == -1) { - print_message(msg_connections_error, "Out of hash space for new incoming UDP connection -- increaѕe udp_max_connections"); + print_message(msg_connections_error, "Out of hash space for new incoming UDP connection -- increase udp_max_connections"); collection_remove_cnx(collection, cnx); return NULL; } From 9deedec029372eaf82316ad1065bc8db7c9a924c Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:36:17 -0400 Subject: [PATCH 15/32] spelling: initialised Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- argtable3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/argtable3.h b/argtable3.h index 5565d030..4785fff7 100644 --- a/argtable3.h +++ b/argtable3.h @@ -87,7 +87,7 @@ typedef int(arg_comparefn)(const void* k1, const void* k2); * that particular arg_xxx arguments, performing post-parse checks, and * reporting errors. * These functions are private to the individual arg_xxx source code - * and are the pointer to them are initiliased by that arg_xxx struct's + * and are the pointer to them are initialised by that arg_xxx struct's * constructor function. The user could alter them after construction * if desired, but the original intention is for them to be set by the * constructor and left unaltered. From d4908178bfe98482ca2884f779e62f9736e859e5 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:35:58 -0400 Subject: [PATCH 16/32] spelling: initialized Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- argtable3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/argtable3.c b/argtable3.c index b3de5b1e..5371459a 100644 --- a/argtable3.c +++ b/argtable3.c @@ -5451,7 +5451,7 @@ static void arg_cat_option(char* dest, size_t ndest, const char* shortopts, cons if (shortopts) { char option[3]; - /* note: option array[] is initialiazed dynamically here to satisfy */ + /* note: option array[] is initialized dynamically here to satisfy */ /* a deficiency in the watcom compiler wrt static array initializers. */ option[0] = '-'; option[1] = shortopts[0]; @@ -5509,7 +5509,7 @@ static void arg_cat_optionv(char* dest, size_t ndest, const char* shortopts, con /* "-a|-b|-c" */ char shortopt[3]; - /* note: shortopt array[] is initialiazed dynamically here to satisfy */ + /* note: shortopt array[] is initialized dynamically here to satisfy */ /* a deficiency in the watcom compiler wrt static array initializers. */ shortopt[0] = '-'; shortopt[1] = *c; From af38544316f9e7a0cdbbb3059eba798ca659f908 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:36:45 -0400 Subject: [PATCH 17/32] spelling: listening Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 651a82ba..37ac3896 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,7 +83,7 @@ v1.21: 11JUL2020 Added TCP_FASTOPEN support for client sockets (if tfo_ok is specified in their configuration) and for - listenint socket, if all client protocols support it. + listening socket, if all client protocols support it. (Craig Andrews) Added 'minlength' option to skip a probe if less From b1bfd5aee307f8ee47e4796391dce2f7106dbbfe Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:31:20 -0400 Subject: [PATCH 18/32] spelling: nonexistent Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t b/t index 4ef5b1d8..63137cba 100755 --- a/t +++ b/t @@ -396,7 +396,7 @@ if ($RB_RESOLVE_ADDRESS) { my $sslh_pid; if (!($sslh_pid = fork)) { my $user = (getpwuid $<)[0]; # Run under current username - exec "./sslh-select -v 3 -f -u $user --listen blahblah.dontexist:9000 --ssh $ssh_address --tls $ssl_address -P $pidfile"; + exec "./sslh-select -v 3 -f -u $user --listen blahblah.nonexistent:9000 --ssh $ssh_address --tls $ssl_address -P $pidfile"; } warn "spawned $sslh_pid\n"; waitpid $sslh_pid, 0; From 877ef1d27ce6481e3cd160f38ac67bee9efa5add Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:33:01 -0400 Subject: [PATCH 19/32] spelling: other Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- argtable3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/argtable3.c b/argtable3.c index 5371459a..6c3c405f 100644 --- a/argtable3.c +++ b/argtable3.c @@ -2876,9 +2876,9 @@ static void arg_file_resetfn(struct arg_file* parent) { static const char* arg_basename(const char* filename) { const char *result = NULL, *result1, *result2; - /* Find the last occurrence of eother file separator character. */ - /* Two alternative file separator chars are supported as legal */ - /* file separators but not both together in the same filename. */ + /* Find the last occurrence of other file separator character. */ + /* Two alternative file separator chars are supported as legal */ + /* file separators but not both together in the same filename. */ result1 = (filename ? strrchr(filename, FILESEPARATOR1) : NULL); result2 = (filename ? strrchr(filename, FILESEPARATOR2) : NULL); From 0217e842d283dfb69e2941948c96b7249f6402b7 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:38:36 -0400 Subject: [PATCH 20/32] spelling: overridden Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- doc/config.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/config.md b/doc/config.md index 4a0029c0..6be310ae 100644 --- a/doc/config.md +++ b/doc/config.md @@ -167,7 +167,7 @@ This parses the /etc/sslh.cfg (or /etc/sslh/sslh.cfg file if that exists instead) configuration file and dynamically generates a socket file to use. This will also merge with any sslh.socket.d drop in configuration but will be -overriden by a /etc/systemd/system/sslh.socket file. +overridden by a /etc/systemd/system/sslh.socket file. To use the generator place it in /usr/lib/systemd/system-generators and then call systemctl daemon-reload after any changes to /etc/sslh.cfg to generate @@ -196,7 +196,7 @@ will wait for incoming UDP packets, run the probes in the usual fashion, and forward packets to the appropriate target. `sslh` will then remember the association between remote host to target server for 60 seconds by default, -which can be overriden with `udp_timeout`. This allows to +which can be overridden with `udp_timeout`. This allows to process both single-datagram protocols such as DNS, and connection-based protocols such as QUIC. From 4b4c5851070cee3f4a0676203ddc36d24a983b46 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:38:47 -0400 Subject: [PATCH 21/32] spelling: parenthesis Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- argtable3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/argtable3.c b/argtable3.c index 6c3c405f..1cb10a11 100644 --- a/argtable3.c +++ b/argtable3.c @@ -3813,8 +3813,8 @@ static const TRexChar* g_nnames[] = {_SC("NONE"), _SC("OP_GREEDY"), _SC("OP_O #endif #define OP_GREEDY (MAX_CHAR + 1) /* * + ? {n} */ #define OP_OR (MAX_CHAR + 2) -#define OP_EXPR (MAX_CHAR + 3) /* parentesis () */ -#define OP_NOCAPEXPR (MAX_CHAR + 4) /* parentesis (?:) */ +#define OP_EXPR (MAX_CHAR + 3) /* parenthesis () */ +#define OP_NOCAPEXPR (MAX_CHAR + 4) /* parenthesis (?:) */ #define OP_DOT (MAX_CHAR + 5) #define OP_CLASS (MAX_CHAR + 6) #define OP_CCLASS (MAX_CHAR + 7) From 95e351e150f4536eb7d1fc9203f394115ea935bf Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:39:04 -0400 Subject: [PATCH 22/32] spelling: privileges Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 37ac3896..141d10ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -200,7 +200,7 @@ v1.16: 11FEB2014 Libcap support: Keep only CAP_NET_ADMIN if started as root with transparent proxying and dropping - priviledges (enable USELIBCAP in Makefile). This + privileges (enable USELIBCAP in Makefile). This avoids having to mess with filesystem capabilities. (Sebastian Schmidt/yath) From 6b8a203691e0fa10a6676576ca87f036d120170d Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:39:27 -0400 Subject: [PATCH 23/32] spelling: responsibility Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- echosrv-conf.c | 2 +- sslh-conf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/echosrv-conf.c b/echosrv-conf.c index e9b5197d..87a46e4a 100644 --- a/echosrv-conf.c +++ b/echosrv-conf.c @@ -1155,7 +1155,7 @@ static void scalar_to_string(char** strp, config_setting_t* s) /* Typesets all the settings in a configuration as a * newly-allocated string. The string management is caller's -* responsability. +* responsibility. * Returns the number of scalars in the configuration */ static int cfg_as_string(config_setting_t* parent, const char* path, char** strp) { diff --git a/sslh-conf.c b/sslh-conf.c index ef425892..7f81da80 100644 --- a/sslh-conf.c +++ b/sslh-conf.c @@ -2111,7 +2111,7 @@ static void scalar_to_string(char** strp, config_setting_t* s) /* Typesets all the settings in a configuration as a * newly-allocated string. The string management is caller's -* responsability. +* responsibility. * Returns the number of scalars in the configuration */ static int cfg_as_string(config_setting_t* parent, const char* path, char** strp) { From dbfeb480fe6e992f06bafdd483bdcdc7d7bc55ee Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:39:36 -0400 Subject: [PATCH 24/32] spelling: return Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 141d10ba..f2f14810 100644 --- a/ChangeLog +++ b/ChangeLog @@ -109,7 +109,7 @@ v1.20: 20NOV2018 Before, probes were tried in order, repeating on the same probe as long it returned PROBE_AGAIN before moving to the next one. This means a probe which - requires a lot of data (i.e. returne PROBE_AGAIN for + requires a lot of data (i.e. return PROBE_AGAIN for a long time) could prevent sucessful matches from subsequent probes. The configuration file needed to take that into account. From 596a4ee5b47b930187b88b550389b277510b4a3a Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:40:19 -0400 Subject: [PATCH 25/32] spelling: shortopts Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- argtable3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/argtable3.c b/argtable3.c index 1cb10a11..1fc48609 100644 --- a/argtable3.c +++ b/argtable3.c @@ -5881,7 +5881,7 @@ static void arg_print_formatted_ds(arg_dstr_t ds, const unsigned lmargin, const * Prints the glossary in strict GNU format. * Differences to arg_print_glossary() are: * - wraps lines after 80 chars - * - indents lines without shortops + * - indents lines without shortopts * - does not accept formatstrings * * Contributed by Uli Fouquet From 2a81ec0650cf8fccc94c541021cacf4dea611b1d Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:41:05 -0400 Subject: [PATCH 26/32] spelling: subsequent Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- argtable3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/argtable3.c b/argtable3.c index 1fc48609..19fcf426 100644 --- a/argtable3.c +++ b/argtable3.c @@ -5384,7 +5384,7 @@ int arg_parse(int argc, char** argv, void** argtable) { /* Fill in the local copy of argv[]. We need a local copy because getopt rearranges argv[] which adversely affects - susbsequent parsing attempts. + subsequent parsing attempts. */ for (i = 0; i < argc; i++) argvcopy[i] = argv[i]; From 9acec69b9a68c0d5dfe4fd3d125a25d4406575ef Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:40:55 -0400 Subject: [PATCH 27/32] spelling: successful Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f2f14810..b34e3ef2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,7 +110,7 @@ v1.20: 20NOV2018 same probe as long it returned PROBE_AGAIN before moving to the next one. This means a probe which requires a lot of data (i.e. return PROBE_AGAIN for - a long time) could prevent sucessful matches from + a long time) could prevent successful matches from subsequent probes. The configuration file needed to take that into account. From 74fe57147bd584f31ba74751f594ce6a14d1cbfe Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:41:19 -0400 Subject: [PATCH 28/32] spelling: tentative Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- argtable3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/argtable3.c b/argtable3.c index 19fcf426..5b853987 100644 --- a/argtable3.c +++ b/argtable3.c @@ -5313,7 +5313,7 @@ static void arg_parse_untagged(int argc, char** argv, struct arg_hdr** table, st } } - /* if a tenative error still remains at this point then register it as a proper error */ + /* if a tentative error still remains at this point then register it as a proper error */ if (errorlast) { arg_register_error(endtable, parentlast, errorlast, optarglast); optind++; From 9e6d5cc13a20e3b43bf307146fa42733b22c780f Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:41:29 -0400 Subject: [PATCH 29/32] spelling: theoretical Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- udp-listener.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/udp-listener.c b/udp-listener.c index cb16f4ff..5aeb687a 100644 --- a/udp-listener.c +++ b/udp-listener.c @@ -251,7 +251,7 @@ struct connection* udp_c2s_forward(int sockfd, struct loop_info* fd_info) ssize_t len; socklen_t addrlen; int res, target, out = -1; - char data[65536]; /* Theoritical max is 65507 (https://en.wikipedia.org/wiki/User_Datagram_Protocol). + char data[65536]; /* Theoretical max is 65507 (https://en.wikipedia.org/wiki/User_Datagram_Protocol). This will do. Dynamic allocation is possible with the MSG_PEEK flag in recvfrom(2), but that'd imply malloc/free overhead for each packet, when really 64K is not that much */ From 3af02d5c4494f3aae1161235d93d50329ef4af96 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:41:44 -0400 Subject: [PATCH 30/32] spelling: transparent Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- ChangeLog | 2 +- doc/tproxy.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b34e3ef2..1d24e02d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -171,7 +171,7 @@ v1.18: 29MAR2016 v1.17: 09MAR2015 Support RFC5952-style IPv6 addresses, e.g. [::]:443. - Transparant proxy support for FreeBSD. + Transparent proxy support for FreeBSD. (Ruben van Staveren) Using -F with no argument will try diff --git a/doc/tproxy.md b/doc/tproxy.md index 0a917738..057d7207 100644 --- a/doc/tproxy.md +++ b/doc/tproxy.md @@ -60,7 +60,7 @@ this scheme -- let me know if you manage that: ip rule add fwmark 0x1 lookup 100 ip route add local 0.0.0.0/0 dev lo table 100 -Tranparent proxying with IPv6 is similarly set up as follows: +Transparent proxying with IPv6 is similarly set up as follows: # Set route_localnet = 1 on all interfaces so that ssl can use "localhost" as destination # Not sure if this is needed for ipv6 though From f48f74c004d367dc28f6d7896f20cdcdcf9fa2df Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:42:14 -0400 Subject: [PATCH 31/32] spelling: unprivileged Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- doc/config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/config.md b/doc/config.md index 6be310ae..d215fcfd 100644 --- a/doc/config.md +++ b/doc/config.md @@ -92,7 +92,7 @@ to the executable: sudo setcap cap_net_bind_service,cap_net_raw+pe sslh-select -Then you can run sslh-select as an unpriviledged user, e.g.: +Then you can run sslh-select as an unprivileged user, e.g.: sslh-select -p myname:443 --ssh localhost:22 --tls localhost:443 From 42476d3cdc244e212e31693be64cb0626c7381d6 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Sun, 30 Jul 2023 01:42:32 -0400 Subject: [PATCH 32/32] spelling: version Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- scripts/fail2ban/sslh-ssh.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/fail2ban/sslh-ssh.conf b/scripts/fail2ban/sslh-ssh.conf index 45d25847..73a2efbc 100644 --- a/scripts/fail2ban/sslh-ssh.conf +++ b/scripts/fail2ban/sslh-ssh.conf @@ -8,7 +8,7 @@ # but many connection attempts from the same # origin is reason enough to block. # -# Verion: 2014-03-28 +# Version: 2014-03-28 [INCLUDES]