April 2018 - tor-commits - lists.torproject.org

[tor/master] Improve documentation for CONFIG_TYPE_CSV_INTERVAL.
by nickm＠torproject.org 30 Apr '18

30 Apr '18

commit 510220844774dee27f40204ee24a70b81af1dcb5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 11:30:16 2018 -0400 Improve documentation for CONFIG_TYPE_CSV_INTERVAL. --- src/or/confparse.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/confparse.h b/src/or/confparse.h index 64ea65d1b..4b4bf0adb 100644 --- a/src/or/confparse.h +++ b/src/or/confparse.h @@ -28,7 +28,9 @@ typedef enum config_type_t { * optional whitespace. */ CONFIG_TYPE_CSV_INTERVAL, /**< A list of strings, separated by commas and * optional whitespace, representing intervals in - * seconds, with optional units */ + * seconds, with optional units. We allow + * multiple values here for legacy reasons, but + * ignore every value after the first. */ CONFIG_TYPE_LINELIST, /**< Uninterpreted config lines */ CONFIG_TYPE_LINELIST_S, /**< Uninterpreted, context-sensitive config lines, * mixed with other keywords. */

1 0

[tor/master] Rename find_dl_schedule to find_dl_min_delay.
by nickm＠torproject.org 30 Apr '18

30 Apr '18

commit ff6f49f033a6fdcc63eb790548b22b9cb23d3d33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 11:26:40 2018 -0400 Rename find_dl_schedule to find_dl_min_delay. (We no longer need two separate functions here.) --- src/or/directory.c | 21 +++++++-------------- src/or/directory.h | 2 -- src/test/test_dir.c | 44 ++++++++++++++++++++++---------------------- 3 files changed, 29 insertions(+), 38 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 7b7dc5b35..0cbf342df 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -5300,12 +5300,17 @@ connection_dir_finished_connecting(dir_connection_t *conn) /** Decide which download schedule we want to use based on descriptor type * in dls and options. - * Then return a list of int pointers defining download delays in seconds. + * + * Then, return the initial delay for that download schedule, in seconds. + * * Helper function for download_status_increment_failure(), * download_status_reset(), and download_status_increment_attempt(). */ STATIC int -find_dl_schedule(const download_status_t *dls, const or_options_t *options) +find_dl_min_delay(const download_status_t *dls, const or_options_t *options) { + tor_assert(dls); + tor_assert(options); + switch (dls->schedule) { case DL_SCHED_GENERIC: /* Any other directory document */ @@ -5362,18 +5367,6 @@ find_dl_schedule(const download_status_t *dls, const or_options_t *options) return 0; } -/** Decide which minimum delay step we want to use based on - * descriptor type in dls and options. - * Helper function for download_status_schedule_get_delay(). */ -STATIC int -find_dl_min_delay(const download_status_t *dls, const or_options_t *options) -{ - tor_assert(dls); - tor_assert(options); - - return find_dl_schedule(dls, options); -} - /** As next_random_exponential_delay() below, but does not compute a random * value. Instead, compute the range of values that * next_random_exponential_delay() should use when computing its random value. diff --git a/src/or/directory.h b/src/or/directory.h index e082bbf7b..5f5ff7eca 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -259,8 +259,6 @@ STATIC char* authdir_type_to_string(dirinfo_type_t auth); STATIC const char * dir_conn_purpose_to_string(int purpose); STATIC int should_use_directory_guards(const or_options_t *options); STATIC compression_level_t choose_compression_level(ssize_t n_bytes); -STATIC int find_dl_schedule(const download_status_t *dls, - const or_options_t *options); STATIC int find_dl_min_delay(const download_status_t *dls, const or_options_t *options); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 8926221f0..367ecf0b9 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -5432,7 +5432,7 @@ mock_num_bridges_usable(int use_maybe_reachable) * fallbacks. */ static void -test_dir_find_dl_schedule(void* data) +test_dir_find_dl_min_delay(void* data) { const char *str = (const char *)data; @@ -5490,20 +5490,20 @@ test_dir_find_dl_schedule(void* data) dls.schedule = DL_SCHED_GENERIC; /* client */ mock_options->ClientOnly = 1; - tt_int_op(find_dl_schedule(&dls, mock_options), OP_EQ, client); + tt_int_op(find_dl_min_delay(&dls, mock_options), OP_EQ, client); mock_options->ClientOnly = 0; /* dir mode */ mock_options->DirPort_set = 1; mock_options->DirCache = 1; - tt_int_op(find_dl_schedule(&dls, mock_options), OP_EQ, server); + tt_int_op(find_dl_min_delay(&dls, mock_options), OP_EQ, server); mock_options->DirPort_set = 0; mock_options->DirCache = 0; dls.schedule = DL_SCHED_CONSENSUS; /* public server mode */ mock_options->ORPort_set = 1; - tt_int_op(find_dl_schedule(&dls, mock_options), OP_EQ, server_cons); + tt_int_op(find_dl_min_delay(&dls, mock_options), OP_EQ, server_cons); mock_options->ORPort_set = 0; /* client and bridge modes */ @@ -5512,14 +5512,14 @@ test_dir_find_dl_schedule(void* data) dls.want_authority = 1; /* client */ mock_options->ClientOnly = 1; - tt_int_op(find_dl_schedule(&dls, mock_options), OP_EQ, + tt_int_op(find_dl_min_delay(&dls, mock_options), OP_EQ, client_boot_auth_cons); mock_options->ClientOnly = 0; /* bridge relay */ mock_options->ORPort_set = 1; mock_options->BridgeRelay = 1; - tt_int_op(find_dl_schedule(&dls, mock_options), OP_EQ, + tt_int_op(find_dl_min_delay(&dls, mock_options), OP_EQ, client_boot_auth_cons); mock_options->ORPort_set = 0; mock_options->BridgeRelay = 0; @@ -5527,14 +5527,14 @@ test_dir_find_dl_schedule(void* data) dls.want_authority = 0; /* client */ mock_options->ClientOnly = 1; - tt_int_op(find_dl_schedule(&dls, mock_options), OP_EQ, + tt_int_op(find_dl_min_delay(&dls, mock_options), OP_EQ, client_boot_fallback_cons); mock_options->ClientOnly = 0; /* bridge relay */ mock_options->ORPort_set = 1; mock_options->BridgeRelay = 1; - tt_int_op(find_dl_schedule(&dls, mock_options), OP_EQ, + tt_int_op(find_dl_min_delay(&dls, mock_options), OP_EQ, client_boot_fallback_cons); mock_options->ORPort_set = 0; mock_options->BridgeRelay = 0; @@ -5543,14 +5543,14 @@ test_dir_find_dl_schedule(void* data) /* dls.want_authority is ignored */ /* client */ mock_options->ClientOnly = 1; - tt_int_op(find_dl_schedule(&dls, mock_options), OP_EQ, + tt_int_op(find_dl_min_delay(&dls, mock_options), OP_EQ, client_boot_auth_only_cons); mock_options->ClientOnly = 0; /* bridge relay */ mock_options->ORPort_set = 1; mock_options->BridgeRelay = 1; - tt_int_op(find_dl_schedule(&dls, mock_options), OP_EQ, + tt_int_op(find_dl_min_delay(&dls, mock_options), OP_EQ, client_boot_auth_only_cons); mock_options->ORPort_set = 0; mock_options->BridgeRelay = 0; @@ -5558,14 +5558,14 @@ test_dir_find_dl_schedule(void* data) } else { /* client */ mock_options->ClientOnly = 1; - tt_int_op(find_dl_schedule(&dls, mock_options), OP_EQ, + tt_int_op(find_dl_min_delay(&dls, mock_options), OP_EQ, client_cons); mock_options->ClientOnly = 0; /* bridge relay */ mock_options->ORPort_set = 1; mock_options->BridgeRelay = 1; - tt_int_op(find_dl_schedule(&dls, mock_options), OP_EQ, + tt_int_op(find_dl_min_delay(&dls, mock_options), OP_EQ, client_cons); mock_options->ORPort_set = 0; mock_options->BridgeRelay = 0; @@ -5576,9 +5576,9 @@ test_dir_find_dl_schedule(void* data) mock_options->ClientOnly = 1; mock_options->UseBridges = 1; if (num_bridges_usable(0) > 0) { - tt_int_op(find_dl_schedule(&dls, mock_options), OP_EQ, bridge); + tt_int_op(find_dl_min_delay(&dls, mock_options), OP_EQ, bridge); } else { - tt_int_op(find_dl_schedule(&dls, mock_options), OP_EQ, bridge_bootstrap); + tt_int_op(find_dl_min_delay(&dls, mock_options), OP_EQ, bridge_bootstrap); } done: @@ -5872,14 +5872,14 @@ struct testcase_t dir_tests[] = { DIR(dump_unparseable_descriptors, 0), DIR(populate_dump_desc_fifo, 0), DIR(populate_dump_desc_fifo_2, 0), - DIR_ARG(find_dl_schedule, TT_FORK, "bfd"), - DIR_ARG(find_dl_schedule, TT_FORK, "bad"), - DIR_ARG(find_dl_schedule, TT_FORK, "cfd"), - DIR_ARG(find_dl_schedule, TT_FORK, "cad"), - DIR_ARG(find_dl_schedule, TT_FORK, "bfr"), - DIR_ARG(find_dl_schedule, TT_FORK, "bar"), - DIR_ARG(find_dl_schedule, TT_FORK, "cfr"), - DIR_ARG(find_dl_schedule, TT_FORK, "car"), + DIR_ARG(find_dl_min_delay, TT_FORK, "bfd"), + DIR_ARG(find_dl_min_delay, TT_FORK, "bad"), + DIR_ARG(find_dl_min_delay, TT_FORK, "cfd"), + DIR_ARG(find_dl_min_delay, TT_FORK, "cad"), + DIR_ARG(find_dl_min_delay, TT_FORK, "bfr"), + DIR_ARG(find_dl_min_delay, TT_FORK, "bar"), + DIR_ARG(find_dl_min_delay, TT_FORK, "cfr"), + DIR_ARG(find_dl_min_delay, TT_FORK, "car"), DIR(assumed_flags, 0), DIR(networkstatus_compute_bw_weights_v10, 0), DIR(platform_str, 0),

1 0

[tor/master] Fix an absurdly wide line.
by nickm＠torproject.org 30 Apr '18

30 Apr '18

commit 8b6fc47cc30521195124191cdd4a6324baf652a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 11:27:44 2018 -0400 Fix an absurdly wide line. --- src/or/directory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 0cbf342df..4b1999996 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -5330,8 +5330,8 @@ find_dl_min_delay(const download_status_t *dls, const or_options_t *options) /* During bootstrapping */ if (!networkstatus_consensus_can_use_extra_fallbacks(options)) { /* A bootstrapping client without extra fallback directories */ - return - options->ClientBootstrapConsensusAuthorityOnlyDownloadInitialDelay; + return options-> + ClientBootstrapConsensusAuthorityOnlyDownloadInitialDelay; } else if (dls->want_authority) { /* A bootstrapping client with extra fallback directories, but * connecting to an authority */

1 0

[tor/master] Changes file for ticket 23354 (remove old download schedules)
by nickm＠torproject.org 30 Apr '18

30 Apr '18

commit 71d503201e71197b6bdf75f7e159cfcd6280ff08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 11:38:27 2018 -0400 Changes file for ticket 23354 (remove old download schedules) --- changes/ticket23354 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/ticket23354 b/changes/ticket23354 new file mode 100644 index 000000000..f79dfd96a --- /dev/null +++ b/changes/ticket23354 @@ -0,0 +1,6 @@ + o Minor features (configuration): + - The "DownloadSchedule" options have been renamed to end with + "DownloadInitialDelay". The old names are still allowed, but will + produce a warning. Comma-separated lists are still permitted for + these options, but all values after the first are ignored (as they have + been since 0.2.9). Closes ticket 23354.

1 0

[tor/master] Clean up the documentation for *DownloadInitialDelay
by nickm＠torproject.org 30 Apr '18

30 Apr '18

commit 3b2ed849c845f9e4c1b307f45982f6b33a86b661 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 11:36:41 2018 -0400 Clean up the documentation for *DownloadInitialDelay --- doc/tor.1.txt | 84 +++++++++++++++++++++++++---------------------------------- 1 file changed, 36 insertions(+), 48 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 05a612d6a..59e272634 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1732,32 +1732,29 @@ The following options are useful only for clients (that is, if directory authorities do not choose a value, Tor will default to 0.6. (Default: -1) -[[ClientBootstrapConsensusAuthorityDownloadSchedule]] **ClientBootstrapConsensusAuthorityDownloadSchedule** __N__,__N__,__...__:: - Schedule for when clients should download consensuses from authorities +[[ClientBootstrapConsensusAuthorityDownloadInitialDelay]] **ClientBootstrapConsensusAuthorityDownloadInitialDelay** __N__:: + Initial delay in seconds for when clients should download consensuses from authorities if they are bootstrapping (that is, they don't have a usable, reasonably live consensus). Only used by clients fetching from a list of fallback directory mirrors. This schedule is advanced by (potentially concurrent) connection attempts, unlike other schedules, which are advanced by - connection failures. (Default: 6, 11, 3600, 10800, 25200, 54000, 111600, - 262800) + connection failures. (Default: 6) -[[ClientBootstrapConsensusFallbackDownloadSchedule]] **ClientBootstrapConsensusFallbackDownloadSchedule** __N__,__N__,__...__:: - Schedule for when clients should download consensuses from fallback +[[ClientBootstrapConsensusFallbackDownloadInitialDelay]] **ClientBootstrapConsensusFallbackDownloadInitialDelay** __N__:: + Initial delay in seconds for when clients should download consensuses from fallback directory mirrors if they are bootstrapping (that is, they don't have a usable, reasonably live consensus). Only used by clients fetching from a list of fallback directory mirrors. This schedule is advanced by (potentially concurrent) connection attempts, unlike other schedules, - which are advanced by connection failures. (Default: 0, 1, 4, 11, 3600, - 10800, 25200, 54000, 111600, 262800) + which are advanced by connection failures. (Default: 0) -[[ClientBootstrapConsensusAuthorityOnlyDownloadSchedule]] **ClientBootstrapConsensusAuthorityOnlyDownloadSchedule** __N__,__N__,__...__:: - Schedule for when clients should download consensuses from authorities +[[ClientBootstrapConsensusAuthorityOnlyDownloadInitialDelay]] **ClientBootstrapConsensusAuthorityOnlyDownloadInitialDelay** __N__:: + Initial delay in seconds for when clients should download consensuses from authorities if they are bootstrapping (that is, they don't have a usable, reasonably live consensus). Only used by clients which don't have or won't fetch from a list of fallback directory mirrors. This schedule is advanced by (potentially concurrent) connection attempts, unlike other schedules, - which are advanced by connection failures. (Default: 0, 3, 7, 3600, - 10800, 25200, 54000, 111600, 262800) + which are advanced by connection failures. (Default: 0) [[ClientBootstrapConsensusMaxInProgressTries]] **ClientBootstrapConsensusMaxInProgressTries** __NUM__:: Try this many simultaneous connections to download a consensus before @@ -2888,12 +2885,9 @@ The following options are used for running a testing Tor network. AssumeReachable 1 AuthDirMaxServersPerAddr 0 AuthDirMaxServersPerAuthAddr 0 - ClientBootstrapConsensusAuthorityDownloadSchedule 0, 2, - 4 (for 40 seconds), 8, 16, 32, 60 - ClientBootstrapConsensusFallbackDownloadSchedule 0, 1, - 4 (for 40 seconds), 8, 16, 32, 60 - ClientBootstrapConsensusAuthorityOnlyDownloadSchedule 0, 1, - 4 (for 40 seconds), 8, 16, 32, 60 + ClientBootstrapConsensusAuthorityDownloadInitialDelay 0 + ClientBootstrapConsensusFallbackDownloadInitialDelay 0 + ClientBootstrapConsensusAuthorityOnlyDownloadInitialDelay 0 ClientDNSRejectInternalAddresses 0 ClientRejectInternalAddresses 0 CountPrivateBandwidth 1 @@ -2908,12 +2902,12 @@ The following options are used for running a testing Tor network. TestingV3AuthInitialDistDelay 20 seconds TestingAuthDirTimeToLearnReachability 0 minutes TestingEstimatedDescriptorPropagationTime 0 minutes - TestingServerDownloadSchedule 0, 0, 0, 5, 10, 15, 20, 30, 60 - TestingClientDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 - TestingServerConsensusDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 - TestingClientConsensusDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 - TestingBridgeDownloadSchedule 10, 30, 60 - TestingBridgeBootstrapDownloadSchedule 0, 0, 5, 10, 15, 20, 30, 60 + TestingServerDownloadInitialDelay 0 + TestingClientDownloadInitialDelay 0 + TestingServerConsensusDownloadInitialDelay 0 + TestingClientConsensusDownloadInitialDelay 0 + TestingBridgeDownloadInitialDelay 10 + TestingBridgeBootstrapDownloadInitialDelay 0 TestingClientMaxIntervalWithoutRequest 5 seconds TestingDirConnectionMaxStall 30 seconds TestingEnableConnBwEvent 1 @@ -2952,37 +2946,31 @@ The following options are used for running a testing Tor network. Minimum value for the Fast flag. Overrides the ordinary minimum taken from the consensus when TestingTorNetwork is set. (Default: 0.) -[[TestingServerDownloadSchedule]] **TestingServerDownloadSchedule** __N__,__N__,__...__:: - Schedule for when servers should download things in general. Changing this - requires that **TestingTorNetwork** is set. (Default: 0, 0, 0, 60, 60, 120, - 300, 900, 2147483647) +[[TestingServerDownloadInitialDelay]] **TestingServerDownloadInitialDelay** __N__:: + Initial delay in seconds for when servers should download things in general. Changing this + requires that **TestingTorNetwork** is set. (Default: 0) -[[TestingClientDownloadSchedule]] **TestingClientDownloadSchedule** __N__,__N__,__...__:: - Schedule for when clients should download things in general. Changing this - requires that **TestingTorNetwork** is set. (Default: 0, 0, 60, 300, 600, - 2147483647) +[[TestingClientDownloadInitialDelay]] **TestingClientDownloadInitialDelay** __N__:: + Initial delay in seconds for when clients should download things in general. Changing this + requires that **TestingTorNetwork** is set. (Default: 0) -[[TestingServerConsensusDownloadSchedule]] **TestingServerConsensusDownloadSchedule** __N__,__N__,__...__:: - Schedule for when servers should download consensuses. Changing this - requires that **TestingTorNetwork** is set. (Default: 0, 0, 60, 300, 600, - 1800, 1800, 1800, 1800, 1800, 3600, 7200) +[[TestingServerConsensusDownloadInitialDelay]] **TestingServerConsensusDownloadInitialDelay** __N__:: + Initial delay in seconds for when servers should download consensuses. Changing this + requires that **TestingTorNetwork** is set. (Default: 0) -[[TestingClientConsensusDownloadSchedule]] **TestingClientConsensusDownloadSchedule** __N__,__N__,__...__:: - Schedule for when clients should download consensuses. Changing this - requires that **TestingTorNetwork** is set. (Default: 0, 0, 60, 300, 600, - 1800, 3600, 3600, 3600, 10800, 21600, 43200) +[[TestingClientConsensusDownloadInitialDelay]] **TestingClientConsensusDownloadInitialDelay** __N__:: + Initial delay in seconds for when clients should download consensuses. Changing this + requires that **TestingTorNetwork** is set. (Default: 0) -[[TestingBridgeDownloadSchedule]] **TestingBridgeDownloadSchedule** __N__,__N__,__...__:: - Schedule for when clients should download each bridge descriptor when they +[[TestingBridgeDownloadInitialDelay]] **TestingBridgeDownloadInitialDelay** __N__:: + Initial delay in seconds for when clients should download each bridge descriptor when they know that one or more of their configured bridges are running. Changing - this requires that **TestingTorNetwork** is set. (Default: 10800, 25200, - 54000, 111600, 262800) + this requires that **TestingTorNetwork** is set. (Default: 10800) -[[TestingBridgeBootstrapDownloadSchedule]] **TestingBridgeBootstrapDownloadSchedule** __N__,__N__,__...__:: - Schedule for when clients should download each bridge descriptor when they +[[TestingBridgeBootstrapDownloadInitialDelay]] **TestingBridgeBootstrapDownloadInitialDelay** __N__:: + Initial delay in seconds for when clients should download each bridge descriptor when they have just started, or when they can not contact any of their bridges. - Changing this requires that **TestingTorNetwork** is set. (Default: 0, 30, - 90, 600, 3600, 10800, 25200, 54000, 111600, 262800) + Changing this requires that **TestingTorNetwork** is set. (Default: 0) [[TestingClientMaxIntervalWithoutRequest]] **TestingClientMaxIntervalWithoutRequest** __N__ **seconds**|**minutes**:: When directory clients have only a few descriptors to request, they batch

1 0

[tor/master] Merge remote-tracking branch 'github/ticket23354'
by nickm＠torproject.org 30 Apr '18

30 Apr '18

commit 6cb467b462bda8d623c1a061ea2107084ff1cb41 Merge: a9736f1f3 71d503201 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 30 09:45:28 2018 -0400 Merge remote-tracking branch 'github/ticket23354' changes/ticket23354 | 6 +++ doc/tor.1.txt | 84 ++++++++++++++------------------ src/or/config.c | 84 ++++++++++++++++---------------- src/or/confparse.c | 80 ++++++++++-------------------- src/or/confparse.h | 6 ++- src/or/directory.c | 54 ++++++++------------ src/or/directory.h | 4 +- src/or/or.h | 18 +++---- src/test/test_dir.c | 127 +++++++++++++++++++++--------------------------- src/test/test_options.c | 12 ++--- 10 files changed, 204 insertions(+), 271 deletions(-)

1 0

[tor/master] Describe schedules as TimeInterval, not TimeIntervalCommaList.
by nickm＠torproject.org 30 Apr '18

30 Apr '18

commit b205061eb13abd68a5335f8008c5121ef230c34e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 30 09:47:35 2018 -0400 Describe schedules as TimeInterval, not TimeIntervalCommaList. --- src/or/config.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 9e9c7e58d..54f3930fc 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -8105,7 +8105,10 @@ getinfo_helper_config(control_connection_t *conn, case CONFIG_TYPE_ISOTIME: type = "Time"; break; case CONFIG_TYPE_ROUTERSET: type = "RouterList"; break; case CONFIG_TYPE_CSV: type = "CommaList"; break; - case CONFIG_TYPE_CSV_INTERVAL: type = "TimeIntervalCommaList"; break; + /* This type accepts more inputs than TimeInterval, but it ignores + * everything after the first entry, so we may as well pretend + * it's a TimeInterval. */ + case CONFIG_TYPE_CSV_INTERVAL: type = "TimeInterval"; break; case CONFIG_TYPE_LINELIST: type = "LineList"; break; case CONFIG_TYPE_LINELIST_S: type = "Dependent"; break; case CONFIG_TYPE_LINELIST_V: type = "Virtual"; break;

1 0

[tor/master] Make test_tortls.c build with openssl no_deprecated.
by nickm＠torproject.org 30 Apr '18

30 Apr '18

commit 9d27e3f01468c2a31d3d3ab538a668d8351e5324 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 12:32:39 2018 -0400 Make test_tortls.c build with openssl no_deprecated. Also for 19981. --- src/test/test_tortls.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index 29f7cc9c3..ef1be139a 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -203,6 +203,17 @@ test_tortls_tor_tls_get_error(void *data) } static void +library_init(void) +{ +#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) + OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL); +#else + SSL_library_init(); + SSL_load_error_strings(); +#endif +} + +static void test_tortls_get_state_description(void *ignored) { (void)ignored; @@ -210,9 +221,7 @@ test_tortls_get_state_description(void *ignored) char *buf; SSL_CTX *ctx; - SSL_library_init(); - SSL_load_error_strings(); - + library_init(); ctx = SSL_CTX_new(SSLv23_method()); buf = tor_malloc_zero(1000); @@ -274,8 +283,7 @@ test_tortls_get_by_ssl(void *ignored) SSL_CTX *ctx; SSL *ssl; - SSL_library_init(); - SSL_load_error_strings(); + library_init(); tor_tls_allocate_tor_tls_object_ex_data_index(); ctx = SSL_CTX_new(SSLv23_method()); @@ -322,8 +330,7 @@ test_tortls_log_one_error(void *ignored) SSL_CTX *ctx; SSL *ssl = NULL; - SSL_library_init(); - SSL_load_error_strings(); + library_init(); ctx = SSL_CTX_new(SSLv23_method()); tls = tor_malloc_zero(sizeof(tor_tls_t)); @@ -415,8 +422,7 @@ test_tortls_get_error(void *ignored) int ret; SSL_CTX *ctx; - SSL_library_init(); - SSL_load_error_strings(); + library_init(); ctx = SSL_CTX_new(SSLv23_method()); setup_capture_of_logs(LOG_INFO); @@ -792,8 +798,8 @@ test_tortls_classify_client_ciphers(void *ignored) STACK_OF(SSL_CIPHER) *ciphers; SSL_CIPHER *tmp_cipher; - SSL_library_init(); - SSL_load_error_strings(); + library_init(); + tor_tls_allocate_tor_tls_object_ex_data_index(); tls = tor_malloc_zero(sizeof(tor_tls_t)); @@ -897,8 +903,7 @@ test_tortls_client_is_using_v2_ciphers(void *ignored) SSL_SESSION *sess; STACK_OF(SSL_CIPHER) *ciphers; - SSL_library_init(); - SSL_load_error_strings(); + library_init(); ctx = SSL_CTX_new(TLSv1_method()); ssl = SSL_new(ctx); @@ -1541,8 +1546,8 @@ test_tortls_session_secret_cb(void *ignored) STACK_OF(SSL_CIPHER) *ciphers = NULL; SSL_CIPHER *one; - SSL_library_init(); - SSL_load_error_strings(); + library_init(); + tor_tls_allocate_tor_tls_object_ex_data_index(); tls = tor_malloc_zero(sizeof(tor_tls_t)); @@ -1733,8 +1738,7 @@ test_tortls_find_cipher_by_id(void *ignored) fixed_cipher2 = tor_malloc_zero(sizeof(SSL_CIPHER)); fixed_cipher2->id = 0xC00A; - SSL_library_init(); - SSL_load_error_strings(); + library_init(); ctx = SSL_CTX_new(m); ssl = SSL_new(ctx); @@ -1825,8 +1829,7 @@ test_tortls_server_info_callback(void *ignored) SSL_CTX *ctx; SSL *ssl; - SSL_library_init(); - SSL_load_error_strings(); + library_init(); ctx = SSL_CTX_new(TLSv1_method()); ssl = SSL_new(ctx);

1 0

[tor/master] mention 19429 in changes file
by nickm＠torproject.org 30 Apr '18

30 Apr '18

commit 32181cbaa2c4f0cdd8d3d39ddafb8aff643a4280 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 13:03:31 2018 -0400 mention 19429 in changes file --- changes/feature19429 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/feature19429 b/changes/feature19429 index 29db6a5bc..0faa6e84e 100644 --- a/changes/feature19429 +++ b/changes/feature19429 @@ -1,5 +1,5 @@ o Minor features (compatibility): - Tor now detects versions of OpenSSL 1.1.0 and later compiled with the no-deprecated option, and builds correctly with them. Closes - tickets 19981 and 25353. + tickets 19429, 19981, and 25353.

1 0

[tor/master] Changes file for openssl no-deprecated work.
by nickm＠torproject.org 30 Apr '18

30 Apr '18

commit c296f002541aee6dee5884187640fb273466b8f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 12:35:36 2018 -0400 Changes file for openssl no-deprecated work. --- changes/feature19429 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/feature19429 b/changes/feature19429 new file mode 100644 index 000000000..29db6a5bc --- /dev/null +++ b/changes/feature19429 @@ -0,0 +1,5 @@ + o Minor features (compatibility): + - Tor now detects versions of OpenSSL 1.1.0 and later compiled with the + no-deprecated option, and builds correctly with them. Closes + tickets 19981 and 25353. +

1 0