diff options
| author | David Goulet <dgoulet@torproject.org> | 2017-04-25 14:08:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-09 10:30:52 -0400 |
| commit | 8aedc589edf78a75092868192869fe84b5a53816 (patch) | |
| tree | 191fab8717eb6e1d0087e53e29f5ef38161e8b4e /src/or | |
| parent | 60cf5ac2971f746852c92980a9292ed69a694e8c (diff) | |
| download | tor-8aedc589edf78a75092868192869fe84b5a53816.tar.gz tor-8aedc589edf78a75092868192869fe84b5a53816.zip | |
config: Remove WarnUnsafeSocks option
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans
up the code associated with it.
Partially fixes #22060
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/buffers.c | 5 | ||||
| -rw-r--r-- | src/or/config.c | 4 | ||||
| -rw-r--r-- | src/or/or.h | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index 4f22935d26..58cfdeee84 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1319,7 +1319,7 @@ fetch_from_buf_http(buf_t *buf, /** * Wait this many seconds before warning the user about using SOCKS unsafely - * again (requires that WarnUnsafeSocks is turned on). */ + * again. */ #define SOCKS_WARN_INTERVAL 5 /** Warn that the user application has made an unsafe socks request using @@ -1331,9 +1331,6 @@ log_unsafe_socks_warning(int socks_protocol, const char *address, { static ratelim_t socks_ratelim = RATELIM_INIT(SOCKS_WARN_INTERVAL); - const or_options_t *options = get_options(); - if (! options->WarnUnsafeSocks) - return; if (safe_socks) { log_fn_ratelim(&socks_ratelim, LOG_WARN, LD_APP, "Your application (using socks%d to port %d) is giving " diff --git a/src/or/config.c b/src/or/config.c index 5b6932987c..1af554a3fa 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -402,7 +402,7 @@ static config_var_t option_vars_[] = { VPORT(NATDPort), V(Nickname, STRING, NULL), V(PredictedPortsRelevanceTime, INTERVAL, "1 hour"), - V(WarnUnsafeSocks, BOOL, "1"), + OBSOLETE("WarnUnsafeSocks"), VAR("NodeFamily", LINELIST, NodeFamilies, NULL), V(NumCPUs, UINT, "0"), V(NumDirectoryGuards, UINT, "0"), @@ -664,8 +664,6 @@ static const config_deprecation_t option_deprecation_notes_[] = { "a wide variety of application-level attacks." }, { "ClientDNSRejectInternalAddresses", "Turning this on makes your client " "easier to fingerprint, and may open you to esoteric attacks." }, - { "WarnUnsafeSocks", "Changing this option makes it easier for you " - "to accidentally lose your anonymity by leaking DNS information" }, { "TLSECGroup", "The default is a nice secure choice; the other option " "is less secure." }, { "ControlListenAddress", "Use ControlPort instead." }, diff --git a/src/or/or.h b/src/or/or.h index 1cdfd1b458..da3285038a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4110,10 +4110,6 @@ typedef struct { * selection. */ int AllowDotExit; - /** If true, we will warn if a user gives us only an IP address - * instead of a hostname. */ - int WarnUnsafeSocks; - /** If true, we're configured to collect statistics on clients * requesting network statuses from us as directory. */ int DirReqStatistics_option; |