August 2016 - tor-commits - lists.torproject.org

[tor/master] Changes file for deprecation features from #19820
by nickm＠torproject.org 20 Aug '16

20 Aug '16

commit 675119d79a2e1cb8b47639d1383d2e631f9412e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 19 20:08:07 2016 -0400 Changes file for deprecation features from #19820 --- changes/deprecation | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/changes/deprecation b/changes/deprecation new file mode 100644 index 0000000..03a537a --- /dev/null +++ b/changes/deprecation @@ -0,0 +1,31 @@ + o Major features (user interface): + - Tor now supports the ability to declare options deprecated, so that + we can recommend that people stop using them. Previously, this was + done in an ad-hoc way. + Closes ticket 19820. + + o Minor features (user interface): + - There is a new --list-deprecated-options command-line option to list + all of the deprecated options. Implemented as part of ticket 19820. + + o Deprecated features: + - A number of options are deprecated for security reasons, and may be + removed in a future version of Tor. The options are: AllowDotExit, + AllowInvalidNodes, AllowSingleHopCircuits, AllowSingleHopExits, + ClientDNSRejectInternalAddresses, + CloseHSClientCircuitsImmediatelyOnTimeout, + CloseHSServiceRendCircuitsImmediatelyOnTimeout, ExcludeSingleHopRelays, + FastFirstHopPK, TLSECGroup, UseNTorHandshake, and WarnUnsafeSocks. + + - A number of DNS-cache-related sub-options for client ports are now + deprecated for security reasons, and may be removed in a future version + of Tor. (We believe that client-side DNS cacheing is a bad idea for + anonymity, and you should not turn it on.) The options are: CacheDNS, + CacheIPv4DNS, CacheIPv6DNS, UseDNSCache, UseIPv4Cache, and + UseIPv6Cache. + + - The *ListenAddress options are now deprecated as unnecessary: the + corresponding *Port options should be used instead. These options may + someday be removed. The affected options are: ControlListenAddress, + DNSListenAddress, DirListenAddress, NATDListenAddress, ORListenAddress, + SocksListenAddress, and TransListenAddress.

1 0

[tor/master] Teach checkOptionDocs about deprecation.
by nickm＠torproject.org 20 Aug '16

20 Aug '16

