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

[tor/master] Tool to print expiration date of ed25519_signing_cert
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 2558634f0c3e16cd5cd8ec08f80fffcc93237a3e Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Jun 13 13:20:47 2018 +0300 Tool to print expiration date of ed25519_signing_cert --- src/tools/Makefile.nmake | 5 ++- src/tools/include.am | 11 +++++- src/tools/tor-print-ed-signing-cert.c | 65 +++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 2 deletions(-) diff --git a/src/tools/Makefile.nmake b/src/tools/Makefile.nmake index fda1990e0..e223d9b13 100644 --- a/src/tools/Makefile.nmake +++ b/src/tools/Makefile.nmake @@ -1,4 +1,4 @@ -all: tor-resolve.exe tor-gencert.exe +all: tor-resolve.exe tor-gencert.exe tor-print-ed-signing-cert.exe CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common /I ..\or @@ -15,5 +15,8 @@ tor-gencert.exe: tor-gencert.obj tor-resolve.exe: tor-resolve.obj $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib tor-resolve.obj +tor-print-ed-signing-cert.exe: tor-print-ed-signing-cert.obj + $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib tor-print-ed-signing-cert.obj + clean: del *.obj *.lib *.exe diff --git a/src/tools/include.am b/src/tools/include.am index 8a2ecb23c..d5924dda5 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -1,4 +1,4 @@ -bin_PROGRAMS+= src/tools/tor-resolve src/tools/tor-gencert +bin_PROGRAMS+= src/tools/tor-resolve src/tools/tor-gencert src/tools/tor-print-ed-signing-cert if COVERAGE_ENABLED noinst_PROGRAMS+= src/tools/tor-cov-resolve src/tools/tor-cov-gencert @@ -29,6 +29,15 @@ src_tools_tor_gencert_LDADD = \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ +src_tools_tor_print_ed_signing_cert_SOURCES = src/tools/tor-print-ed-signing-cert.c +src_tools_tor_print_ed_signing_cert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ +src_tools_tor_print_ed_signing_cert_LDADD = \ + src/trunnel/libor-trunnel.a \ + $(TOR_CRYPTO_LIBS) \ + $(TOR_UTIL_LIBS) \ + @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_USERENV@ + if COVERAGE_ENABLED src_tools_tor_cov_gencert_SOURCES = src/tools/tor-gencert.c src_tools_tor_cov_gencert_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) diff --git a/src/tools/tor-print-ed-signing-cert.c b/src/tools/tor-print-ed-signing-cert.c new file mode 100644 index 000000000..bb90e7945 --- /dev/null +++ b/src/tools/tor-print-ed-signing-cert.c @@ -0,0 +1,65 @@ +/* Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include <errno.h> +#include <stdio.h> +#include <string.h> +#include <time.h> + +#include "ed25519_cert.h" +#include "lib/crypt_ops/crypto_format.h" +#include "lib/malloc/util_malloc.h" + +int +main(int argc, char **argv) +{ + ed25519_cert_t *cert = NULL; + + if (argc != 2) { + fprintf(stderr, "Usage:\n"); + fprintf(stderr, "%s <path to ed25519_signing_cert file>\n", argv[0]); + return -1; + } + + const char *filepath = argv[1]; + char *got_tag = NULL; + + uint8_t certbuf[256]; + ssize_t cert_body_len = crypto_read_tagged_contents_from_file( + filepath, "ed25519v1-cert", + &got_tag, certbuf, sizeof(certbuf)); + + if (cert_body_len <= 0) { + fprintf(stderr, "crypto_read_tagged_contents_from_file failed with " + "error: %s\n", strerror(errno)); + return -2; + } + + if (!got_tag) { + fprintf(stderr, "Found no tag\n"); + return -3; + } + + if (strcmp(got_tag, "type4") != 0) { + fprintf(stderr, "Wrong tag: %s\n", got_tag); + return -4; + } + + tor_free(got_tag); + + ssize_t parsed = ed25519_cert_parse(&cert, certbuf, cert_body_len); + if (parsed <= 0) { + fprintf(stderr, "ed25519_cert_parse failed with return value %zd\n", + parsed); + return -5; + } + + time_t expires_at = (time_t)cert->exp_field * 60 * 60; + + printf("Expires at: %s", ctime(&expires_at)); + + ed25519_cert_free(cert); + + return 0; +} +

1 0

[tor/master] Update include in tor-print-ed-signing-cert
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 49d8a2109f93c0675e9c74630b8d41e9d25d1b5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:57:18 2018 -0400 Update include in tor-print-ed-signing-cert --- src/tools/tor-print-ed-signing-cert.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/tools/tor-print-ed-signing-cert.c b/src/tools/tor-print-ed-signing-cert.c index bb90e7945..ca53e34d5 100644 --- a/src/tools/tor-print-ed-signing-cert.c +++ b/src/tools/tor-print-ed-signing-cert.c @@ -8,7 +8,7 @@ #include "ed25519_cert.h" #include "lib/crypt_ops/crypto_format.h" -#include "lib/malloc/util_malloc.h" +#include "lib/malloc/malloc.h" int main(int argc, char **argv) @@ -62,4 +62,3 @@ main(int argc, char **argv) return 0; } -

1 0

[tor/master] Add changes file
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit e9f6f742b2729ee62e97711f08fec8e8a97393d7 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Jun 22 16:48:57 2018 +0300 Add changes file --- changes/ticket21349 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/ticket21349 b/changes/ticket21349 new file mode 100644 index 000000000..c07288406 --- /dev/null +++ b/changes/ticket21349 @@ -0,0 +1,6 @@ + o Code simplification and refactoring: + - Split sampled_guards_update_from_consensus() and + select_entry_guard_for_circuit() into subfunctions. + In entry_guards_update_primary() unite + three smartlist enumerations into one and move smartlist + comparison code out of the function. Closes ticket 21349.

1 0

[tor/master] Merge remote-tracking branch 'rl1987/ticket21349_4'
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 13393b2d913545aec54d17fb3402906ab4e04ad7 Merge: b8e94b2f1 e9f6f742b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:49:49 2018 -0400 Merge remote-tracking branch 'rl1987/ticket21349_4' changes/ticket21349 | 6 + src/feature/client/entrynodes.c | 324 +++++++++++++++++++++++++++------------- src/lib/container/smartlist.c | 27 ++++ src/lib/container/smartlist.h | 3 + 4 files changed, 256 insertions(+), 104 deletions(-)

1 0

[tor/master] Split sampled_guards_update_from_consensus() into subfunctions
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 86549c0d9e636dabe3a0ed9890afe3faf920b7b6 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Jun 22 15:21:05 2018 +0300 Split sampled_guards_update_from_consensus() into subfunctions --- src/feature/client/entrynodes.c | 123 +++++++++++++++++++++++++++++++--------- 1 file changed, 95 insertions(+), 28 deletions(-) diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 664be8ce1..ee6ff8c67 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -406,6 +406,17 @@ get_remove_unlisted_guards_after_days(void) DFLT_REMOVE_UNLISTED_GUARDS_AFTER_DAYS, 1, 365*10); } + +/** + * Return number of seconds that will make a guard no longer eligible + * for selection if unlisted for this long. + */ +static time_t +get_remove_unlisted_guards_after_seconds(void) +{ + return get_remove_unlisted_guards_after_days() * 24 * 60 * 60; +} + /** * We remove unconfirmed guards from the sample after this many days, * regardless of whether they are listed or unlisted. @@ -1237,30 +1248,28 @@ entry_guard_is_listed,(guard_selection_t *gs, const entry_guard_t *guard)) } /** - * Update the status of all sampled guards based on the arrival of a - * new consensus networkstatus document. This will include marking - * some guards as listed or unlisted, and removing expired guards. */ -STATIC void -sampled_guards_update_from_consensus(guard_selection_t *gs) + * Enumerate sampled_entry_guards smartlist in gs. + * For each entry_guard_t object in smartlist, do the following: + * * Update currently_listed field to reflect if guard is listed + * in guard selection gs. + * * Set unlisted_since_date to approximate UNIX time of + * unlisting if guard is unlisted (randomize within 20% of + * get_remove_unlisted_guards_after_seconds()). Otherwise, + * set it to 0. + * + * Require gs to be non-null pointer. + * Return a number of entries updated. + */ +static size_t +sampled_guards_update_consensus_presence(guard_selection_t *gs) { - tor_assert(gs); - const int REMOVE_UNLISTED_GUARDS_AFTER = - (get_remove_unlisted_guards_after_days() * 86400); - const int unlisted_since_slop = REMOVE_UNLISTED_GUARDS_AFTER / 5; + size_t n_changes = 0; - // It's important to use only a live consensus here; we don't want to - // make changes based on anything expired or old. - if (live_consensus_is_missing(gs)) { - log_info(LD_GUARD, "Not updating the sample guard set; we have " - "no live consensus."); - return; - } - log_info(LD_GUARD, "Updating sampled guard status based on received " - "consensus."); + tor_assert(gs); - int n_changes = 0; + const time_t unlisted_since_slop = + get_remove_unlisted_guards_after_seconds() / 5; - /* First: Update listed/unlisted. */ SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { /* XXXX #20827 check ed ID too */ const int is_listed = entry_guard_is_listed(gs, guard); @@ -1304,14 +1313,33 @@ sampled_guards_update_from_consensus(guard_selection_t *gs) } } SMARTLIST_FOREACH_END(guard); - const time_t remove_if_unlisted_since = - approx_time() - REMOVE_UNLISTED_GUARDS_AFTER; - const time_t maybe_remove_if_sampled_before = - approx_time() - get_guard_lifetime(); - const time_t remove_if_confirmed_before = - approx_time() - get_guard_confirmed_min_lifetime(); + return n_changes; +} + +/** + * Enumerate sampled_entry_guards smartlist in gs. + * For each entry_guard_t object in smartlist, do the following: + * * If currently_listed is false and unlisted_since_date + * is earlier than remove_if_unlisted_since - remove it. + * * Otherwise, check if sampled_on_date is earlier than + * maybe_remove_if_sampled_before. + * * When above condition is correct, remove the guard if: + * * It was never confirmed. + * * It was confirmed before remove_if_confirmed_before. + * + * Require gs to be non-null pointer. + * Return number of entries deleted. + */ +static size_t +sampled_guards_prune_obsolete_entries(guard_selection_t *gs, + const time_t remove_if_unlisted_since, + const time_t maybe_remove_if_sampled_before, + const time_t remove_if_confirmed_before) +{ + size_t n_changes = 0; + + tor_assert(gs); - /* Then: remove the ones that have been junk for too long */ SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { int rmv = 0; @@ -1319,7 +1347,7 @@ sampled_guards_update_from_consensus(guard_selection_t *gs) guard->unlisted_since_date < remove_if_unlisted_since) { /* "We have a live consensus, and {IS_LISTED} is false, and - {FIRST_UNLISTED_AT} is over {REMOVE_UNLISTED_GUARDS_AFTER} + {FIRST_UNLISTED_AT} is over get_remove_unlisted_guards_after_days() days in the past." */ log_info(LD_GUARD, "Removing sampled guard %s: it has been unlisted " @@ -1355,6 +1383,45 @@ sampled_guards_update_from_consensus(guard_selection_t *gs) } } SMARTLIST_FOREACH_END(guard); + return n_changes; +} + +/** + * Update the status of all sampled guards based on the arrival of a + * new consensus networkstatus document. This will include marking + * some guards as listed or unlisted, and removing expired guards. */ +STATIC void +sampled_guards_update_from_consensus(guard_selection_t *gs) +{ + tor_assert(gs); + + // It's important to use only a live consensus here; we don't want to + // make changes based on anything expired or old. + if (live_consensus_is_missing(gs)) { + log_info(LD_GUARD, "Not updating the sample guard set; we have " + "no live consensus."); + return; + } + log_info(LD_GUARD, "Updating sampled guard status based on received " + "consensus."); + + /* First: Update listed/unlisted. */ + size_t n_changes = sampled_guards_update_consensus_presence(gs); + + const time_t remove_if_unlisted_since = + approx_time() - get_remove_unlisted_guards_after_seconds(); + const time_t maybe_remove_if_sampled_before = + approx_time() - get_guard_lifetime(); + const time_t remove_if_confirmed_before = + approx_time() - get_guard_confirmed_min_lifetime(); + + /* Then: remove the ones that have been junk for too long */ + n_changes += + sampled_guards_prune_obsolete_entries(gs, + remove_if_unlisted_since, + maybe_remove_if_sampled_before, + remove_if_confirmed_before); + if (n_changes) { gs->primary_guards_up_to_date = 0; entry_guards_update_filtered_sets(gs);

1 0

[tor/master] Split select_entry_guard_for_circuit()
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 042d22c8d1c4e4224feadd4ff3995769eb8301b4 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Jun 22 16:43:50 2018 +0300 Split select_entry_guard_for_circuit() --- src/feature/client/entrynodes.c | 157 ++++++++++++++++++++++++++++------------ 1 file changed, 110 insertions(+), 47 deletions(-) diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index af68de611..494ad3352 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -2027,31 +2027,23 @@ entry_guards_note_internet_connectivity(guard_selection_t *gs) } /** - * Get a guard for use with a circuit. Prefer to pick a running primary - * guard; then a non-pending running filtered confirmed guard; then a - * non-pending runnable filtered guard. Update the + * Pick a primary guard for use with a circuit, if available. Update the * last_tried_to_connect time and the is_pending fields of the * guard as appropriate. Set state_out to the new guard-state * of the circuit. */ -STATIC entry_guard_t * -select_entry_guard_for_circuit(guard_selection_t *gs, - guard_usage_t usage, - const entry_guard_restriction_t *rst, - unsigned *state_out) +static entry_guard_t * +select_primary_guard_for_circuit(guard_selection_t *gs, + guard_usage_t usage, + const entry_guard_restriction_t *rst, + unsigned *state_out) { const int need_descriptor = (usage == GUARD_USAGE_TRAFFIC); - tor_assert(gs); - tor_assert(state_out); - - if (!gs->primary_guards_up_to_date) - entry_guards_update_primary(gs); + entry_guard_t *chosen_guard = NULL; int num_entry_guards = get_n_primary_guards_to_use(usage); smartlist_t *usable_primary_guards = smartlist_new(); - /* "If any entry in PRIMARY_GUARDS has {is_reachable} status of - <maybe> or <yes>, return the first such guard." */ SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) { entry_guard_consider_retry(guard); if (! entry_guard_obeys_restriction(guard, rst)) @@ -2069,18 +2061,30 @@ select_entry_guard_for_circuit(guard_selection_t *gs, } SMARTLIST_FOREACH_END(guard); if (smartlist_len(usable_primary_guards)) { - entry_guard_t *guard = smartlist_choose(usable_primary_guards); + chosen_guard = smartlist_choose(usable_primary_guards); smartlist_free(usable_primary_guards); log_info(LD_GUARD, "Selected primary guard %s for circuit.", - entry_guard_describe(guard)); - return guard; + entry_guard_describe(chosen_guard)); } + smartlist_free(usable_primary_guards); + return chosen_guard; +} + +/** + * For use with a circuit, pick a non-pending running filtered confirmed guard, + * if one is available. Update the last_tried_to_connect time and the + * is_pending fields of the guard as appropriate. Set state_out + * to the new guard-state of the circuit. + */ +static entry_guard_t * +select_confirmed_guard_for_circuit(guard_selection_t *gs, + guard_usage_t usage, + const entry_guard_restriction_t *rst, + unsigned *state_out) +{ + const int need_descriptor = (usage == GUARD_USAGE_TRAFFIC); - /* "Otherwise, if the ordered intersection of {CONFIRMED_GUARDS} - and {USABLE_FILTERED_GUARDS} is nonempty, return the first - entry in that intersection that has {is_pending} set to - false." */ SMARTLIST_FOREACH_BEGIN(gs->confirmed_entry_guards, entry_guard_t *, guard) { if (guard->is_primary) continue; /* we already considered this one. */ @@ -2101,34 +2105,93 @@ select_entry_guard_for_circuit(guard_selection_t *gs, } } SMARTLIST_FOREACH_END(guard); + return NULL; +} + +/** + * For use with a circuit, pick a confirmed usable filtered guard + * at random. Update the last_tried_to_connect time and the + * is_pending fields of the guard as appropriate. Set state_out + * to the new guard-state of the circuit. + */ +static entry_guard_t * +select_filtered_guard_for_circuit(guard_selection_t *gs, + guard_usage_t usage, + const entry_guard_restriction_t *rst, + unsigned *state_out) +{ + const int need_descriptor = (usage == GUARD_USAGE_TRAFFIC); + entry_guard_t *chosen_guard = NULL; + unsigned flags = 0; + if (need_descriptor) + flags |= SAMPLE_EXCLUDE_NO_DESCRIPTOR; + chosen_guard = sample_reachable_filtered_entry_guards(gs, + rst, + SAMPLE_EXCLUDE_CONFIRMED | + SAMPLE_EXCLUDE_PRIMARY | + SAMPLE_EXCLUDE_PENDING | + flags); + if (!chosen_guard) { + return NULL; + } + + chosen_guard->is_pending = 1; + chosen_guard->last_tried_to_connect = approx_time(); + *state_out = GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD; + log_info(LD_GUARD, "No primary or confirmed guards available. Selected " + "random guard %s for circuit. Will try other guards before " + "using this circuit.", + entry_guard_describe(chosen_guard)); + return chosen_guard; +} + +/** + * Get a guard for use with a circuit. Prefer to pick a running primary + * guard; then a non-pending running filtered confirmed guard; then a + * non-pending runnable filtered guard. Update the + * last_tried_to_connect time and the is_pending fields of the + * guard as appropriate. Set state_out to the new guard-state + * of the circuit. + */ +STATIC entry_guard_t * +select_entry_guard_for_circuit(guard_selection_t *gs, + guard_usage_t usage, + const entry_guard_restriction_t *rst, + unsigned *state_out) +{ + entry_guard_t *chosen_guard = NULL; + tor_assert(gs); + tor_assert(state_out); + + if (!gs->primary_guards_up_to_date) + entry_guards_update_primary(gs); + + /* "If any entry in PRIMARY_GUARDS has {is_reachable} status of + <maybe> or <yes>, return the first such guard." */ + chosen_guard = select_primary_guard_for_circuit(gs, usage, rst, state_out); + if (chosen_guard) + return chosen_guard; + + /* "Otherwise, if the ordered intersection of {CONFIRMED_GUARDS} + and {USABLE_FILTERED_GUARDS} is nonempty, return the first + entry in that intersection that has {is_pending} set to + false." */ + chosen_guard = select_confirmed_guard_for_circuit(gs, usage, rst, state_out); + if (chosen_guard) + return chosen_guard; + /* "Otherwise, if there is no such entry, select a member at random from {USABLE_FILTERED_GUARDS}." */ - { - entry_guard_t *guard; - unsigned flags = 0; - if (need_descriptor) - flags |= SAMPLE_EXCLUDE_NO_DESCRIPTOR; - guard = sample_reachable_filtered_entry_guards(gs, - rst, - SAMPLE_EXCLUDE_CONFIRMED | - SAMPLE_EXCLUDE_PRIMARY | - SAMPLE_EXCLUDE_PENDING | - flags); - if (guard == NULL) { - log_info(LD_GUARD, "Absolutely no sampled guards were available. " - "Marking all guards for retry and starting from top again."); - mark_all_guards_maybe_reachable(gs); - return NULL; - } - guard->is_pending = 1; - guard->last_tried_to_connect = approx_time(); - *state_out = GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD; - log_info(LD_GUARD, "No primary or confirmed guards available. Selected " - "random guard %s for circuit. Will try other guards before " - "using this circuit.", - entry_guard_describe(guard)); - return guard; + chosen_guard = select_filtered_guard_for_circuit(gs, usage, rst, state_out); + + if (chosen_guard == NULL) { + log_info(LD_GUARD, "Absolutely no sampled guards were available. " + "Marking all guards for retry and starting from top again."); + mark_all_guards_maybe_reachable(gs); + return NULL; } + + return chosen_guard; } /**

1 0

[tor/master] Make entry_guards_update_primary() shorter
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit e6c51a056c5be77edeb60d71c1cb36a8680df9af Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Jun 22 16:04:08 2018 +0300 Make entry_guards_update_primary() shorter --- src/feature/client/entrynodes.c | 44 ++++++++++++++--------------------------- src/lib/container/smartlist.c | 27 +++++++++++++++++++++++++ src/lib/container/smartlist.h | 3 +++ 3 files changed, 45 insertions(+), 29 deletions(-) diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index ee6ff8c67..af68de611 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -1883,28 +1883,24 @@ entry_guards_update_primary(guard_selection_t *gs) smartlist_add(new_primary_guards, guard); } SMARTLIST_FOREACH_END(guard); - /* Can we keep any older primary guards? First remove all the ones - * that we already kept. */ SMARTLIST_FOREACH_BEGIN(old_primary_guards, entry_guard_t *, guard) { + /* Can we keep any older primary guards? First remove all the ones + * that we already kept. */ if (smartlist_contains(new_primary_guards, guard)) { SMARTLIST_DEL_CURRENT_KEEPORDER(old_primary_guards, guard); - } - } SMARTLIST_FOREACH_END(guard); - - /* Now add any that are still good. */ - SMARTLIST_FOREACH_BEGIN(old_primary_guards, entry_guard_t *, guard) { - if (smartlist_len(new_primary_guards) >= N_PRIMARY_GUARDS) - break; - if (! guard->is_filtered_guard) continue; - guard->is_primary = 1; - smartlist_add(new_primary_guards, guard); - SMARTLIST_DEL_CURRENT_KEEPORDER(old_primary_guards, guard); - } SMARTLIST_FOREACH_END(guard); + } - /* Mark the remaining previous primary guards as non-primary */ - SMARTLIST_FOREACH_BEGIN(old_primary_guards, entry_guard_t *, guard) { - guard->is_primary = 0; + /* Now add any that are still good. */ + if (smartlist_len(new_primary_guards) < N_PRIMARY_GUARDS && + guard->is_filtered_guard) { + guard->is_primary = 1; + smartlist_add(new_primary_guards, guard); + SMARTLIST_DEL_CURRENT_KEEPORDER(old_primary_guards, guard); + } else { + /* Mark the remaining previous primary guards as non-primary */ + guard->is_primary = 0; + } } SMARTLIST_FOREACH_END(guard); /* Finally, fill out the list with sampled guards. */ @@ -1928,18 +1924,8 @@ entry_guards_update_primary(guard_selection_t *gs) }); #endif /* 1 */ - int any_change = 0; - if (smartlist_len(gs->primary_entry_guards) != - smartlist_len(new_primary_guards)) { - any_change = 1; - } else { - SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, g) { - if (g != smartlist_get(new_primary_guards, g_sl_idx)) { - any_change = 1; - } - } SMARTLIST_FOREACH_END(g); - } - + const int any_change = !smartlist_ptrs_eq(gs->primary_entry_guards, + new_primary_guards); if (any_change) { log_info(LD_GUARD, "Primary entry guards have changed. " "New primary guard list is: "); diff --git a/src/lib/container/smartlist.c b/src/lib/container/smartlist.c index dc283e5f5..4b29d834d 100644 --- a/src/lib/container/smartlist.c +++ b/src/lib/container/smartlist.c @@ -189,6 +189,33 @@ smartlist_ints_eq(const smartlist_t *sl1, const smartlist_t *sl2) return 1; } +/** + * Return true if there is shallow equality between smartlists - + * i.e. all indices correspond to exactly same object (pointer + * values are matching). Otherwise, return false. + */ +int +smartlist_ptrs_eq(const smartlist_t *s1, const smartlist_t *s2) +{ + if (s1 == s2) + return 1; + + // Note: pointers cannot both be NULL at this point, because + // above check. + if (s1 == NULL || s2 == NULL) + return 0; + + if (smartlist_len(s1) != smartlist_len(s2)) + return 0; + + for (int i = 0; i < smartlist_len(s1); i++) { + if (smartlist_get(s1, i) != smartlist_get(s2, i)) + return 0; + } + + return 1; +} + /** Return true iff sl has some element E such that * tor_memeq(E,element,DIGEST_LEN) */ diff --git a/src/lib/container/smartlist.h b/src/lib/container/smartlist.h index 3b19cbfce..9705396ac 100644 --- a/src/lib/container/smartlist.h +++ b/src/lib/container/smartlist.h @@ -37,6 +37,9 @@ int smartlist_overlap(const smartlist_t *sl1, const smartlist_t *sl2); void smartlist_intersect(smartlist_t *sl1, const smartlist_t *sl2); void smartlist_subtract(smartlist_t *sl1, const smartlist_t *sl2); +int smartlist_ptrs_eq(const smartlist_t *s1, + const smartlist_t *s2); + void smartlist_sort(smartlist_t *sl, int (*compare)(const void **a, const void **b)); void *smartlist_get_most_frequent_(const smartlist_t *sl,

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 30 Jul '18

