June 2020 - tor-commits - lists.torproject.org

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 25 Jun '20

25 Jun '20

commit 6a278974f975d2ee92ab93c92e1127bd7f58b19a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 25 20:47:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- ar/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/torbutton.properties b/ar/torbutton.properties index 21e199e4d5..60cbd6b79f 100644 --- a/ar/torbutton.properties +++ b/ar/torbutton.properties @@ -72,7 +72,7 @@ onionServices.errorPage.onionSite=موقع Onion # Tor SOCKS error 0xF0: onionServices.descNotFound.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion onionServices.descNotFound.header=لم يتم العثور على موقع Onion -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.descNotFound=على الأغلب أن موقع onion غير متصل.تواصل مع مديرها. onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion @@ -82,7 +82,7 @@ onionServices.descInvalid.longDescription=Details: %S — The requested onion se # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion onionServices.introFailed.header=موقع Onion قطع الاتصال. -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.introFailed=على الأغلب أن موقع onion غير متصل.تواصل مع مديرها . onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 25 Jun '20

25 Jun '20

commit 9f81493f815fed1e7dde3da4838693c5db624906 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 25 20:17:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- ar/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/torbutton.properties b/ar/torbutton.properties index 23b34ec5f3..21e199e4d5 100644 --- a/ar/torbutton.properties +++ b/ar/torbutton.properties @@ -60,7 +60,7 @@ updateDownloadingPanelUILabel=جاري تحميل S% من التحديث # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=الاتصال معمى (خدمة بصلة، %1$S، مفاتيح %2$S بتة، %3$S) pageInfo_OnionEncryption=الاتصال معمى (خدمة بصلة) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=موقع أونيون # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=تعرف على المزيد @@ -71,7 +71,7 @@ onionServices.errorPage.onionSite=موقع Onion # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: onionServices.descNotFound.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion -onionServices.descNotFound.header=Onionsite Not Found +onionServices.descNotFound.header=لم يتم العثور على موقع Onion onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1:

1 0

[metrics-web/master] Drop filesize parameter from torperf failures graph.
by karsten＠torproject.org 25 Jun '20

25 Jun '20