commit 9b6ff4c882431dd9733a1c36fc3a2b662fa5f11a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 3 12:15:01 2016 -0400 Teach checkOptionDocs about deprecation. In particular, teach it that deprecated options must exist. --- doc/tor.1.txt | 4 ++++ src/or/config.c | 24 +++++++++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index b5d6e87..530e8ca 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -84,6 +84,10 @@ COMMAND-LINE OPTIONS [[opt-list-torrc-options]] **--list-torrc-options**:: List all valid options. +[[opt-list-deprecated-options]] **--list-deprecated-options**:: + List all valid options that are scheduled to become obsolete in a + future version. (This is a warning, not a promise.) + [[opt-version]] **--version**:: Display Tor version and exit. diff --git a/src/or/config.c b/src/or/config.c index cf1365a..a5428aa 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -603,9 +603,9 @@ static const config_deprecation_t option_deprecation_notes_[] = { "fingerprint." }, { "FastFirstHopPK", "Changing this option does not make your client more " "secure, but does make it easier to fingerprint." }, - { "CloseHSClientCircutisImmediatelyOnTimeout", "This option makes your " + { "CloseHSClientCircuitsImmediatelyOnTimeout", "This option makes your " "client easier to fingerprint." }, - { "CloseHSServiceRendircutisImmediatelyOnTimeout", "This option makes " + { "CloseHSServiceRendCircuitsImmediatelyOnTimeout", "This option makes " "your hidden services easier to fingerprint." }, { "WarnUnsafeSocks", "Changing this option makes it easier for you " "to accidentally lose your anonymity by leaking DNS information" }, @@ -2049,6 +2049,7 @@ static const struct { { "-h", TAKES_NO_ARGUMENT }, { "--help", TAKES_NO_ARGUMENT }, { "--list-torrc-options", TAKES_NO_ARGUMENT }, + { "--list-deprecated-options",TAKES_NO_ARGUMENT }, { "--nt-service", TAKES_NO_ARGUMENT }, { "-nt-service", TAKES_NO_ARGUMENT }, { NULL, 0 }, @@ -2235,7 +2236,6 @@ static void list_torrc_options(void) { int i; - smartlist_t *lines = smartlist_new(); for (i = 0; option_vars_[i].name; ++i) { const config_var_t *var = &option_vars_[i]; if (var->type == CONFIG_TYPE_OBSOLETE || @@ -2243,7 +2243,16 @@ list_torrc_options(void) continue; printf("%s\n", var->name); } - smartlist_free(lines); +} + +/** Print all deprecated but non-obsolete torrc options. */ +static void +list_deprecated_options(void) +{ + const config_deprecation_t *d; + for (d = option_deprecation_notes_; d->name; ++d) { + printf("%s\n", d->name); + } } /** Last value actually set by resolve_my_address. */ @@ -4703,10 +4712,15 @@ options_init_from_torrc(int argc, char **argv) exit(0); } if (config_line_find(cmdline_only_options, "--list-torrc-options")) { - /* For documenting validating whether we've documented everything. */ + /* For validating whether we've documented everything. */ list_torrc_options(); exit(0); } + if (config_line_find(cmdline_only_options, "--list-deprecated-options")) { + /* For validating whether what we have deprecated really exists. */ + list_deprecated_options(); + exit(0); + } if (config_line_find(cmdline_only_options, "--version")) { printf("Tor version %s.\n",get_version());

1 0

[tor/master] Add deprecation for configuration options that need to go away.
by nickm＠torproject.org 20 Aug '16

20 Aug '16

commit e6220ccbf8004090b9bcc7228b33d85d2cf9c067 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 3 11:40:43 2016 -0400 Add deprecation for configuration options that need to go away. --- src/or/config.c | 1 + src/or/confparse.c | 34 ++++++++++++++++++++++++++++++++++ src/or/confparse.h | 8 ++++++++ src/or/shared_random_state.c | 1 + src/or/statefile.c | 1 + 5 files changed, 45 insertions(+) diff --git a/src/or/config.c b/src/or/config.c index 64c9796..2f5ba6c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -636,6 +636,7 @@ STATIC config_format_t options_format = { OR_OPTIONS_MAGIC, STRUCT_OFFSET(or_options_t, magic_), option_abbrevs_, + NULL, option_vars_, options_validate_cb, NULL diff --git a/src/or/confparse.c b/src/or/confparse.c index 3532b39..233cc7c 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -181,6 +181,26 @@ config_free_lines(config_line_t *front) } } +/** If key is a deprecated configuration option, return the message + * explaining why it is deprecated (which may be an empty string). Return NULL + * if it is not deprecated. The key field must be fully expanded. */ +static const char * +config_find_deprecation(const config_format_t *fmt, const char *key) +{ + if (BUG(fmt == NULL) || BUG(key == NULL)) + return NULL; + if (fmt->deprecations == NULL) + return NULL; + + config_deprecation_t *d; + for (d = fmt->deprecations; d->name; ++d) { + if (!strcasecmp(d->name, key)) { + return d->why_deprecated ? d->why_deprecated : ""; + } + } + return NULL; +} + /** As config_find_option, but return a non-const pointer. */ config_var_t * config_find_option_mutable(config_format_t *fmt, const char *key) @@ -463,6 +483,15 @@ config_mark_lists_fragile(const config_format_t *fmt, void *options) } } +void +warn_deprecated_option(const char *what, const char *why) +{ + log_warn(LD_CONFIG, "The %s option is deprecated, and will most likely " + "be removed in a future version of Tor.%s (If you think this is " + "a mistake, please let us know!)", + what, why); +} + /** If c is a syntactically valid configuration line, update * options with its value and return 0. Otherwise return -1 for bad * key, -2 for bad value. @@ -502,6 +531,11 @@ config_assign_line(const config_format_t *fmt, void *options, c->key = tor_strdup(var->name); } + const char *deprecation_msg = config_find_deprecation(fmt, var->name); + if (deprecation_msg) { + warn_deprecated_option(var->name, deprecation_msg); + } + if (!strlen(c->value)) { /* reset or clear it, then return */ if (!clear_first) { diff --git a/src/or/confparse.h b/src/or/confparse.h index ca6fb5e..415d680 100644 --- a/src/or/confparse.h +++ b/src/or/confparse.h @@ -48,6 +48,11 @@ typedef struct config_abbrev_t { int warn; } config_abbrev_t; +typedef struct config_deprecation_t { + const char *name; + const char *why_deprecated; +} config_deprecation_t; + /* Handy macro for declaring "In the config file or on the command line, * you can abbreviate toks as tok". */ #define PLURAL(tok) { #tok, #tok "s", 0, 0 } @@ -76,6 +81,7 @@ typedef struct config_format_t { off_t magic_offset; /**< Offset of the magic value within the struct. */ config_abbrev_t *abbrevs; /**< List of abbreviations that we expand when * parsing this format. */ + config_deprecation_t *deprecations; /** List of deprecated options */ config_var_t *vars; /**< List of variables we recognize, their default * values, and where we stick them in the structure. */ validate_fn_t validate_fn; /**< Function to validate config. */ @@ -125,6 +131,8 @@ void config_free_lines(config_line_t *front); const char *config_expand_abbrev(const config_format_t *fmt, const char *option, int command_line, int warn_obsolete); +void warn_deprecated_option(const char *what, const char *why); + #endif diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c index 52a0034..c344a45 100644 --- a/src/or/shared_random_state.c +++ b/src/or/shared_random_state.c @@ -86,6 +86,7 @@ static const config_format_t state_format = { SR_DISK_STATE_MAGIC, STRUCT_OFFSET(sr_disk_state_t, magic_), NULL, + NULL, state_vars, disk_state_validate_cb, &state_extra_var, diff --git a/src/or/statefile.c b/src/or/statefile.c index 9594d9c..c2f31d6 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -121,6 +121,7 @@ static const config_format_t state_format = { OR_STATE_MAGIC, STRUCT_OFFSET(or_state_t, magic_), state_abbrevs_, + NULL, state_vars_, or_state_validate_cb, &state_extra_var,

1 0

[tor/master] Deprecate some SocksPort sub-options.
by nickm＠torproject.org 20 Aug '16

20 Aug '16

commit f3314aa6e1e307467a684f1477e2af1568a728b6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 3 12:24:04 2016 -0400 Deprecate some SocksPort sub-options. --- src/or/config.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/or/config.c b/src/or/config.c index a5428aa..b6ea089 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6186,6 +6186,20 @@ config_parse_unix_port(const char *addrport, char **path_out) } #endif /* defined(HAVE_SYS_UN_H) */ +static void +warn_client_dns_cache(const char *option, int disabling) +{ + if (disabling) + return; + + warn_deprecated_option(option, + "Client-side DNS cacheing enables a wide variety of route-" + "capture attacks. If a single bad exit node lies to you about " + "an IP address, cacheing that address would make you visit " + "an address of the attacker's choice every time you connected " + "to your destination."); +} + /** * Parse port configuration for a single port type. * @@ -6554,21 +6568,27 @@ parse_port_config(smartlist_t *out, } } if (!strcasecmp(elt, "CacheIPv4DNS")) { + warn_client_dns_cache(elt, no); cache_ipv4 = ! no; continue; } else if (!strcasecmp(elt, "CacheIPv6DNS")) { + warn_client_dns_cache(elt, no); cache_ipv6 = ! no; continue; } else if (!strcasecmp(elt, "CacheDNS")) { + warn_client_dns_cache(elt, no); cache_ipv4 = cache_ipv6 = ! no; continue; } else if (!strcasecmp(elt, "UseIPv4Cache")) { + warn_client_dns_cache(elt, no); use_cached_ipv4 = ! no; continue; } else if (!strcasecmp(elt, "UseIPv6Cache")) { + warn_client_dns_cache(elt, no); use_cached_ipv6 = ! no; continue; } else if (!strcasecmp(elt, "UseDNSCache")) { + warn_client_dns_cache(elt, no); use_cached_ipv4 = use_cached_ipv6 = ! no; continue; } else if (!strcasecmp(elt, "PreferIPv6Automap")) {

1 0

[tor/master] Merge remote-tracking branch 'public/deprecation_v2'
by nickm＠torproject.org 20 Aug '16

20 Aug '16

commit 507f07de098a14d54dfc2a2fdc603b49d563ef01 Merge: 5aad921 f5dcab8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 19 19:58:51 2016 -0400 Merge remote-tracking branch 'public/deprecation_v2' doc/tor.1.txt | 4 ++ src/or/config.c | 93 +++++++++++++++++++++++++++++++++++++++----- src/or/config.h | 4 +- src/or/confparse.c | 55 ++++++++++++++++++++++---- src/or/confparse.h | 13 ++++++- src/or/control.c | 5 ++- src/or/shared_random_state.c | 3 +- src/or/statefile.c | 3 +- src/test/test_options.c | 12 +++--- 9 files changed, 162 insertions(+), 30 deletions(-) diff --cc src/or/config.c index 06ce161,a57b83e..c1f82c8 --- a/src/or/config.c +++ b/src/or/config.c @@@ -2142,8 -2192,8 +2181,8 @@@ options_trial_assign(config_line_t *lis or_options_t *trial_options = config_dup(&options_format, get_options()); if ((r=config_assign(&options_format, trial_options, - list, use_defaults, clear_first, msg)) < 0) { + list, flags, msg)) < 0) { - config_free(&options_format, trial_options); + or_options_free(trial_options); return r; }