30 Jul '18

commit 1f06c40c802b1a33d930a956084286b886ef8bf1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 30 12:46:58 2018 +0000 Update translations for tails-misc_completed --- zh_CN.po | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index 85ad64862..5be683ba0 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -20,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-04-12 19:07+0000\n" -"Last-Translator: YF <yfdyh000(a)gmail.com>\n" +"POT-Creation-Date: 2018-07-24 08:44+0800\n" +"PO-Revision-Date: 2018-07-30 12:36+0000\n" +"Last-Translator: Lafrenze Laurant\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +38,7 @@ msgstr "Tor 已就绪" msgid "You can now access the Internet." msgstr "你现在可以访问因特网了。" -#: config/chroot_local-includes/etc/whisperback/config.py:65 +#: config/chroot_local-includes/etc/whisperback/config.py:66 #, python-format msgid "" "<h1>Help us fix your bug!</h1>\n" @@ -71,15 +71,31 @@ msgid "Do you want to start Electrum anyway?" msgstr "您无论如何都要启动 Electrum 吗？" #: config/chroot_local-includes/usr/local/bin/electrum:63 +#: config/chroot_local-includes/usr/local/bin/liferea:33 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "启动(_L)" #: config/chroot_local-includes/usr/local/bin/electrum:64 +#: config/chroot_local-includes/usr/local/bin/liferea:32 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "退出(_E)" +#: config/chroot_local-includes/usr/local/bin/liferea:18 +msgid "Liferea is deprecated" +msgstr "Liferea已被弃用" + +#: config/chroot_local-includes/usr/local/bin/liferea:19 +msgid "Do you wish to start Liferea anyway?" +msgstr "您要启动Liferea anyway吗？" + +#: config/chroot_local-includes/usr/local/bin/liferea:21 +msgid "" +"Due to security concerns the Liferea feed reader will be removed from Tails " +"by the end of 2018. Please migrate your feeds to Thunderbird." +msgstr "出于安全角度考虑，Liferea feed reader将会在2018年末从Tails中被移除。请将您的网络订阅移至Thunderbird。" + #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Restart" msgstr "重新启动"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 30 Jul '18