commit 0b246ad078e4b548041ea9ef49089c12c3625fdd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jun 25 19:53:28 2020 +0200 Drop filesize parameter from torperf failures graph. Implements tpo/metrics/website#40001. --- src/main/R/rserver/rserve-init.R | 27 ++++----------- .../torproject/metrics/stats/onionperf/Main.java | 19 ++++------- src/main/resources/web/json/metrics.json | 3 +- src/main/resources/web/jsps/stats.jsp | 3 +- src/main/sql/onionperf/init-onionperf.sql | 38 ++-------------------- 5 files changed, 19 insertions(+), 71 deletions(-) diff --git a/src/main/R/rserver/rserve-init.R b/src/main/R/rserver/rserve-init.R index 3ad89ce..e475e95 100644 --- a/src/main/R/rserver/rserve-init.R +++ b/src/main/R/rserver/rserve-init.R @@ -611,36 +611,26 @@ plot_torperf <- function(start_p, end_p, server_p, filesize_p, path_p) { } prepare_torperf_failures <- function(start_p = NULL, end_p = NULL, - server_p = NULL, filesize_p = NULL) { - read_csv(file = paste(stats_dir, "torperf-1.1.csv", sep = ""), + server_p = NULL) { + read_csv(file = paste(stats_dir, "onionperf-failures.csv", sep = ""), col_types = cols( date = col_date(format = ""), - filesize = col_double(), source = col_character(), server = col_character(), - q1 = col_skip(), - md = col_skip(), - q3 = col_skip(), timeouts = col_double(), failures = col_double(), requests = col_double())) %>% filter(if (!is.null(start_p)) date >= as.Date(start_p) else TRUE) %>% filter(if (!is.null(end_p)) date <= as.Date(end_p) else TRUE) %>% - filter(if (!is.null(filesize_p)) - filesize == ifelse(filesize_p == "50kb", 50 * 1024, - ifelse(filesize_p == "1mb", 1024 * 1024, 5 * 1024 * 1024)) else - TRUE) %>% filter(if (!is.null(server_p)) server == server_p else TRUE) %>% filter(requests > 0) %>% - transmute(date, filesize, source, server, timeouts = timeouts / requests, + transmute(date, source, server, timeouts = timeouts / requests, failures = failures / requests) } -plot_torperf_failures <- function(start_p, end_p, server_p, filesize_p, - path_p) { - prepare_torperf_failures(start_p, end_p, server_p, filesize_p) %>% - filter(source != "") %>% - gather(variable, value, -c(date, filesize, source, server)) %>% +plot_torperf_failures <- function(start_p, end_p, server_p, path_p) { + prepare_torperf_failures(start_p, end_p, server_p) %>% + gather(variable, value, -c(date, source, server)) %>% mutate(variable = factor(variable, levels = c("timeouts", "failures"), labels = c("Timeouts", "Failures"))) %>% ggplot(aes(x = date, y = value, colour = source)) + @@ -650,10 +640,7 @@ plot_torperf_failures <- function(start_p, end_p, server_p, filesize_p, scale_y_continuous(name = "", labels = percent, limits = c(0, NA)) + scale_colour_hue(name = "Source") + facet_grid(variable ~ .) + - ggtitle(paste("Timeouts and failures of", - ifelse(filesize_p == "50kb", "50 KiB", - ifelse(filesize_p == "1mb", "1 MiB", "5 MiB")), - "requests to", server_p, "server")) + + ggtitle(paste("Timeouts and failures of requests to", server_p, "server")) + labs(caption = copyright_notice) + theme(legend.position = "top") ggsave(filename = path_p, width = 8, height = 5, dpi = 150) diff --git a/src/main/java/org/torproject/metrics/stats/onionperf/Main.java b/src/main/java/org/torproject/metrics/stats/onionperf/Main.java index 02fa08b..5cbd518 100644 --- a/src/main/java/org/torproject/metrics/stats/onionperf/Main.java +++ b/src/main/java/org/torproject/metrics/stats/onionperf/Main.java @@ -49,8 +49,8 @@ public class Main { writeStatistics( new File(baseDir, "stats/onionperf-including-partials.csv").toPath(), queryOnionperfIncludingPartials(connection)); - writeStatistics(new File(baseDir, "stats/torperf-1.1.csv").toPath(), - queryOnionPerf(connection)); + writeStatistics(new File(baseDir, "stats/onionperf-failures.csv").toPath(), + queryOnionperfFailures(connection)); writeStatistics(new File(baseDir, "stats/buildtimes.csv").toPath(), queryBuildTimes(connection)); writeStatistics(new File(baseDir, "stats/latencies.csv").toPath(), @@ -281,26 +281,21 @@ public class Main { return statistics; } - static List<String> queryOnionPerf(Connection connection) + static List<String> queryOnionperfFailures(Connection connection) throws SQLException { logger.info("Querying timeout and failure statistics from database."); List<String> statistics = new ArrayList<>(); - statistics - .add("date,filesize,source,server,q1,md,q3,timeouts,failures,requests"); + statistics.add("date,source,server,timeouts,failures,requests"); Statement st = connection.createStatement(); - String queryString = "SELECT date, filesize, source, server, q1, md, q3, " - + "timeouts, failures, requests FROM onionperf"; + String queryString = "SELECT date, source, server, timeouts, failures, " + + "requests FROM onionperf_failures"; DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); try (ResultSet rs = st.executeQuery(queryString)) { while (rs.next()) { - statistics.add(String.format("%s,%d,%s,%s,%.0f,%.0f,%.0f,%d,%d,%d", + statistics.add(String.format("%s,%s,%s,%d,%d,%d", dateFormat.format(rs.getDate("date")), - rs.getInt("filesize"), getStringFromResultSet(rs, "source"), getStringFromResultSet(rs, "server"), - getDoubleFromResultSet(rs, "q1"), - getDoubleFromResultSet(rs, "md"), - getDoubleFromResultSet(rs, "q3"), rs.getInt("timeouts"), rs.getInt("failures"), rs.getInt("requests"))); diff --git a/src/main/resources/web/json/metrics.json b/src/main/resources/web/json/metrics.json index f2b36a5..4735359 100644 --- a/src/main/resources/web/json/metrics.json +++ b/src/main/resources/web/json/metrics.json @@ -291,8 +291,7 @@ "parameters": [ "start", "end", - "server", - "filesize" + "server" ] }, { diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp index ad6c566..37e5bbb 100644 --- a/src/main/resources/web/jsps/stats.jsp +++ b/src/main/resources/web/jsps/stats.jsp @@ -57,6 +57,7 @@ https://metrics.torproject.org/identifier.csv <li>December 18, 2019: Added <a href="#bridgedb-transport">BridgeDB requests by requested transport</a> and <a href="#bridgedb-distributor">BridgeDB requests by distributor</a> graphs.</li> <li>May 24, 2020: Included version 3 onion service measurements in <a href="#torperf">Time to download files over Tor</a>, <a href="#torperf-failures">Timeouts and failures of downloading files over Tor</a>, <a href="#onionperf-buildtimes">Circuit build times</a>, <a href="#onionperf-latencies">Circuit round-trip latencies</a> graphs.</li> <li>May 24, 2020: Included partial downloads of larger file sizes in <a href="#torperf">Time to download files over Tor</a> graph.</li> +<li>June 25, 2020: Removed filesize parameter from <a href="#torperf-failures">Timeouts and failures of downloading files over Tor</a> graphs.</li> </ul> </div> @@ -576,14 +577,12 @@ Performance <a href="#performance" name="performance" class="anchor">#</a></h2> <li>start: First UTC date (YYYY-MM-DD) to include in the file.</li> <li>end: Last UTC date (YYYY-MM-DD) to include in the file.</li> <li>server: Either "public" for requests to a server on the public internet, or "onion" for requests to an onion server.</li> -<li>filesize: Size of the downloaded file in bytes, with pre-defined possible values: "50kb", "1mb", or "5mb".</li> </ul> <h4>Columns</h4> <ul> <li>date: UTC date (YYYY-MM-DD) when download performance was measured.</li> -<li>filesize: Size of the downloaded file in bytes.</li> <li>source: Name of the OnionPerf or Torperf service performing measurements.</li> <li>server: Either "public" if the request was made to a server on the public internet, or "onion" if the request was made to an onion server.</li> <li>timeouts: Fraction of requests that timed out when attempting to download the static file over Tor.</li> diff --git a/src/main/sql/onionperf/init-onionperf.sql b/src/main/sql/onionperf/init-onionperf.sql index ebe9f77..7c8a859 100644 --- a/src/main/sql/onionperf/init-onionperf.sql +++ b/src/main/sql/onionperf/init-onionperf.sql @@ -110,43 +110,11 @@ SELECT date, FROM grouped ORDER BY date, filesize, source, server; -CREATE OR REPLACE VIEW onionperf AS -SELECT date, - filesize, - source, - server, - CASE WHEN q IS NULL THEN NULL ELSE q[1] END AS q1, - CASE WHEN q IS NULL THEN NULL ELSE q[2] END AS md, - CASE WHEN q IS NULL THEN NULL ELSE q[3] END AS q3, - timeouts, - failures, - requests -FROM ( +CREATE OR REPLACE VIEW onionperf_failures AS SELECT DATE(start) AS date, - filesize, source, CASE WHEN endpointremote LIKE '%.onion:%' THEN 'onion' ELSE 'public' END AS server, - CASE WHEN COUNT(*) > 0 THEN - PERCENTILE_CONT(ARRAY[0.25,0.5,0.75]) WITHIN GROUP(ORDER BY datacomplete) - ELSE NULL END AS q, - COUNT(CASE WHEN didtimeout OR datacomplete < 1 THEN 1 ELSE NULL END) - AS timeouts, - COUNT(CASE WHEN NOT didtimeout AND datacomplete >= 1 - AND readbytes < filesize THEN 1 ELSE NULL END) AS failures, - COUNT(*) AS requests -FROM measurements -WHERE DATE(start) < current_date - 1 -GROUP BY date, filesize, source, server -UNION -SELECT DATE(start) AS date, - filesize, - '' AS source, - CASE WHEN endpointremote LIKE '%.onion:%' THEN 'onion' - ELSE 'public' END AS server, - CASE WHEN COUNT(*) > 0 THEN - PERCENTILE_CONT(ARRAY[0.25,0.5,0.75]) WITHIN GROUP(ORDER BY datacomplete) - ELSE NULL END AS q, COUNT(CASE WHEN didtimeout OR datacomplete < 1 THEN 1 ELSE NULL END) AS timeouts, COUNT(CASE WHEN NOT didtimeout AND datacomplete >= 1 @@ -154,8 +122,8 @@ SELECT DATE(start) AS date, COUNT(*) AS requests FROM measurements WHERE DATE(start) < current_date - 1 -GROUP BY date, filesize, 3, server) sub -ORDER BY date, filesize, source, server; +GROUP BY date, source, server +ORDER BY date, source, server; CREATE OR REPLACE VIEW buildtimes_stats AS SELECT date,

