diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-05-06 15:18:36 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-05-06 15:18:36 -0400 |
commit | 3e42464f5a6f8fac7651bad05f180cc1ed2ca51d (patch) | |
tree | f41f5df20de58f17abbd8b59d55ba992966b7549 /src/core/proto | |
parent | a02e866642c28b4c0cbe415f8573c4ede4d9caf7 (diff) | |
parent | 3d3641152b5d8a4bf8587dec640bda3d440b7c36 (diff) | |
download | tor-3e42464f5a6f8fac7651bad05f180cc1ed2ca51d.tar.gz tor-3e42464f5a6f8fac7651bad05f180cc1ed2ca51d.zip |
Merge branch 'bug34078_prelim_035' into bug34078_prelim_041
Diffstat (limited to 'src/core/proto')
-rw-r--r-- | src/core/proto/proto_socks.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c index b657a7b758..f9f8c8afc0 100644 --- a/src/core/proto/proto_socks.c +++ b/src/core/proto/proto_socks.c @@ -1067,7 +1067,10 @@ parse_socks_client(const uint8_t *data, size_t datalen, log_info(LD_NET, "SOCKS 5 client: need authentication."); *drain_out = -1; return 2; - /* fall through */ + default: + /* This wasn't supposed to be exhaustive; there are other + * authentication methods too. */ + ; } *reason = tor_strdup("server doesn't support any of our available " |