aboutsummaryrefslogtreecommitdiff
path: root/src/core/proto
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-05-06 16:47:03 -0400
committerNick Mathewson <nickm@torproject.org>2020-05-06 16:47:03 -0400
commit82effefb69defc757ed2f576d40badbd8460f757 (patch)
tree667235b03238dd6074d8a7836b71a1a06803a63c /src/core/proto
parent42dfcd0ae3f7a872a781452c289b4e47c494d122 (diff)
parentfecc5fd38d80093a9c189eece4acd41c35cd36c6 (diff)
downloadtor-82effefb69defc757ed2f576d40badbd8460f757.tar.gz
tor-82effefb69defc757ed2f576d40badbd8460f757.zip
Merge branch 'maint-0.4.3'
Diffstat (limited to 'src/core/proto')
-rw-r--r--src/core/proto/proto_socks.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c
index c7d2af3d97..2070b233d2 100644
--- a/src/core/proto/proto_socks.c
+++ b/src/core/proto/proto_socks.c
@@ -1071,7 +1071,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 "