1 0

[tor/master] Deprecate the "--dump-config non-builtin" option
by dgoulet＠torproject.org 25 Jun '20

25 Jun '20

commit 62e1d983cf362d6769e763e8b50ab8a51bdc84d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 25 10:00:28 2020 -0400 Deprecate the "--dump-config non-builtin" option When it works, "non-builtin" doesn't do anything different from "short". (When it doesn't work, it gives an assertion failure.) Closes ticket #33398. --- changes/ticket33398 | 4 ++++ doc/tor.1.txt | 7 +++---- src/app/main/main.c | 6 ++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/changes/ticket33398 b/changes/ticket33398 new file mode 100644 index 000000000..bd175bad2 --- /dev/null +++ b/changes/ticket33398 @@ -0,0 +1,4 @@ + o Deprecated features: + - The "non-builtin" argument to the "--dump-config" command is now + deprecated. When it works, it behaves the same as "short", which + you should use instead. Closes ticket 33398. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 15d5775e2..a7b3a6787 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -97,11 +97,10 @@ The following options in this section are only recognized on the [[opt-verify-config]] **`--verify-config`**:: Verify whether the configuration file is valid. -[[opt-dump-config]] **`--dump-config`** **`short`**|**`full`**|**`non-builtin`**:: - Write a complete list of Tor's configured options to standard output. +[[opt-dump-config]] **`--dump-config`** **`short`**|**`full`**:: + Write a list of Tor's configured options to standard output. When the `short` flag is selected, only write the options that - are different from their default values. When `non-builtin` is selected, - write options that are not zero or the empty string. + are different from their default values When `full` is selected, write every option. [[opt-serviceinstall]] **`--service install`** [**`--options`** __command-line options__]:: diff --git a/src/app/main/main.c b/src/app/main/main.c index 32c34ea82..93f2c9c2d 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -775,12 +775,14 @@ do_dump_config(void) if (!strcmp(arg, "short")) { how = OPTIONS_DUMP_MINIMAL; } else if (!strcmp(arg, "non-builtin")) { - how = OPTIONS_DUMP_DEFAULTS; + // Deprecated since 0.4.5.1-alpha. + fprintf(stderr, "'non-builtin' is deprecated; use 'short' instead.\n"); + how = OPTIONS_DUMP_MINIMAL; } else if (!strcmp(arg, "full")) { how = OPTIONS_DUMP_ALL; } else { fprintf(stderr, "No valid argument to --dump-config found!\n"); - fprintf(stderr, "Please select 'short', 'non-builtin', or 'full'.\n"); + fprintf(stderr, "Please select 'short' or 'full'.\n"); return -1; }