30 Jul '18

commit 1c38221820565c839904b50c583cd9c44264e12c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 30 12:46:52 2018 +0000 Update translations for tails-misc --- zh_CN.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index 6c7b02593..5be683ba0 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-07-24 08:44+0800\n" -"PO-Revision-Date: 2018-07-24 03:04+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-07-30 12:36+0000\n" +"Last-Translator: Lafrenze Laurant\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -84,17 +84,17 @@ msgstr "退出(_E)" #: config/chroot_local-includes/usr/local/bin/liferea:18 msgid "Liferea is deprecated" -msgstr "" +msgstr "Liferea已被弃用" #: config/chroot_local-includes/usr/local/bin/liferea:19 msgid "Do you wish to start Liferea anyway?" -msgstr "" +msgstr "您要启动Liferea anyway吗？" #: config/chroot_local-includes/usr/local/bin/liferea:21 msgid "" "Due to security concerns the Liferea feed reader will be removed from Tails " "by the end of 2018. Please migrate your feeds to Thunderbird." -msgstr "" +msgstr "出于安全角度考虑，Liferea feed reader将会在2018年末从Tails中被移除。请将您的网络订阅移至Thunderbird。" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Restart"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 30 Jul '18

30 Jul '18

commit 1839f384db882c4b86c050d5dcad21ed7d24e1fd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 30 12:45:45 2018 +0000 Update translations for https_everywhere_completed --- zh_CN/https-everywhere.dtd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd index 4eef39353..d58b5c235 100644 --- a/zh_CN/https-everywhere.dtd +++ b/zh_CN/https-everywhere.dtd @@ -25,6 +25,9 @@ <!ENTITY https-everywhere.prefs.reset_defaults "重置为默认值"> <!ENTITY https-everywhere.prefs.reset_defaults_message "重置将会让规则集回到默认状态，继续？"> +<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere提醒您正在访问未使用HTTPS协议的界面，并尝试采用HTTPS代替不安全的HTTP访问。此界面不支持HTTPS协议，有可能是此界面未曾提供HTTPS访问，但也有可能是来自攻击者的恶意行为。如果您希望继续访问未经加密的界面，请禁用扩展里的“屏蔽所有未曾加密的访问”的选项。请注意，禁用此选项有可能会使您的浏览器易受到网络降级攻击。"> +<!ENTITY https-everywhere.cancel.he_blocking_network "网络降级攻击"> + <!ENTITY https-everywhere.chrome.stable_rules "稳定规则"> <!ENTITY https-everywhere.chrome.stable_rules_description "强制对这些网站加密连接："> <!ENTITY https-everywhere.chrome.experimental_rules "实验性规则">

1 0