December 2017 - tor-commits - lists.torproject.org

[tor/master] test: Add HS_DESC v3 unit tests
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit 9c6560fe29c9e2ee33549ca890f94c03cbdd94a8 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 20 12:10:07 2017 -0500 test: Add HS_DESC v3 unit tests This introduces the test_hs_control.c file which at this commit contains basic unit test for the HS_DESC event. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_hs_control.c | 199 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 202 insertions(+) diff --git a/src/test/include.am b/src/test/include.am index bbf8a370e..b5c5dd24f 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -125,6 +125,7 @@ src_test_test_SOURCES = \ src/test/test_hs_service.c \ src/test/test_hs_client.c \ src/test/test_hs_intropoint.c \ + src/test/test_hs_control.c \ src/test/test_handles.c \ src/test/test_hs_cache.c \ src/test/test_hs_descriptor.c \ diff --git a/src/test/test.c b/src/test/test.c index 00857c238..432df35c3 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1201,6 +1201,7 @@ struct testgroup_t testgroups[] = { { "hs_cell/", hs_cell_tests }, { "hs_common/", hs_common_tests }, { "hs_config/", hs_config_tests }, + { "hs_control/", hs_control_tests }, { "hs_descriptor/", hs_descriptor }, { "hs_ntor/", hs_ntor_tests }, { "hs_service/", hs_service_tests }, diff --git a/src/test/test.h b/src/test/test.h index b1a3366a8..b37fe25b3 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -210,6 +210,7 @@ extern struct testcase_t hs_cache[]; extern struct testcase_t hs_cell_tests[]; extern struct testcase_t hs_common_tests[]; extern struct testcase_t hs_config_tests[]; +extern struct testcase_t hs_control_tests[]; extern struct testcase_t hs_descriptor[]; extern struct testcase_t hs_ntor_tests[]; extern struct testcase_t hs_service_tests[]; diff --git a/src/test/test_hs_control.c b/src/test/test_hs_control.c new file mode 100644 index 000000000..207a55de6 --- /dev/null +++ b/src/test/test_hs_control.c @@ -0,0 +1,199 @@ +/* Copyright (c) 2017, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file test_hs_control.c + * \brief Unit tests for hidden service control port event and command. + **/ + +#define CONTROL_PRIVATE +#define CIRCUITBUILD_PRIVATE +#define RENDCOMMON_PRIVATE +#define RENDSERVICE_PRIVATE +#define HS_SERVICE_PRIVATE + +#include "or.h" +#include "test.h" +#include "control.h" +#include "config.h" +#include "hs_common.h" +#include "hs_control.h" +#include "nodelist.h" +//#include "rendcommon.h" +//#include "rendservice.h" +//#include "routerset.h" +//#include "circuitbuild.h" +#include "test_helpers.h" + +/* mock ID digest and longname for node that's in nodelist */ +#define HSDIR_EXIST_ID \ + "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA" \ + "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA" +#define STR_HSDIR_EXIST_LONGNAME \ + "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=TestDir" +#define STR_HSDIR_NONE_EXIST_LONGNAME \ + "$BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" + +/* Helper global variable for hidden service descriptor event test. + * It's used as a pointer to dynamically created message buffer in + * send_control_event_string_replacement function, which mocks + * send_control_event_string function. + * + * Always free it after use! */ +static char *received_msg = NULL; + +/** Mock function for send_control_event_string + */ +static void +queue_control_event_string_replacement(uint16_t event, char *msg) +{ + (void) event; + tor_free(received_msg); + received_msg = msg; +} + +/** Mock function for node_describe_longname_by_id, it returns either + * STR_HSDIR_EXIST_LONGNAME or STR_HSDIR_NONE_EXIST_LONGNAME + */ +static const char * +node_describe_longname_by_id_replacement(const char *id_digest) +{ + if (!strcmp(id_digest, HSDIR_EXIST_ID)) { + return STR_HSDIR_EXIST_LONGNAME; + } else { + return STR_HSDIR_NONE_EXIST_LONGNAME; + } +} + +/* HSDir fetch index is a series of 'D' */ +#define HSDIR_INDEX_FETCH_HEX \ + "4343434343434343434343434343434343434343434343434343434343434343" +#define HSDIR_INDEX_STORE_HEX \ + "4444444444444444444444444444444444444444444444444444444444444444" + +static const node_t * +mock_node_get_by_id(const char *digest) +{ + static node_t node; + memcpy(node.identity, digest, DIGEST_LEN); + node.hsdir_index = tor_malloc_zero(sizeof(hsdir_index_t)); + memset(node.hsdir_index->fetch, 'C', DIGEST256_LEN); + memset(node.hsdir_index->store_first, 'D', DIGEST256_LEN); + return &node; +} + +static void +test_hs_desc_event(void *arg) +{ + int ret; + char *expected_msg = NULL; + char onion_address[HS_SERVICE_ADDR_LEN_BASE32 + 1]; + ed25519_keypair_t identity_kp; + ed25519_public_key_t blinded_pk; + char base64_blinded_pk[ED25519_BASE64_LEN + 1]; + routerstatus_t hsdir_rs; + hs_ident_dir_conn_t ident; + + (void) arg; + MOCK(queue_control_event_string, + queue_control_event_string_replacement); + MOCK(node_describe_longname_by_id, + node_describe_longname_by_id_replacement); + MOCK(node_get_by_id, mock_node_get_by_id); + + /* Setup what we need for this test. */ + ed25519_keypair_generate(&identity_kp, 0); + hs_build_address(&identity_kp.pubkey, HS_VERSION_THREE, onion_address); + ret = hs_address_is_valid(onion_address); + tt_int_op(ret, OP_EQ, 1); + memset(&blinded_pk, 'B', sizeof(blinded_pk)); + memset(&hsdir_rs, 0, sizeof(hsdir_rs)); + memcpy(hsdir_rs.identity_digest, HSDIR_EXIST_ID, DIGEST_LEN); + ret = ed25519_public_to_base64(base64_blinded_pk, &blinded_pk); + tt_int_op(ret, OP_EQ, 0); + memcpy(&ident.identity_pk, &identity_kp.pubkey, + sizeof(ed25519_public_key_t)); + memcpy(&ident.blinded_pk, &blinded_pk, sizeof(blinded_pk)); + + /* HS_DESC REQUESTED ... */ + hs_control_desc_event_requested(&identity_kp.pubkey, base64_blinded_pk, + &hsdir_rs); + tor_asprintf(&expected_msg, "650 HS_DESC REQUESTED %s NO_AUTH " + STR_HSDIR_EXIST_LONGNAME " %s HSDIR_INDEX=" + HSDIR_INDEX_FETCH_HEX "\r\n", + onion_address, base64_blinded_pk); + tt_assert(received_msg); + tt_str_op(received_msg, OP_EQ, expected_msg); + tor_free(received_msg); + tor_free(expected_msg); + + /* HS_DESC CREATED... */ + hs_control_desc_event_created(onion_address, &blinded_pk); + tor_asprintf(&expected_msg, "650 HS_DESC CREATED %s UNKNOWN " + "UNKNOWN %s\r\n", + onion_address, base64_blinded_pk); + tt_assert(received_msg); + tt_str_op(received_msg, OP_EQ, expected_msg); + tor_free(received_msg); + tor_free(expected_msg); + + /* HS_DESC UPLOAD... */ + uint8_t hsdir_index_store[DIGEST256_LEN]; + memset(hsdir_index_store, 'D', sizeof(hsdir_index_store)); + hs_control_desc_event_upload(onion_address, HSDIR_EXIST_ID, + &blinded_pk, hsdir_index_store); + tor_asprintf(&expected_msg, "650 HS_DESC UPLOAD %s UNKNOWN " + STR_HSDIR_EXIST_LONGNAME " %s " + "HSDIR_INDEX=" HSDIR_INDEX_STORE_HEX "\r\n", + onion_address, base64_blinded_pk); + tt_assert(received_msg); + tt_str_op(received_msg, OP_EQ, expected_msg); + tor_free(received_msg); + tor_free(expected_msg); + + /* HS_DESC FAILED... */ + hs_control_desc_event_failed(&ident, HSDIR_EXIST_ID, "BAD_DESC"); + tor_asprintf(&expected_msg, "650 HS_DESC FAILED %s NO_AUTH " + STR_HSDIR_EXIST_LONGNAME " %s " + "REASON=BAD_DESC\r\n", + onion_address, base64_blinded_pk); + tt_assert(received_msg); + tt_str_op(received_msg, OP_EQ, expected_msg); + tor_free(received_msg); + tor_free(expected_msg); + + /* HS_DESC RECEIVED... */ + hs_control_desc_event_received(&ident, HSDIR_EXIST_ID); + tor_asprintf(&expected_msg, "650 HS_DESC RECEIVED %s NO_AUTH " + STR_HSDIR_EXIST_LONGNAME " %s\r\n", + onion_address, base64_blinded_pk); + tt_assert(received_msg); + tt_str_op(received_msg, OP_EQ, expected_msg); + tor_free(received_msg); + tor_free(expected_msg); + + /* HS_DESC UPLOADED... */ + hs_control_desc_event_uploaded(&ident, HSDIR_EXIST_ID); + tor_asprintf(&expected_msg, "650 HS_DESC UPLOADED %s UNKNOWN " + STR_HSDIR_EXIST_LONGNAME "\r\n", + onion_address); + tt_assert(received_msg); + tt_str_op(received_msg, OP_EQ, expected_msg); + tor_free(received_msg); + tor_free(expected_msg); + + done: + UNMOCK(queue_control_event_string); + UNMOCK(node_describe_longname_by_id); + UNMOCK(node_get_by_id); + tor_free(received_msg); + tor_free(expected_msg); +} + +struct testcase_t hs_control_tests[] = { + { "hs_desc_event", test_hs_desc_event, TT_FORK, + NULL, NULL }, + + END_OF_TESTCASES +}; +

1 0

[tor/master] control: HSPOST command support for v3
by nickm＠torproject.org 06 Dec '17

06 Dec '17

commit ace42acff0d658fb39ce38d0502ef68b1bfa67c8 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 15 14:52:24 2017 -0500 control: HSPOST command support for v3 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/control.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/or/control.c b/src/or/control.c index 7ade90ea8..dc045c39a 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -60,6 +60,7 @@ #include "hibernate.h" #include "hs_cache.h" #include "hs_common.h" +#include "hs_control.h" #include "main.h" #include "microdesc.h" #include "networkstatus.h" @@ -4338,9 +4339,11 @@ handle_control_hspost(control_connection_t *conn, const char *body) { static const char *opt_server = "SERVER="; + static const char *opt_hsaddress = "HSADDRESS="; smartlist_t *hs_dirs = NULL; const char *encoded_desc = body; size_t encoded_desc_len = len; + const char *onion_address = NULL; char *cp = memchr(body, '\n', len); if (cp == NULL) { @@ -4374,6 +4377,12 @@ handle_control_hspost(control_connection_t *conn, if (!hs_dirs) hs_dirs = smartlist_new(); smartlist_add(hs_dirs, node->rs); + } else if (!strcasecmpstart(arg, opt_hsaddress)) { + if (!hs_address_is_valid(arg)) { + connection_printf_to_buf(conn, "512 Malformed onion address\r\n"); + goto done; + } + onion_address = arg; } else { connection_printf_to_buf(conn, "512 Unexpected argument \"%s\"\r\n", arg); @@ -4382,6 +4391,19 @@ handle_control_hspost(control_connection_t *conn, } SMARTLIST_FOREACH_END(arg); } + /* Handle the v3 case. */ + if (onion_address) { + char *desc_str = NULL; + read_escaped_data(encoded_desc, encoded_desc_len, &desc_str); + if (hs_control_hspost_command(desc_str, onion_address, hs_dirs) < 0) { + connection_printf_to_buf(conn, "554 Invalid descriptor\r\n"); + } + tor_free(desc_str); + goto done; + } + + /* From this point on, it is only v2. */ + /* Read the dot encoded descriptor, and parse it. */ rend_encoded_v2_service_descriptor_t *desc = tor_malloc_zero(sizeof(rend_encoded_v2_service_descriptor_t));

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 06 Dec '17

06 Dec '17

commit 20b96aad78db0995ae1d3b10f0a80adc2b44d91b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 5 22:17:44 2017 +0000 Update translations for torbutton-torbuttondtd --- lt/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt/torbutton.dtd b/lt/torbutton.dtd index a000ecc0f..ca2c37099 100644 --- a/lt/torbutton.dtd +++ b/lt/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Palikite šį langelį pažymėtą, kad neleistumėte įvairioms naršyklės ypatybėms būti netinkamai naudojamoms ir tokiu būdu leisti jus sekti, kol naršote saityne. Į pakeistas ypatybes įeina dvejetainio išplėstinio duomenų tipo URL adresai, transliavimo kanalai, naršyklės podėlis, slapukai, svetainių piktogramos, HTTP tapatybės nustatymo antraštės, išankstiniai nuorodų sujungimai, localStorage, mediaSource URL adresai, OCSP užklausos, SharedWorkers ir TLS seansų bilietai."> <!ENTITY torbutton.prefs.resist_fingerprinting "Pakeisti informaciją, kuri išskiria jus iš kitų Tor Browser naudotojų"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Palikite šį langelį pažymėtą, kad paslėptumėte nuo svetainių informaciją, kuri apie jus gali būti unikali, įskaitant jūsų kompiuterio našumą, klaviatūros išdėstymą, lokalę, įdiegtų įskiepių vietą, įdiegtų įskiepių sąrašą, jūsų tinklo būseną, ekrano orientaciją, ekrano dydį, specifinių svetainių mastelio lygius, palaikomus failo tipus, sistemos spalvas ir WebGL galimybes."> <!ENTITY torbutton.prefs.sec_caption "Saugumo lygmuo"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Saugumo slankiklis leidžia jums išjungti tam tikras naršyklės ypatybes, kurios gali padaryti jūsų naršyklę labiau pažeidžiamą bandymams įsibrauti."> <!ENTITY torbutton.prefs.sec_low "Žemas (numatytasis)">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 06 Dec '17

06 Dec '17

commit d9011341acc511f9669f061b1cffcd4388c5c248 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 5 22:17:38 2017 +0000 Update translations for torbutton-torbuttonproperties --- lt/torbutton.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lt/torbutton.properties b/lt/torbutton.properties index 02434d30d..b5898d612 100644 --- a/lt/torbutton.properties +++ b/lt/torbutton.properties @@ -1,11 +1,11 @@ torbutton.circuit_display.internet = Internetas torbutton.circuit_display.ip_unknown = IP nežinomas -torbutton.circuit_display.onion_site = Onion puslapis +torbutton.circuit_display.onion_site = Onion svetainė torbutton.circuit_display.this_browser = Ši naršyklė torbutton.circuit_display.relay = retransliavimas torbutton.circuit_display.tor_bridge = Tinklų tiltas torbutton.circuit_display.unknown_country = Nežinoma šalis -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Tor naršyklė prideda šią paraštę, kad jūsų lango plotis ir aukštis būtų mažiau atskiriami ir, tokiu būdu, žmonėms būtų sumažinta galimybė sekti jus internete. torbutton.panel.tooltip.disabled = Spustelėkite, kad įjungtumėte Tor torbutton.panel.tooltip.enabled = Spustelėkite, kad išjungtumėte Tor torbutton.panel.label.disabled = Tor išjungta @@ -31,15 +31,15 @@ torbutton.popup.confirm_newnym = Tor naršyklė užvers visus langus ir korteles torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Atverti saugumo nustatymus -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Tor naršyklės išskleidimas gali leisti svetainėms nustatyti jūsų monitoriaus dydį, o tai gali būti naudojama jūsų sekimui. Rekomenduojame palikti Tor naršyklės langus jų pradiniame numatytajame dydyje. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? +canvas.siteprompt=Ši svetainė (%S) bandė išskleisti HTML5 drobės paveikslo duomenis, kas gali būti panaudota, kad jūsų kompiuteris būtų išimtinai atpažįstamas.\n\nAr Tor naršyklė turėtų leisti šiai svetainei išskleisti HTML5 drobės paveikslo duomenis? canvas.notNow=Ne dabar canvas.notNowAccessKey=N canvas.allow=Leisti ateityje canvas.allowAccessKey=A -canvas.never=Niekuomet šiam puslapiui(rekomenduojama) +canvas.never=Niekada šiai svetainei (rekomenduojama) canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation.

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 06 Dec '17

06 Dec '17

commit 2e500392978f098fba6e3fee584c3cdb83cfec0f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 5 21:47:41 2017 +0000 Update translations for torbutton-torbuttonproperties --- lt/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lt/torbutton.properties b/lt/torbutton.properties index 236f6129f..02434d30d 100644 --- a/lt/torbutton.properties +++ b/lt/torbutton.properties @@ -26,7 +26,7 @@ torbutton.popup.short_torbrowser = Svarbi Torbutton informacija!\n\nDabar, Torbu torbutton.popup.confirm_plugins = Tokie įskiepiai kaip Flash gali pažeisti jūsų privatumą ir anonimiškumą.\n\nJie taip pat gali apeiti Tor tam, kad atskleistų jūsų dabartinę buvimo vietą ir IP adresą.\n\nAr tikrai norite įjungti įskiepius?\n\n torbutton.popup.never_ask_again = Daugiau nebeklausti -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = Tor naršyklė užvers visus langus ir korteles. Visi svetainių seansai bus prarasti.\n\nPaleisti dabar Tor naršyklę iš naujo, kad būtų atstatyta jūsų tapatybė?\n\n torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Atverti saugumo nustatymus @@ -48,4 +48,4 @@ profileProblemTitle=%S profilio problema profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S neturi leidimo prieigai prie profilio. Prašome suderinti savo failų sistemos leidimus ir bandyti dar kartą. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileMigrationFailed=Jūsų esamo %S profilio perkėlimas nepavyko.\nBus naudojami nauji nustatymai.

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 06 Dec '17

06 Dec '17

commit 42854c86501e9b8e01429f8521f42945fc803129 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 5 21:16:03 2017 +0000 Update translations for tails-persistence-setup --- lt/lt.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lt/lt.po b/lt/lt.po index 369b11e8d..ddd23b676 100644 --- a/lt/lt.po +++ b/lt/lt.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-12-05 09:51+0000\n" +"PO-Revision-Date: 2017-12-05 21:09+0000\n" "Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" @@ -36,11 +36,11 @@ msgstr "GnuPG raktinės ir konfigūracija " #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" -msgstr "" +msgstr "SSH klientas" #: ../lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "SSH keys, configuration and known hosts" -msgstr "" +msgstr "SSH raktai, konfigūracija ir žinomi serveriai" #: ../lib/Tails/Persistence/Configuration/Presets.pm:78 msgid "Pidgin"

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 05 Dec '17

05 Dec '17

commit bfd33a2285b41cba7df957a6f44cf0f8b7752de0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 5 19:46:24 2017 +0000 Update translations for torbirdy_completed --- fr_CA/torbirdy.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fr_CA/torbirdy.dtd b/fr_CA/torbirdy.dtd index d773aa6c2..180291270 100644 --- a/fr_CA/torbirdy.dtd +++ b/fr_CA/torbirdy.dtd @@ -38,6 +38,10 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Ne pas mettre les ID des clés des destinataires dans les messages chiffrés [par défaut : les mettre]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Désactiver les en-têtes de courriel chiffrés [par défaut : activé]"> +<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Désactiver les en-têtes de courriel chiffrés [par défaut : activé]"> +<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> <!ENTITY torbirdy.prefs.confirmemail.label "Avant d’envoyer un courriel, confirmer si Enigmail est activé [par défaut : ne pas confirmer]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "Activer l’assistant automatique de configuration de courriel de Thunderbird [par défaut : désactivé]">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 05 Dec '17

05 Dec '17

commit 5597605ed209f5d401a000b83d50e1889dd411a0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 5 19:46:17 2017 +0000 Update translations for torbirdy --- fr_CA/torbirdy.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr_CA/torbirdy.dtd b/fr_CA/torbirdy.dtd index 2df443e84..180291270 100644 --- a/fr_CA/torbirdy.dtd +++ b/fr_CA/torbirdy.dtd @@ -38,9 +38,9 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Ne pas mettre les ID des clés des destinataires dans les messages chiffrés [par défaut : les mettre]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> -<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Désactiver les en-têtes de courriel chiffrés [par défaut : activé]"> <!ENTITY torbirdy.prefs.enigmail_protected.key "d"> -<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Désactiver les en-têtes de courriel chiffrés [par défaut : activé]"> <!ENTITY torbirdy.prefs.enigmail_protected.key "d"> <!ENTITY torbirdy.prefs.confirmemail.label "Avant d’envoyer un courriel, confirmer si Enigmail est activé [par défaut : ne pas confirmer]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0

[tor/master] Change our build process to run Cargo from inside the build tree
by nickm＠torproject.org 05 Dec '17

05 Dec '17

commit 1969d573637ee6f9c539733db8405c72f0e2e4ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 5 08:30:26 2017 -0500 Change our build process to run Cargo from inside the build tree Instead of using the cwd to specify the location of Cargo.toml, we use the --manifest-path option to specify its location explicitly. This works around the bug that isis diagnosed on our jenkins builds. --- changes/cargo-build-problem | 3 +++ src/rust/tor_rust/include.am | 12 ++++++++---- src/test/test_rust.sh | 8 ++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/changes/cargo-build-problem b/changes/cargo-build-problem new file mode 100644 index 000000000..6691b0efc --- /dev/null +++ b/changes/cargo-build-problem @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation, rust): + - Build correctly when building from outside Tor's source tree with the + TOR_RUST_DEPENDENCIES option set. Fixes bug 22768; bugfix on 0.3.1.7. diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index 79361c33c..c02324cb7 100644 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@ -5,16 +5,20 @@ EXTRA_DIST +=\ EXTRA_CARGO_OPTIONS= src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE - ( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \ + ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ CARGO_HOME="$(abs_top_builddir)/src/rust" \ - $(CARGO) build --release $(EXTRA_CARGO_OPTIONS) $(CARGO_ONLINE) ) + $(CARGO) build --release $(EXTRA_CARGO_OPTIONS) \ + $(CARGO_ONLINE) \ + --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) distclean-rust: - ( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \ + ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ CARGO_HOME="$(abs_top_builddir)/src/rust" \ - $(CARGO) clean $(EXTRA_CARGO_OPTIONS) $(CARGO_ONLINE) ) + $(CARGO) clean $(EXTRA_CARGO_OPTIONS) \ + $(CARGO_ONLINE) \ + --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) rm -rf "$(abs_top_builddir)/src/rust/registry" if USE_RUST diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 8d7900e1d..133f2bb94 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -8,8 +8,12 @@ exitcode=0 set -e for crate in $crates; do - cd "${abs_top_srcdir:-.}/src/rust/${crate}" - CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1 + cd "${abs_top_builddir:-../../..}/src/rust" + CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ + CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ + "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ + --manifest-path "${abs_top_srcdir:-.}/src/rust/${crate}/Cargo.toml" \ + || exitcode=1 cd - done

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 05 Dec '17

05 Dec '17

commit 59d9630a934883cce4e882bcd2f147c2e6580af9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 5 19:16:22 2017 +0000 Update translations for torbirdy_completed --- fr/torbirdy.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fr/torbirdy.dtd b/fr/torbirdy.dtd index fcea3c9be..8d03fee83 100644 --- a/fr/torbirdy.dtd +++ b/fr/torbirdy.dtd @@ -38,6 +38,10 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Ne pas mettre les ID des clés des destinataires dans les messages chiffrés [par défaut : les mettre]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Désactiver les en-têtes de courriel chiffrés [par défaut : activé]"> +<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Désactiver les en-têtes de courriel chiffrés [par défaut : activé]"> +<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> <!ENTITY torbirdy.prefs.confirmemail.label "Avant d’envoyer un courriel, confirmer si Enigmail est activé [par défaut : ne pas confirmer]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "Activer l’assistant automatique de configuration de courriel de Thunderbird [par défaut : désactivé]">

1 0