1 0

[tor/master] Remove now-unused OPTIONS_DUMP_DEFAULTS.
by dgoulet＠torproject.org 25 Jun '20

25 Jun '20

commit 50abc06d84cabdc2a9471d888f2e32d5c27c9815 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 25 10:02:17 2020 -0400 Remove now-unused OPTIONS_DUMP_DEFAULTS. --- src/app/config/config.c | 4 ---- src/app/config/config.h | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 286cd9304..0048c96f4 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2771,10 +2771,6 @@ options_dump(const or_options_t *options, int how_to_dump) use_defaults = global_default_options; minimal = 1; break; - case OPTIONS_DUMP_DEFAULTS: - use_defaults = NULL; - minimal = 1; - break; case OPTIONS_DUMP_ALL: use_defaults = NULL; minimal = 0; diff --git a/src/app/config/config.h b/src/app/config/config.h index 17caa0e3f..f7d4e49f6 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -58,8 +58,7 @@ setopt_err_t options_trial_assign(struct config_line_t *list, unsigned flags, void options_init(or_options_t *options); #define OPTIONS_DUMP_MINIMAL 1 -#define OPTIONS_DUMP_DEFAULTS 2 -#define OPTIONS_DUMP_ALL 3 +#define OPTIONS_DUMP_ALL 2 char *options_dump(const or_options_t *options, int how_to_dump); int options_init_from_torrc(int argc, char **argv); setopt_err_t options_init_from_string(const char *cf_defaults, const char *cf,

1 0

[tor/master] Merge branch 'tor-github/pr/1951'
by dgoulet＠torproject.org 25 Jun '20

25 Jun '20

commit 069566b40a94f8876e813fed39176bc403bfffd1 Merge: 374626c09 50abc06d8 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jun 25 13:41:45 2020 -0400 Merge branch 'tor-github/pr/1951' changes/ticket33398 | 4 ++++ doc/tor.1.txt | 7 +++---- src/app/config/config.c | 4 ---- src/app/config/config.h | 3 +-- src/app/main/main.c | 6 ++++-- 5 files changed, 12 insertions(+), 12 deletions(-)

1 0

[tor/master] Add test for fingerprint-ed25519 file
by dgoulet＠torproject.org 25 Jun '20

25 Jun '20

commit 7b2ab93f6571a40791301e5d923bcf5d88a76df1 Author: Neel Chauhan <neel(a)neelc.org> Date: Fri Jan 10 21:42:07 2020 -0800 Add test for fingerprint-ed25519 file --- src/test/test_routerkeys.c | 53 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/src/test/test_routerkeys.c b/src/test/test_routerkeys.c index fc437dccc..bafc886bc 100644 --- a/src/test/test_routerkeys.c +++ b/src/test/test_routerkeys.c @@ -51,7 +51,7 @@ test_routerkeys_write_fingerprint(void *arg) tt_int_op(crypto_pk_cmp_keys(get_server_identity_key(),key),OP_EQ,0); /* Write fingerprint file */ - tt_int_op(0, OP_EQ, router_write_fingerprint(0)); + tt_int_op(0, OP_EQ, router_write_fingerprint(0, 0)); cp = read_file_to_str(get_fname("write_fingerprint/fingerprint"), 0, NULL); crypto_pk_get_fingerprint(key, fp, 0); @@ -61,7 +61,7 @@ test_routerkeys_write_fingerprint(void *arg) tor_free(cp2); /* Write hashed-fingerprint file */ - tt_int_op(0, OP_EQ, router_write_fingerprint(1)); + tt_int_op(0, OP_EQ, router_write_fingerprint(1, 0)); cp = read_file_to_str(get_fname("write_fingerprint/hashed-fingerprint"), 0, NULL); crypto_pk_get_hashed_fingerprint(key, fp); @@ -73,7 +73,7 @@ test_routerkeys_write_fingerprint(void *arg) /* Replace outdated file */ write_str_to_file(get_fname("write_fingerprint/hashed-fingerprint"), "junk goes here", 0); - tt_int_op(0, OP_EQ, router_write_fingerprint(1)); + tt_int_op(0, OP_EQ, router_write_fingerprint(1, 0)); cp = read_file_to_str(get_fname("write_fingerprint/hashed-fingerprint"), 0, NULL); crypto_pk_get_hashed_fingerprint(key, fp); @@ -89,6 +89,52 @@ test_routerkeys_write_fingerprint(void *arg) tor_free(cp2); } +static void +test_routerkeys_write_ed25519_identity(void *arg) +{ + crypto_pk_t *key = pk_generate(2); + or_options_t *options = get_options_mutable(); + time_t now = time(NULL); + const char *ddir = get_fname("write_fingerprint"); + char *cp = NULL, *cp2 = NULL; + char ed25519_id[BASE64_DIGEST256_LEN + 1]; + + (void) arg; + + tt_assert(key); + + options->ORPort_set = 1; /* So that we can get the server ID key */ + tor_free(options->DataDirectory); + options->DataDirectory = tor_strdup(ddir); + options->Nickname = tor_strdup("haflinger"); + set_server_identity_key(key); + set_client_identity_key(crypto_pk_dup_key(key)); + + load_ed_keys(options, now); + generate_ed_link_cert(options, now, 0); + tt_assert(get_master_identity_key()); + + tt_int_op(0, OP_EQ, check_private_dir(ddir, CPD_CREATE, NULL)); + + /* Write fingerprint file */ + tt_int_op(0, OP_EQ, router_write_fingerprint(0, 1)); + cp = read_file_to_str(get_fname("write_fingerprint/fingerprint-ed25519"), + 0, NULL); + digest256_to_base64(ed25519_id, + (const char *) get_master_identity_key()->pubkey); + tor_asprintf(&cp2, "haflinger %s\n", ed25519_id); + tt_str_op(cp, OP_EQ, cp2); + tor_free(cp); + tor_free(cp2); + + done: + crypto_pk_free(key); + set_client_identity_key(NULL); + tor_free(cp); + tor_free(cp2); + routerkeys_free_all(); +} + static void test_routerkeys_ed_certs(void *args) { @@ -695,6 +741,7 @@ test_routerkeys_rsa_ed_crosscert(void *arg) struct testcase_t routerkeys_tests[] = { TEST(write_fingerprint, TT_FORK), + TEST(write_ed25519_identity, TT_FORK), TEST(ed_certs, TT_FORK), TEST(ed_key_create, TT_FORK), TEST(ed_key_init_basic, TT_FORK),

1 0

[tor/master] Add an fingerprint-ed25519 file to the data directory
by dgoulet＠torproject.org 25 Jun '20

25 Jun '20

commit ef563a8fef28320a99d9836599013ebb31378d22 Author: Neel Chauhan <neel(a)neelc.org> Date: Fri Jan 10 20:58:21 2020 -0800 Add an fingerprint-ed25519 file to the data directory --- changes/ticket30642 | 4 ++++ src/app/main/main.c | 2 ++ src/feature/relay/router.c | 60 ++++++++++++++++++++++++++++------------------ src/feature/relay/router.h | 2 +- 4 files changed, 44 insertions(+), 24 deletions(-) diff --git a/changes/ticket30642 b/changes/ticket30642 new file mode 100644 index 000000000..13941b2ac --- /dev/null +++ b/changes/ticket30642 @@ -0,0 +1,4 @@ + o Minor features (ed25519, relay): + - Save a relay's base64-encoded ed25519 identity key to the data + directory in a file named fingerprint-ed25519. Closes ticket 30642. + Patch by Neel Chauhan. diff --git a/src/app/main/main.c b/src/app/main/main.c index dc39611f9..93291674c 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1054,12 +1054,14 @@ sandbox_init_filter(void) OPEN_DATADIR("approved-routers"); OPEN_DATADIR_SUFFIX("fingerprint", ".tmp"); + OPEN_DATADIR_SUFFIX("fingerprint-ed25519", ".tmp"); OPEN_DATADIR_SUFFIX("hashed-fingerprint", ".tmp"); OPEN_DATADIR_SUFFIX("router-stability", ".tmp"); OPEN("/etc/resolv.conf"); RENAME_SUFFIX("fingerprint", ".tmp"); + RENAME_SUFFIX("fingerprint-ed25519", ".tmp"); RENAME_KEYDIR_SUFFIX("secret_onion_key_ntor", ".tmp"); RENAME_KEYDIR_SUFFIX("secret_id_key", ".tmp"); diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 267dee848..f772ece29 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -831,30 +831,37 @@ router_initialize_tls_context(void) * -1 if Tor should die, */ STATIC int -router_write_fingerprint(int hashed) +router_write_fingerprint(int hashed, int ed25519_identity) { char *keydir = NULL, *cp = NULL; const char *fname = hashed ? "hashed-fingerprint" : - "fingerprint"; + (ed25519_identity ? "fingerprint-ed25519" : + "fingerprint"); char fingerprint[FINGERPRINT_LEN+1]; const or_options_t *options = get_options(); char *fingerprint_line = NULL; int result = -1; keydir = get_datadir_fname(fname); - log_info(LD_GENERAL,"Dumping %sfingerprint to \"%s\"...", - hashed ? "hashed " : "", keydir); - if (!hashed) { - if (crypto_pk_get_fingerprint(get_server_identity_key(), - fingerprint, 0) < 0) { - log_err(LD_GENERAL,"Error computing fingerprint"); - goto done; - } - } else { - if (crypto_pk_get_hashed_fingerprint(get_server_identity_key(), - fingerprint) < 0) { - log_err(LD_GENERAL,"Error computing hashed fingerprint"); - goto done; + log_info(LD_GENERAL,"Dumping %s%s to \"%s\"...", hashed ? "hashed " : "", + ed25519_identity ? "ed25519 identity" : "fingerprint", keydir); + + if (ed25519_identity) { /* ed25519 identity */ + digest256_to_base64(fingerprint, (const char *) + get_master_identity_key()->pubkey); + } else { /* RSA identity */ + if (!hashed) { + if (crypto_pk_get_fingerprint(get_server_identity_key(), + fingerprint, 0) < 0) { + log_err(LD_GENERAL,"Error computing fingerprint"); + goto done; + } + } else { + if (crypto_pk_get_hashed_fingerprint(get_server_identity_key(), + fingerprint) < 0) { + log_err(LD_GENERAL,"Error computing hashed fingerprint"); + goto done; + } } } @@ -865,15 +872,17 @@ router_write_fingerprint(int hashed) cp = read_file_to_str(keydir, RFTS_IGNORE_MISSING, NULL); if (!cp || strcmp(cp, fingerprint_line)) { if (write_str_to_file(keydir, fingerprint_line, 0)) { - log_err(LD_FS, "Error writing %sfingerprint line to file", - hashed ? "hashed " : ""); + log_err(LD_FS, "Error writing %s%s line to file", + hashed ? "hashed " : "", + ed25519_identity ? "ed25519 identity" : "fingerprint"); goto done; } } - log_notice(LD_GENERAL, "Your Tor %s identity key fingerprint is '%s %s'", - hashed ? "bridge's hashed" : "server's", options->Nickname, - fingerprint); + log_notice(LD_GENERAL, "Your Tor %s identity key %s fingerprint is '%s %s'", + hashed ? "bridge's hashed" : "server's", + ed25519_identity ? "ed25519" : "", + options->Nickname, fingerprint); result = 0; done: @@ -1109,15 +1118,20 @@ init_keys(void) } } - /* 5. Dump fingerprint and possibly hashed fingerprint to files. */ - if (router_write_fingerprint(0)) { + /* 5. Dump fingerprint, ed25519 identity and possibly hashed fingerprint + * to files. */ + if (router_write_fingerprint(0, 0)) { log_err(LD_FS, "Error writing fingerprint to file"); return -1; } - if (!public_server_mode(options) && router_write_fingerprint(1)) { + if (!public_server_mode(options) && router_write_fingerprint(1, 0)) { log_err(LD_FS, "Error writing hashed fingerprint to file"); return -1; } + if (router_write_fingerprint(0, 1)) { + log_err(LD_FS, "Error writing ed25519 identity to file"); + return -1; + } if (!authdir_mode(options)) return 0; diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h index 50790a73d..b7d99a101 100644 --- a/src/feature/relay/router.h +++ b/src/feature/relay/router.h @@ -124,7 +124,7 @@ void router_free_all(void); #ifdef ROUTER_PRIVATE /* Used only by router.c and the unit tests */ STATIC void get_platform_str(char *platform, size_t len); -STATIC int router_write_fingerprint(int hashed); +STATIC int router_write_fingerprint(int hashed, int ed25519_identity); STATIC smartlist_t *get_my_declared_family(const or_options_t *options); #ifdef TOR_UNIT_TESTS

1 0

[tor/master] Merge branch 'tor-github/pr/1917'
by dgoulet＠torproject.org 25 Jun '20

25 Jun '20

commit 374626c09b8c3f5752a99eeee16ac8654cf531a1 Merge: dc4f3a219 7b2ab93f6 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jun 25 13:35:34 2020 -0400 Merge branch 'tor-github/pr/1917' changes/ticket30642 | 4 ++++ src/app/main/main.c | 2 ++ src/feature/relay/router.c | 60 ++++++++++++++++++++++++++++------------------ src/feature/relay/router.h | 2 +- src/test/test_routerkeys.c | 53 +++++++++++++++++++++++++++++++++++++--- 5 files changed, 94 insertions(+), 27 deletions(-)

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 25 Jun '20

25 Jun '20

commit cd51dd86ab951c1afec0ad59ec15504d644e2b49 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 25 17:16:22 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ar.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ar.po b/ar.po index 234b195ee5..239c3c30c3 100644 --- a/ar.po +++ b/ar.po @@ -23,6 +23,7 @@ # Matt Santy <matt_santy(a)hotmail.com>, 2013 # stayanonymous, 2015 # Mohammed ALDOUB <voulnet(a)gmail.com>, 2013 +# Mustafa <mustafasheref8(a)gmail.com>, 2020 # Osama H. Qasho <osamah_owis(a)windowslive.com>, 2014 # Osama M. Mneina <o.mneina(a)gmail.com>, 2014 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013 @@ -34,8 +35,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-04 13:11+0200\n" -"PO-Revision-Date: 2020-06-18 12:35+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-06-25 17:03+0000\n" +"Last-Translator: Mustafa <mustafasheref8(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0