1 0

[tor/master] Add new warn_deprecated option to config_assign*().
by nickm＠torproject.org 20 Aug '16

20 Aug '16

commit f5dcab8072e4f8471cc0d4d8a28c79272467fb92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 3 12:52:26 2016 -0400 Add new warn_deprecated option to config_assign*(). Also, collapse all the config_assign*() options into a flags argument, since having two boolean arguments was already confusing. --- src/or/config.c | 14 +++++++------- src/or/config.h | 4 ++-- src/or/confparse.c | 24 +++++++++++++++--------- src/or/confparse.h | 6 +++++- src/or/control.c | 5 +++-- src/or/shared_random_state.c | 2 +- src/or/statefile.c | 2 +- src/test/test_options.c | 12 ++++++------ 8 files changed, 40 insertions(+), 29 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index b6ea089..a57b83e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2186,14 +2186,13 @@ option_get_assignment(const or_options_t *options, const char *key) * what went wrong. */ setopt_err_t -options_trial_assign(config_line_t *list, int use_defaults, - int clear_first, char **msg) +options_trial_assign(config_line_t *list, unsigned flags, char **msg) { int r; or_options_t *trial_options = config_dup(&options_format, get_options()); if ((r=config_assign(&options_format, trial_options, - list, use_defaults, clear_first, msg)) < 0) { + list, flags, msg)) < 0) { config_free(&options_format, trial_options); return r; } @@ -4899,7 +4898,8 @@ options_init_from_string(const char *cf_defaults, const char *cf, err = SETOPT_ERR_PARSE; goto err; } - retval = config_assign(&options_format, newoptions, cl, 0, 0, msg); + retval = config_assign(&options_format, newoptions, cl, + CAL_WARN_DEPRECATIONS, msg); config_free_lines(cl); if (retval < 0) { err = SETOPT_ERR_PARSE; @@ -4915,7 +4915,7 @@ options_init_from_string(const char *cf_defaults, const char *cf, /* Go through command-line variables too */ retval = config_assign(&options_format, newoptions, - global_cmdline_options, 0, 0, msg); + global_cmdline_options, CAL_WARN_DEPRECATIONS, msg); if (retval < 0) { err = SETOPT_ERR_PARSE; goto err; @@ -4963,7 +4963,7 @@ options_init_from_string(const char *cf_defaults, const char *cf, err = SETOPT_ERR_PARSE; goto err; } - retval = config_assign(&options_format, newoptions, cl, 0, 0, msg); + retval = config_assign(&options_format, newoptions, cl, 0, msg); config_free_lines(cl); if (retval < 0) { err = SETOPT_ERR_PARSE; @@ -4974,7 +4974,7 @@ options_init_from_string(const char *cf_defaults, const char *cf, } /* Assign command-line variables a second time too */ retval = config_assign(&options_format, newoptions, - global_cmdline_options, 0, 0, msg); + global_cmdline_options, 0, msg); if (retval < 0) { err = SETOPT_ERR_PARSE; goto err; diff --git a/src/or/config.h b/src/or/config.h index a0fe6e4..9d020b3 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -29,8 +29,8 @@ const char *escaped_safe_str_client(const char *address); const char *escaped_safe_str(const char *address); const char *get_version(void); const char *get_short_version(void); -setopt_err_t options_trial_assign(config_line_t *list, int use_defaults, - int clear_first, char **msg); +setopt_err_t options_trial_assign(config_line_t *list, unsigned flags, + char **msg); uint32_t get_last_resolved_addr(void); void reset_last_resolved_addr(void); diff --git a/src/or/confparse.c b/src/or/confparse.c index 8bd4b81..e9d5645 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -504,9 +504,12 @@ warn_deprecated_option(const char *what, const char *why) */ static int config_assign_line(const config_format_t *fmt, void *options, - config_line_t *c, int use_defaults, - int clear_first, bitarray_t *options_seen, char **msg) + config_line_t *c, unsigned flags, + bitarray_t *options_seen, char **msg) { + const unsigned use_defaults = flags & CAL_USE_DEFAULTS; + const unsigned clear_first = flags & CAL_CLEAR_FIRST; + const unsigned warn_deprecations = flags & CAL_WARN_DEPRECATIONS; const config_var_t *var; CONFIG_CHECK(fmt, options); @@ -532,8 +535,9 @@ config_assign_line(const config_format_t *fmt, void *options, c->key = tor_strdup(var->name); } - const char *deprecation_msg = config_find_deprecation(fmt, var->name); - if (deprecation_msg) { + const char *deprecation_msg; + if (warn_deprecations && + (deprecation_msg = config_find_deprecation(fmt, var->name))) { warn_deprecated_option(var->name, deprecation_msg); } @@ -639,7 +643,7 @@ config_lines_dup(const config_line_t *inp) * escape that value. Return NULL if no such key exists. */ config_line_t * config_get_assigned_option(const config_format_t *fmt, const void *options, - const char *key, int escape_val) + const char *key, int escape_val) { const config_var_t *var; const void *value; @@ -839,11 +843,13 @@ options_trial_assign() calls config_assign(1, 1) */ int config_assign(const config_format_t *fmt, void *options, config_line_t *list, - int use_defaults, int clear_first, char **msg) + unsigned config_assign_flags, char **msg) { config_line_t *p; bitarray_t *options_seen; const int n_options = config_count_options(fmt); + const unsigned clear_first = config_assign_flags & CAL_CLEAR_FIRST; + const unsigned use_defaults = config_assign_flags & CAL_USE_DEFAULTS; CONFIG_CHECK(fmt, options); @@ -867,8 +873,8 @@ config_assign(const config_format_t *fmt, void *options, config_line_t *list, /* pass 3: assign. */ while (list) { int r; - if ((r=config_assign_line(fmt, options, list, use_defaults, - clear_first, options_seen, msg))) { + if ((r=config_assign_line(fmt, options, list, config_assign_flags, + options_seen, msg))) { bitarray_free(options_seen); return r; } @@ -1064,7 +1070,7 @@ config_dup(const config_format_t *fmt, const void *old) line = config_get_assigned_option(fmt, old, fmt->vars[i].name, 0); if (line) { char *msg = NULL; - if (config_assign(fmt, newopts, line, 0, 0, &msg) < 0) { + if (config_assign(fmt, newopts, line, 0, &msg) < 0) { log_err(LD_BUG, "config_get_assigned_option() generated " "something we couldn't config_assign(): %s", msg); tor_free(msg); diff --git a/src/or/confparse.h b/src/or/confparse.h index 87dd6d8..cf92ac4 100644 --- a/src/or/confparse.h +++ b/src/or/confparse.h @@ -98,6 +98,10 @@ typedef struct config_format_t { *(uint32_t*)STRUCT_VAR_P(cfg,fmt->magic_offset)); \ STMT_END +#define CAL_USE_DEFAULTS (1u<<0) +#define CAL_CLEAR_FIRST (1u<<1) +#define CAL_WARN_DEPRECATIONS (1u<<2) + void *config_new(const config_format_t *fmt); void config_line_append(config_line_t **lst, const char *key, const char *val); @@ -120,7 +124,7 @@ char *config_dump(const config_format_t *fmt, const void *default_options, int comment_defaults); int config_assign(const config_format_t *fmt, void *options, config_line_t *list, - int use_defaults, int clear_first, char **msg); + unsigned flags, char **msg); config_var_t *config_find_option_mutable(config_format_t *fmt, const char *key); const config_var_t *config_find_option(const config_format_t *fmt, diff --git a/src/or/control.c b/src/or/control.c index 64a980d..9d453d2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -871,7 +871,8 @@ control_setconf_helper(control_connection_t *conn, uint32_t len, char *body, config_line_t *lines=NULL; char *start = body; char *errstring = NULL; - const int clear_first = 1; + const unsigned flags = + CAL_CLEAR_FIRST | (use_defaults ? CAL_USE_DEFAULTS : 0); char *config; smartlist_t *entries = smartlist_new(); @@ -931,7 +932,7 @@ control_setconf_helper(control_connection_t *conn, uint32_t len, char *body, } tor_free(config); - opt_err = options_trial_assign(lines, use_defaults, clear_first, &errstring); + opt_err = options_trial_assign(lines, flags, &errstring); { const char *msg; switch (opt_err) { diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c index c344a45..42768a4 100644 --- a/src/or/shared_random_state.c +++ b/src/or/shared_random_state.c @@ -701,7 +701,7 @@ disk_state_load_from_disk_impl(const char *fname) } disk_state = disk_state_new(time(NULL)); - config_assign(&state_format, disk_state, lines, 0, 0, &errmsg); + config_assign(&state_format, disk_state, lines, 0, &errmsg); config_free_lines(lines); if (errmsg) { log_warn(LD_DIR, "SR: Reading state error: %s", errmsg); diff --git a/src/or/statefile.c b/src/or/statefile.c index c2f31d6..adf9d9f 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -350,7 +350,7 @@ or_state_load(void) if (config_get_lines(contents, &lines, 0)<0) goto done; assign_retval = config_assign(&state_format, new_state, - lines, 0, 0, &errmsg); + lines, 0, &errmsg); config_free_lines(lines); if (assign_retval<0) badstate = 1; diff --git a/src/test/test_options.c b/src/test/test_options.c index 8d1d6f9..87f8966 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -121,7 +121,7 @@ test_options_validate_impl(const char *configuration, r = config_get_lines(configuration, &cl, 1); tt_int_op(r, OP_EQ, 0); - r = config_assign(&options_format, opt, cl, 0, 0, &msg); + r = config_assign(&options_format, opt, cl, 0, &msg); tt_int_op(r, OP_EQ, 0); r = options_validate(NULL, opt, dflt, 0, &msg); @@ -223,7 +223,7 @@ test_have_enough_mem_for_dircache(void *arg) r = config_get_lines(configuration, &cl, 1); tt_int_op(r, OP_EQ, 0); - r = config_assign(&options_format, opt, cl, 0, 0, &msg); + r = config_assign(&options_format, opt, cl, 0, &msg); tt_int_op(r, OP_EQ, 0); /* 300 MB RAM available, DirCache enabled */ @@ -246,7 +246,7 @@ test_have_enough_mem_for_dircache(void *arg) r = config_get_lines(configuration, &cl, 1); tt_int_op(r, OP_EQ, 0); - r = config_assign(&options_format, opt, cl, 0, 0, &msg); + r = config_assign(&options_format, opt, cl, 0, &msg); tt_int_op(r, OP_EQ, 0); /* 300 MB RAM available, DirCache enabled, Bridge */ @@ -269,7 +269,7 @@ test_have_enough_mem_for_dircache(void *arg) r = config_get_lines(configuration, &cl, 1); tt_int_op(r, OP_EQ, 0); - r = config_assign(&options_format, opt, cl, 0, 0, &msg); + r = config_assign(&options_format, opt, cl, 0, &msg); tt_int_op(r, OP_EQ, 0); /* 200 MB RAM available, DirCache disabled */ @@ -354,7 +354,7 @@ get_options_test_data(const char *conf) result->def_opt = options_new(); rv = config_get_lines(conf, &cl, 1); tt_assert(rv == 0); - rv = config_assign(&options_format, result->opt, cl, 0, 0, &msg); + rv = config_assign(&options_format, result->opt, cl, 0, &msg); if (msg) { /* Display the parse error message by comparing it with an empty string */ tt_str_op(msg, OP_EQ, ""); @@ -365,7 +365,7 @@ get_options_test_data(const char *conf) result->opt->TokenBucketRefillInterval = 1; rv = config_get_lines(TEST_OPTIONS_OLD_VALUES, &cl, 1); tt_assert(rv == 0); - rv = config_assign(&options_format, result->def_opt, cl, 0, 0, &msg); + rv = config_assign(&options_format, result->def_opt, cl, 0, &msg); if (msg) { /* Display the parse error message by comparing it with an empty string */ tt_str_op(msg, OP_EQ, "");

1 0

[tor/master] Add comments to explain when things were deprecated
by nickm＠torproject.org 20 Aug '16

20 Aug '16

commit 05ad2db283744609ea9414c2ba434a495e183a3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 19 20:09:51 2016 -0400 Add comments to explain when things were deprecated --- src/or/config.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index c1f82c8..a94e959 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -589,6 +589,7 @@ static const config_var_t testing_tor_network_defaults[] = { #undef OBSOLETE static const config_deprecation_t option_deprecation_notes_[] = { + /* Deprecated since 0.2.9.2-alpha... */ { "AllowDotExit", "Unrestricted use of the .exit notation can be used for " "a wide variety of application-level attacks." }, { "AllowInvalidNodes", "There is no reason to enable this option; at best " @@ -612,7 +613,6 @@ static const config_deprecation_t option_deprecation_notes_[] = { { "TLSECGroup", "The default is a nice secure choice; the other option " "is less secure." }, { "UseNTorHandshake", "The ntor handshake should always be used." }, - { "ControlListenAddress", "Use ControlPort instead." }, { "DirListenAddress", "Use DirPort instead, possibly with the " "NoAdvertise sub-option" }, @@ -622,6 +622,7 @@ static const config_deprecation_t option_deprecation_notes_[] = { { "NATDListenAddress", "Use NATDPort instead." }, { "ORListenAddress", "Use ORPort instead, possibly with the " "NoAdvertise sub-option" }, + /* End of options deprecated since 0.2.9.2-alpha. */ { NULL, NULL } }; @@ -6551,27 +6552,27 @@ parse_port_config(smartlist_t *out, } } if (!strcasecmp(elt, "CacheIPv4DNS")) { - warn_client_dns_cache(elt, no); + warn_client_dns_cache(elt, no); // since 0.2.9.2-alpha cache_ipv4 = ! no; continue; } else if (!strcasecmp(elt, "CacheIPv6DNS")) { - warn_client_dns_cache(elt, no); + warn_client_dns_cache(elt, no); // since 0.2.9.2-alpha cache_ipv6 = ! no; continue; } else if (!strcasecmp(elt, "CacheDNS")) { - warn_client_dns_cache(elt, no); + warn_client_dns_cache(elt, no); // since 0.2.9.2-alpha cache_ipv4 = cache_ipv6 = ! no; continue; } else if (!strcasecmp(elt, "UseIPv4Cache")) { - warn_client_dns_cache(elt, no); + warn_client_dns_cache(elt, no); // since 0.2.9.2-alpha use_cached_ipv4 = ! no; continue; } else if (!strcasecmp(elt, "UseIPv6Cache")) { - warn_client_dns_cache(elt, no); + warn_client_dns_cache(elt, no); // since 0.2.9.2-alpha use_cached_ipv6 = ! no; continue; } else if (!strcasecmp(elt, "UseDNSCache")) { - warn_client_dns_cache(elt, no); + warn_client_dns_cache(elt, no); // since 0.2.9.2-alpha use_cached_ipv4 = use_cached_ipv6 = ! no; continue; } else if (!strcasecmp(elt, "PreferIPv6Automap")) {

1 0

[tor/master] Added a voting_schedule_free function to free voting schedules.
by nickm＠torproject.org 19 Aug '16

19 Aug '16

commit 8c0fdf6a276077123c356f3fc9d29eebfc41db72 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Tue Aug 16 17:53:38 2016 +0100 Added a voting_schedule_free function to free voting schedules. Existing Uses of the tor_free function on voting schedules were replaced with voting_schedule_free. Fixes #19562. --- src/or/dirvote.c | 11 +++++++++-- src/or/dirvote.h | 2 ++ src/or/shared_random.c | 2 +- src/or/shared_random_state.c | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 94a13e3..7c80868 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2577,7 +2577,7 @@ get_next_valid_after_time(time_t now) tor_assert(new_voting_schedule); next_valid_after_time = new_voting_schedule->interval_starts; - tor_free(new_voting_schedule); + free_voting_schedule(new_voting_schedule); return next_valid_after_time; } @@ -2601,7 +2601,7 @@ dirvote_recalculate_timing(const or_options_t *options, time_t now) /* Fill in the global static struct now */ memcpy(&voting_schedule, new_voting_schedule, sizeof(voting_schedule)); - tor_free(new_voting_schedule); + free_voting_schedule(new_voting_schedule); } /* Populate and return a new voting_schedule_t that can be used to schedule @@ -2660,6 +2660,13 @@ get_voting_schedule(const or_options_t *options, time_t now, int severity) return new_voting_schedule; } +/** Frees a voting_schedule_t. This should be used instead of the generic tor_free. */ +void +free_voting_schedule(voting_schedule_t *voting_schedule_to_free) +{ + tor_free(voting_schedule_to_free); +} + /** Entry point: Take whatever voting actions are pending as of now. */ void dirvote_act(const or_options_t *options, time_t now) diff --git a/src/or/dirvote.h b/src/or/dirvote.h index 2a83802..23084cd 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -157,6 +157,8 @@ typedef struct { voting_schedule_t *get_voting_schedule(const or_options_t *options, time_t now, int severity); +void free_voting_schedule(voting_schedule_t *voting_schedule_to_free); + void dirvote_get_preferred_voting_intervals(vote_timing_t *timing_out); time_t dirvote_get_start_of_next_interval(time_t now, int interval, diff --git a/src/or/shared_random.c b/src/or/shared_random.c index 0a1f24a..4453052 100644 --- a/src/or/shared_random.c +++ b/src/or/shared_random.c @@ -1328,7 +1328,7 @@ sr_act_post_consensus(const networkstatus_t *consensus) get_voting_schedule(options,time(NULL), LOG_NOTICE); time_t interval_starts = voting_schedule->interval_starts; sr_state_update(interval_starts); - tor_free(voting_schedule); + free_voting_schedule(voting_schedule); } } diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c index 52a0034..4985af1 100644 --- a/src/or/shared_random_state.c +++ b/src/or/shared_random_state.c @@ -150,7 +150,7 @@ get_start_time_of_current_round(time_t now) voting_interval, options->TestingV3AuthVotingStartOffset); - tor_free(new_voting_schedule); + free_voting_schedule(new_voting_schedule); return curr_start; }

1 0

[tor/master] Merge remote-tracking branch 'jigsaw/fix-19562'
by nickm＠torproject.org 19 Aug '16

19 Aug '16

commit 3e8f93bb103d3537703c168a82450aeab5f96710 Merge: fdc2a91 8c0fdf6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 19 19:41:53 2016 -0400 Merge remote-tracking branch 'jigsaw/fix-19562' src/or/dirvote.c | 11 +++++++++-- src/or/dirvote.h | 2 ++ src/or/shared_random.c | 2 +- src/or/shared_random_state.c | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-)

1 0

[tor/master] Rename free_voting_schedule to voting_schedule_free. Wrap line. Follow if convention.
by nickm＠torproject.org 19 Aug '16

19 Aug '16

commit 5aad921e3a02cd96158cc54d309d072ed21b3aba Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 19 19:44:19 2016 -0400 Rename free_voting_schedule to voting_schedule_free. Wrap line. Follow if convention. --- src/or/dirvote.c | 11 +++++++---- src/or/dirvote.h | 2 +- src/or/shared_random.c | 2 +- src/or/shared_random_state.c | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 7c80868..9748f4a 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2577,7 +2577,7 @@ get_next_valid_after_time(time_t now) tor_assert(new_voting_schedule); next_valid_after_time = new_voting_schedule->interval_starts; - free_voting_schedule(new_voting_schedule); + voting_schedule_free(new_voting_schedule); return next_valid_after_time; } @@ -2601,7 +2601,7 @@ dirvote_recalculate_timing(const or_options_t *options, time_t now) /* Fill in the global static struct now */ memcpy(&voting_schedule, new_voting_schedule, sizeof(voting_schedule)); - free_voting_schedule(new_voting_schedule); + voting_schedule_free(new_voting_schedule); } /* Populate and return a new voting_schedule_t that can be used to schedule @@ -2660,10 +2660,13 @@ get_voting_schedule(const or_options_t *options, time_t now, int severity) return new_voting_schedule; } -/** Frees a voting_schedule_t. This should be used instead of the generic tor_free. */ +/** Frees a voting_schedule_t. This should be used instead of the generic + * tor_free. */ void -free_voting_schedule(voting_schedule_t *voting_schedule_to_free) +voting_schedule_free(voting_schedule_t *voting_schedule_to_free) { + if (!voting_schedule_to_free) + return; tor_free(voting_schedule_to_free); } diff --git a/src/or/dirvote.h b/src/or/dirvote.h index 23084cd..a1f71ce 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -157,7 +157,7 @@ typedef struct { voting_schedule_t *get_voting_schedule(const or_options_t *options, time_t now, int severity); -void free_voting_schedule(voting_schedule_t *voting_schedule_to_free); +void voting_schedule_free(voting_schedule_t *voting_schedule_to_free); void dirvote_get_preferred_voting_intervals(vote_timing_t *timing_out); time_t dirvote_get_start_of_next_interval(time_t now, diff --git a/src/or/shared_random.c b/src/or/shared_random.c index 4453052..19564f5 100644 --- a/src/or/shared_random.c +++ b/src/or/shared_random.c @@ -1328,7 +1328,7 @@ sr_act_post_consensus(const networkstatus_t *consensus) get_voting_schedule(options,time(NULL), LOG_NOTICE); time_t interval_starts = voting_schedule->interval_starts; sr_state_update(interval_starts); - free_voting_schedule(voting_schedule); + voting_schedule_free(voting_schedule); } } diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c index 4985af1..655b950 100644 --- a/src/or/shared_random_state.c +++ b/src/or/shared_random_state.c @@ -150,7 +150,7 @@ get_start_time_of_current_round(time_t now) voting_interval, options->TestingV3AuthVotingStartOffset); - free_voting_schedule(new_voting_schedule); + voting_schedule_free(new_voting_schedule); return curr_start; }

1 0