tor-commits November 2019

tor-commits@lists.torproject.org

20 participants
2923 discussions

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit 07351539ec0387f41c20897e82019c8692e3c8db Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 22:53:36 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 74eb439ef..73b40f9ad 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -370,6 +370,10 @@ msgid "" "[article](https://blog.torproject.org/browser-fingerprinting-introduction-" "and-challenges-ahead) on The Tor Blog all about it!" msgstr "" +"Voulez-vous en apprendre davantage sur la prise d’empreinte de navigateurs ?" +" Voici un [article](https://blog.torproject.org/browser-fingerprinting-" +"introduction-and-challenges-ahead) entier à ce sujet (en anglais) sur le " +"blogue de Tor." #: https//support.torproject.org/faq/faq-4/ #: (content/faq/faq-4/contents+en.lrquestion.title) @@ -389,6 +393,10 @@ msgid "" "easy.html.en#linux) and [macOS](https://www.torproject.org/download" "/download-easy.html.en#mac)." msgstr "" +"Le Navigateur Tor est actuellement proposé pour " +"[Windows](https://www.torproject.org/fr/download#windows), " +"[Linux](https://www.torproject.org/fr/download#linux) et " +"[macOS](https://www.torproject.org/fr/download#mac\">macOS)." #: https//support.torproject.org/faq/faq-4/ #: (content/faq/faq-4/contents+en.lrquestion.description) @@ -401,6 +409,13 @@ msgid "" "[Orbot](https://play.google.com/store/apps/details?id=org.torproject.android)" " to route other apps on your Android device over the Tor network." msgstr "" +"Il existe une version du Navigateur Tor pour " +"[Android](https://www.torproject.org/fr/download/#android) et [le Projet " +"Guardian](https://guardianproject.info) (site en anglais) offre aussi " +"l’appli " +"[Orbot](https://play.google.com/store/apps/details?id=org.torproject.android)" +" afin d’acheminer les autres applis de votre appareil Android par le réseau " +"Tor. " #: https//support.torproject.org/faq/faq-4/ #: (content/faq/faq-4/contents+en.lrquestion.description) @@ -410,6 +425,9 @@ msgid "" "There is no official version of Tor for iOS yet, though we recommend [Onion " "Browser](https://onionbrowser.com)." msgstr "" +"Il n’y a pas encore de version officielle de Tor pour iOS, bien que nous " +"recommandions le [Navigateur Onion](https://onionbrowser.com) (site en " +"anglais, appli en français)." #: https//support.torproject.org/faq/faq-5/ #: (content/faq/faq-5/contents+en.lrquestion.title) @@ -433,16 +451,19 @@ msgid "" "You can find more detailed information about Tor + VPN at [our " "wiki](https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN)." msgstr "" +"Plus de précisions sur Tor + RPV se trouvent dans notre " +"[wiki](https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN) (page " +"en anglais)." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.title) msgid "Is there a backdoor in Tor?" -msgstr "" +msgstr "Y a-t-il une porte dérobée dans Tor ?" #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) msgid "There is absolutely no backdoor in Tor." -msgstr "" +msgstr "Il n’y a absolument aucune porte dérobée dans Tor." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) @@ -450,12 +471,17 @@ msgid "" "We know some smart lawyers who say that it's unlikely that anybody will try " "to make us add one in our jurisdiction (U.S.)." msgstr "" +"Nous connaissons des avocats brillants qui disent qu’il est peu probable que" +" quelqu’un puisse essayer de nous en faire ajouter une dans notre territoire" +" (É.-U.)." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description) msgid "" "If they do ask us, we will fight them, and (the lawyers say) probably win." msgstr "" +"Si l’on nous le demandait, nous nous battrions et, d’après les avocats, nous" +" gagnerions probablement." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.description)

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit 36555a02cf461c357eb7d2fde8ea99bc2ee4ac3b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 22:53:04 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+lt.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+lt.po b/contents+lt.po index a1d889af2..c3c4a562b 100644 --- a/contents+lt.po +++ b/contents+lt.po @@ -670,7 +670,7 @@ msgstr "Paremkite šiandien ir Mozilla paaukos tiek pat, kiek ir jūs." #: templates/footer.html:18 templates/hero-home.html:13 #: templates/navbar.html:79 msgid "Download Tor Browser" -msgstr "" +msgstr "Parsisiųsti Tor Naršyklę" #: lego/templates/footer.html:10 templates/footer.html:10 msgid ""

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit 290a363b8cfe8140fcd64dd170f86406057e9bf2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 22:50:06 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+lt.po | 57 +++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/contents+lt.po b/contents+lt.po index cd221447c..2ebca2653 100644 --- a/contents+lt.po +++ b/contents+lt.po @@ -843,6 +843,8 @@ msgid "" "Each of the transports listed in Tor Launcher’s menu works in a different " "way, and their effectiveness depends on your individual circumstances." msgstr "" +"Kiekvienas transportas nurodytas Tor paleidimo meniu veikia skirtingai " +"būdais ir jų efektyvumas priklauso nuo jūsų individualios situacijos." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -850,6 +852,8 @@ msgid "" "If you are trying to circumvent a blocked connection for the first time, you" " should try the different transports: obfs4, snowflake, and meek-azure." msgstr "" +"Jeigu bandote apeiti blokuojamą ryšį pirmą kartą, išbandykite skirtingus " +"transportus: obfs4, snowflake ir meek-azure." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -857,18 +861,20 @@ msgid "" "If you try all of these options, and none of them gets you online, you will " "need to enter bridge addresses manually." msgstr "" +"Jei išbandėte visus variantus, bet interneto pasiekti vis tiek negalite, " +"turėsite tinklo tilto adresus įvesti ranka." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "" "Read the [Bridges](/en-US/bridges/) section to learn what bridges are and " "how to obtain them." -msgstr "" +msgstr "Paskaitykite [Tinklų Tiltai](/lt=LT/bridges/)" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.title) msgid "BRIDGES" -msgstr "" +msgstr "TINKLŲ TILTAI" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.description) @@ -876,6 +882,8 @@ msgid "" "Most Pluggable Transports, such as obfs4, rely on the use of “bridge” " "relays." msgstr "" +"Dauguma prijungiamųjų transportų, kaip obfs4 veikia naudodami \"tinklų " +"tiltų\" retransliacijas." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -883,6 +891,8 @@ msgid "" "Most [Pluggable Transports](/circumvention), such as obfs4, rely on the use " "of “bridge” relays." msgstr "" +"Dauguma [Prijungiamųjų transportų](/lt/circumvention), kaip obfs4 veikia " +"naudodami \"tinklų tiltų\" retransliacijas." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -891,6 +901,9 @@ msgid "" "relays, however, they are not listed publicly, so an adversary cannot " "identify them easily." msgstr "" +"Kaip ir įprasti Tor retransliavimai, tinklų tiltai veikia savanorių pagalba." +" Tačiau ne kaip įprasti retransliavimai, jie nėra skelbiami viešai, kad " +"oponentams nebūtų lengva juos identifikuoti." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -899,6 +912,9 @@ msgid "" " fact that you are using Tor, but may slow down the connection compared to " "using ordinary Tor relays." msgstr "" +"Naudojant tinklų tiltus kartu su prijungiamaisiais transportais gali padėti " +"paslėpti jūsų naudojimą Tor, bet tai gali sulėtinti ryšį labiau, nei tiesiog" +" naudojantis Tor retransliavimais." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -907,11 +923,14 @@ msgid "" "techniques that do not rely on bridges. You do not need to obtain bridge " "addresses in order to use these transports." msgstr "" +"Kiti prijungiamieji transportai, kaip meek naudoja kitokias anti cenzūros " +"technikas, kurioms nereikia tinklų tiltų. Jums nereikia gauti tinklų tiltų " +"adresų, kad naudotumėtės šiais transportais." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "### GETTING BRIDGE ADDRESSES" -msgstr "" +msgstr "### TINKLO TILTŲ ADRESŲ GAVIMAS" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -919,17 +938,21 @@ msgid "" "Because bridge addresses are not public, you will need to request them " "yourself. You have a few options:" msgstr "" +"Kadangi tinklų tiltų adresai nėra vieši, jų turėsite paprašyti patys. Yra " +"keletas pasirinkimų:" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "" "* Visit https://bridges.torproject.org/ and follow the instructions, or" msgstr "" +"* Aplankyti https://bridges.torproject.org/ ir sekti instrukcijas, arba" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "* Email bridges(a)torproject.org from a Gmail, or Riseup email address" msgstr "" +"* Parašyti laišką į bridges(a)torproject.org iš Gmail arba Riseup pašto adresų" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -939,7 +962,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "### USING MOAT" -msgstr "" +msgstr "### MOAT NAUDOJIMAS" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -976,7 +999,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "### ENTERING BRIDGE ADDRESSES" -msgstr "" +msgstr "### TINKLŲ TILTŲ ADRESŲ ĮVEDIMAS" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -984,6 +1007,8 @@ msgid "" "<img class=\"col-md-6\" align=\"right\" hspace=\"5\" " "src=\"../../static/images/tor-launcher-custom-bridges.png\">" msgstr "" +"<img class=\"col-md-6\" align=\"right\" hspace=\"5\" " +"src=\"../../static/images/tor-launcher-custom-bridges.png\">" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1018,7 +1043,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.title) msgid "MANAGING IDENTITIES" -msgstr "" +msgstr "TAPATYBIŲ TVARKYMAS" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.description) @@ -1048,7 +1073,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### THE URL BAR" -msgstr "" +msgstr "### URL JUOSTA" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1100,7 +1125,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### LOGGING IN OVER TOR" -msgstr "" +msgstr "### PRISIJUNGIMAS PER TOR" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1149,7 +1174,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### CHANGING IDENTITIES AND CIRCUITS" -msgstr "" +msgstr "### TAPATYBIŲ IR GRANDINIŲ KEITIMAS" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1189,7 +1214,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### NEW TOR CIRCUIT FOR THIS SITE" -msgstr "" +msgstr "### NAUJA TOR GRANDINĖ ŠIAI SVEITAINEI" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1213,7 +1238,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.title) msgid "ONION SERVICES" -msgstr "" +msgstr "ONION SERVISAI" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.description) @@ -1261,7 +1286,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### HOW TO ACCESS AN ONION SERVICE" -msgstr "" +msgstr "### KAIP PASIEKTI ONION SERVISĄ" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1312,7 +1337,7 @@ msgstr "" #: https//tb-manual.torproject.org/secure-connections/ #: (content/secure-connections/contents+en.lrtopic.title) msgid "SECURE CONNECTIONS" -msgstr "" +msgstr "SAUGŪS SUJUNGIMAI" #: https//tb-manual.torproject.org/secure-connections/ #: (content/secure-connections/contents+en.lrtopic.description) @@ -1373,7 +1398,7 @@ msgstr "" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "### ACCESSING THE SECURITY SETTINGS" -msgstr "" +msgstr "### PRIEIGA PRIE SAUGUMO NUSTATYMŲ" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1968,7 +1993,7 @@ msgstr "" #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.title) msgid "MAKE TOR BROWSER PORTABLE" -msgstr "" +msgstr "PADARYKITE TOR NARŠYKLĘ NEŠIOJAMA" #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.description) @@ -2087,7 +2112,7 @@ msgstr "Paremkite šiandien ir Mozilla paaukos tiek pat, kiek ir jūs." #: lego/templates/navbar.html:74 templates/footer.html:9 #: templates/footer.html:18 templates/navbar.html:74 msgid "Download Tor Browser" -msgstr "" +msgstr "Parsisiųsti Tor Naršyklę" #: lego/templates/footer.html:10 templates/footer.html:10 msgid ""

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit 805dbd99d92cf689b20119d8d8fe4e46b1b54c7a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 22:23:33 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 79 +++++++++++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 34 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index d6ccf3d65..74eb439ef 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -229,8 +229,8 @@ msgid "" "Should I install a new add-on or extension in Tor Browser, like AdBlock Plus" " or uBlock Origin?" msgstr "" -"Devrais-je installer une nouvelle extension dans le Navigateur Tor, comme " -"AdBlock Plus ou uBlock Origin ?" +"Devrais-je installer un nouveau module complémentaire ou une nouvelle " +"extension dans le Navigateur Tor, comme AdBlock Plus ou uBlock Origin ?" #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -240,9 +240,9 @@ msgid "" "It's strongly discouraged to install new add-ons in Tor Browser, because " "they can compromise your privacy and security." msgstr "" -"Il est fortement déconseillé d’installer de nouvelles extensions dans le " -"Navigateur Tor, car elles peuvent compromettre la confidentialité de vos " -"données et votre sécurité." +"Il est fortement déconseillé d’installer de nouveaux modules complémentaires" +" dans le Navigateur Tor, car ils peuvent compromettre la protection de vos " +"données personnelles et votre sécurité." #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -252,8 +252,8 @@ msgid "" "Installing new add-ons may affect Tor Browser in unforeseen ways and " "potentially make your Tor Browser fingerprint unique." msgstr "" -"L’installation de nouvelles extensions pourrait affecter le Navigateur Tor " -"de façon imprévue et potentiellement rendre l’empreinte de votre Navigateur " +"L’installation de nouveaux modules complémentaires pourrait affecter le " +"Navigateur Tor de façon imprévue et rendre l’empreinte de votre Navigateur " "Tor unique." #: https//support.torproject.org/faq/faq-3/ @@ -323,6 +323,8 @@ msgid "" "There's also a good chance a new add-on will increase the attack surface of " "Tor Browser." msgstr "" +"Il est aussi fort possible qu’un nouveau module complémentaire augmente la " +"surface d’attaque du Navigateur Tor." #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -332,6 +334,8 @@ msgid "" "This may allow sensitive data to be leaked or allow an attacker to infect " "Tor Browser." msgstr "" +"Cela pourrait permettre une fuite de données délicates et à un assaillant " +"d’infecter le Navigateur Tor." #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -339,6 +343,8 @@ msgstr "" #: (content/tbb/tbb-14/contents+en.lrquestion.description) msgid "The add-on itself could even be maliciously designed to spy on you." msgstr "" +"Le module complémentaire même pourrait être conçu de façon malveillante pour" +" vous espionner." #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -350,6 +356,10 @@ msgid "" "[NoScript](https://noscript.net) — and adding anything else could " "deanonymize you." msgstr "" +"Le Navigateur Tor comprend déjà deux extensions préinstallées [HTTPS " +"partout](https://www.eff.org/https-everywhere) et " +"[NoScript](https://noscript.net) (sites en anglais), et ajouter quoi que ce " +"soit d’autre pourrait vous faire perdre votre anonymat." #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -6063,7 +6073,7 @@ msgstr "## A" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### add-on, extension, or plugin" -msgstr "### greffon, extension ou addiciel" +msgstr "### module complémentaire, extension ou greffon" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6071,9 +6081,9 @@ msgid "" "Add-ons, extensions, and plugins are components that can be added to [web " "browsers](#web-browser) to give them new features." msgstr "" -"Les extensions, greffons et addiciels sont des composants qui peuvent être " -"ajoutés à des [navigateurs Web](#Web-browser) pour leur donner de nouvelles " -"fonctions." +"Les modules complémentaires, extensions et greffons sont des composants qui " +"peuvent être ajoutés à des [navigateurs Web](#Web-browser) pour leur donner " +"de nouvelles fonctions." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6081,7 +6091,7 @@ msgid "" "Tor Browser comes with two add-ons installed: [NoScript](#noscript) and " "[HTTPS Everywhere](#https-everywhere)." msgstr "" -"Deux extensions sont installées dans le Navigateur Tor : " +"Deux modules complémentaires sont installés dans le Navigateur Tor : " "[NoScript](#noscript) et [HTTPS partout](#https-everywhere)." #: https//support.torproject.org/misc/glossary/ @@ -6090,9 +6100,9 @@ msgid "" "You should not install any additional add-ons to Tor Browser because that " "can compromise some of its privacy features." msgstr "" -"Vous ne devriez pas installer d’extensions supplémentaires dans le " -"Navigateur Tor, car cela pourrait compromettre certaines de ses fonctions de" -" confidentialité et de protection des données personnelles." +"Vous ne devriez pas installer de modules complémentaires supplémentaires " +"dans le Navigateur Tor, car cela pourrait compromettre certaines de ses " +"fonctions de confidentialité et de protection des données personnelles." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6802,10 +6812,10 @@ msgid "" "](#add-on-extension-or-plugin) that makes [HTTPS](#https) the default on " "websites that have set up HTTPS but have not made it the default." msgstr "" -"HTTPS partout est une [extension](#add-on-extension-or-plugin) pour " -"[Firefox](#firefox), Chrome et Opera. Elle fait en sorte que [HTTPS](#https)" -" est utilisé par défaut pour les sites Web compatibles HTTPS sur lesquels le" -" protocole n’est pas activé par défaut." +"HTTPS partout est une [extension](#module-complémentaire-extension-ou-" +"greffon) pour [Firefox](#firefox), Chrome et Opera. Elle fait en sorte que " +"[HTTPS](#https) est utilisé par défaut pour les sites Web compatibles HTTPS " +"sur lesquels le protocole n’est pas activé par défaut." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6902,9 +6912,9 @@ msgid "" "Browser](#tor-browser) can be used to manage JavaScript on different " "websites." msgstr "" -"Dans le [Navigateur Tor](#tor-browser), l’[extension](#add-on-extension-or-" -"plugin) [NoScript](#noscript) peut être utilisée pour gérer JavaScript sur " -"différents sites Web." +"Dans le [Navigateur Tor](#tor-browser), l’[extension](#module-" +"complémentaire-extension-ou-greffon) [NoScript](#noscript) peut être " +"utilisée pour gérer JavaScript sur différents sites Web." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7084,11 +7094,11 @@ msgid "" "the window, which allows you to control the [JavaScript](#javascript)that " "runs on individual web pages, or to block it entirely." msgstr "" -"Le [Navigateur Tor](#tor-browser) comprend une [extension](#add-on-" -"extension-or-or-plugin) appelée NoScript, à laquelle l’on peut accéder par " -"l’icône « S » située en haut à gauche de la fenêtre. Elle vous permet de " -"contrôler le [JavaScript](#javascript) qui s’exécute sur les différentes " -"pages Web, ou de le bloquer entièrement." +"Le [Navigateur Tor](#tor-browser) comprend un [module complémentaire" +"](#module-complémentaire-extension-ou-greffon) appelé NoScript, auquel on " +"peut accéder par l’icône « S » située en haut à gauche de la fenêtre. Il " +"vous permet de contrôler le [JavaScript](#javascript) qui s’exécute sur les " +"différentes pages Web ou de le bloquer entièrement." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7530,11 +7540,11 @@ msgid "" "including [Tor Browser](#tor-browser), from different sources. You can " "Install Satori from the Chrome Web Store." msgstr "" -"C’est une [extension](#add-on-extension-or-or-plugin) pour les navigateurs " -"Chrome ou Chromium, qui vous permet de télécharger plusieurs programmes de " -"sécurité et de confidentialité, dont le [Navigateur Tor](#tor-browser), de " -"différentes sources. Vous pouvez installer Satori de la logithèque « Chrome " -"Web Store »." +"C’est une [extension](#module-complémentaire-extension-ou-greffon) pour les " +"navigateurs Chrome ou Chromium, qui vous permet de télécharger plusieurs " +"programmes de sécurité et de confidentialité, dont le [Navigateur Tor](#tor-" +"browser), de différentes sources. Vous pouvez installer Satori de la " +"logithèque « Chrome Web Store »." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7980,8 +7990,9 @@ msgid "" "This [extension](#add-on-extension-or-plugin) configures Thunderbird to make" " connections over [Tor](#tor-/-tor-network/-core-tor)." msgstr "" -"Cette [extension](#add-on-extension-or-or-plugin) configure Thunderbird pour" -" établir des connexions par [Tor](#tor-/-tor-network/-core-tor)." +"Cette [extension](#module-complémentaire-extension-ou-greffon) configure " +"Thunderbird pour établir des connexions par [Tor](#tor-/-tor-network/-core-" +"tor)." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[stem/master] More flexible IntroductionPointV3 construction
by atagar＠torproject.org 22 Nov '19

22 Nov '19

commit eea41c17ed53ab44552f6b2c3fc574bc3710fb82 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 22 14:18:07 2019 -0800 More flexible IntroductionPointV3 construction Renaming our IntroductionPointV3's create() method to create_from_address, and adding create_for_link_specifiers(). If other constructors are useful we can add using a similar convention. --- stem/descriptor/hidden_service.py | 28 +++++++++++++++++++++++++--- test/unit/descriptor/hidden_service_v3.py | 18 +++++++++--------- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index 983fb94b..13fae6ba 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -207,10 +207,9 @@ class IntroductionPointV3(collections.namedtuple('IntroductionPointV3', ['link_s return IntroductionPointV3(link_specifiers, onion_key, auth_key_cert, enc_key, enc_key_cert, legacy_key, legacy_key_cert) @staticmethod - def create(address, port, expiration = None, onion_key = None, enc_key = None, auth_key = None, signing_key = None): + def create_for_address(address, port, expiration = None, onion_key = None, enc_key = None, auth_key = None, signing_key = None): """ - Simplified constructor. For more sophisticated use cases you can use this - as a template for how introduction points are properly created. + Simplified constructor for a single address/port link specifier. :param str address: IPv4 or IPv6 address where the service is reachable :param int port: port where the service is reachable @@ -237,6 +236,29 @@ class IntroductionPointV3(collections.namedtuple('IntroductionPointV3', ['link_s else: raise ValueError("'%s' is not a valid IPv4 or IPv6 address" % address) + return IntroductionPointV3.create_for_link_specifiers(link_specifiers, expiration = None, onion_key = None, enc_key = None, auth_key = None, signing_key = None) + + @staticmethod + def create_for_link_specifiers(link_specifiers, expiration = None, onion_key = None, enc_key = None, auth_key = None, signing_key = None): + """ + Simplified constructor. For more sophisticated use cases you can use this + as a template for how introduction points are properly created. + + :param list link_specifiers: series of stem.client.datatype.LinkSpecifier where the service is reachable + :param datetime.datetime expiration: when certificates should expire + :param str onion_key: encoded, X25519PublicKey, or X25519PrivateKey onion key + :param str enc_key: encoded, X25519PublicKey, or X25519PrivateKey encryption key + :param str auth_key: encoded, Ed25519PublicKey, or Ed25519PrivateKey authentication key + :param cryptography.hazmat.primitives.asymmetric.ed25519.Ed25519PrivateKey signing_key: service signing key + + :returns: :class:`~stem.descriptor.hidden_service.IntroductionPointV3` with these attributes + + :raises: **ValueError** if the address, port, or keys are malformed + """ + + if not stem.prereq.is_crypto_available(ed25519 = True): + raise ImportError('Introduction point creation requires the cryptography module ed25519 support') + from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey diff --git a/test/unit/descriptor/hidden_service_v3.py b/test/unit/descriptor/hidden_service_v3.py index cb1e9c68..180493c1 100644 --- a/test/unit/descriptor/hidden_service_v3.py +++ b/test/unit/descriptor/hidden_service_v3.py @@ -300,7 +300,7 @@ class TestHiddenServiceDescriptorV3(unittest.TestCase): Create an introduction point, encode it, then re-parse. """ - intro_point = IntroductionPointV3.create('1.1.1.1', 9001) + intro_point = IntroductionPointV3.create_for_address('1.1.1.1', 9001) self.assertEqual(1, len(intro_point.link_specifiers)) self.assertEqual(stem.client.datatype.LinkByIPv4, type(intro_point.link_specifiers[0])) @@ -341,16 +341,16 @@ class TestHiddenServiceDescriptorV3(unittest.TestCase): # include introduction points desc = InnerLayer.create(introduction_points = [ - IntroductionPointV3.create('1.1.1.1', 9001), - IntroductionPointV3.create('2.2.2.2', 9001), - IntroductionPointV3.create('3.3.3.3', 9001), + IntroductionPointV3.create_for_address('1.1.1.1', 9001), + IntroductionPointV3.create_for_address('2.2.2.2', 9001), + IntroductionPointV3.create_for_address('3.3.3.3', 9001), ]) self.assertEqual(3, len(desc.introduction_points)) self.assertEqual('1.1.1.1', desc.introduction_points[0].link_specifiers[0].address) self.assertTrue(InnerLayer.content(introduction_points = [ - IntroductionPointV3.create('1.1.1.1', 9001), + IntroductionPointV3.create_for_address('1.1.1.1', 9001), ]).startswith(b'create2-formats 2\nintroduction-point AQAGAQEBASMp')) @test.require.ed25519_support @@ -398,7 +398,7 @@ class TestHiddenServiceDescriptorV3(unittest.TestCase): outer_layer = OuterLayer.create( inner_layer = InnerLayer.create( introduction_points = [ - IntroductionPointV3.create('1.1.1.1', 9001), + IntroductionPointV3.create_for_address('1.1.1.1', 9001), ] ), revision_counter = revision_counter, @@ -450,9 +450,9 @@ class TestHiddenServiceDescriptorV3(unittest.TestCase): desc = HiddenServiceDescriptorV3.create( identity_key = identity_key, inner_layer = InnerLayer.create(introduction_points = [ - IntroductionPointV3.create('1.1.1.1', 9001), - IntroductionPointV3.create('2.2.2.2', 9001), - IntroductionPointV3.create('3.3.3.3', 9001), + IntroductionPointV3.create_for_address('1.1.1.1', 9001), + IntroductionPointV3.create_for_address('2.2.2.2', 9001), + IntroductionPointV3.create_for_address('3.3.3.3', 9001), ]), )

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit 88fecfe5686467fd121f5b16bdbcbca7c8782034 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 22:20:05 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+fr.po | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 1ce0a53ba..7a5fff775 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -231,7 +231,7 @@ msgstr "" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) msgid "### HOW TOR WORKS" -msgstr "" +msgstr "### LE FONCTIONNEMENT DE TOR" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -1313,7 +1313,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### HOW TO ACCESS AN ONION SERVICE" -msgstr "" +msgstr "### COMMENT ACCÉDER À UN SERVICE ONION" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1597,7 +1597,7 @@ msgstr "LA MISE À JOUR" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.description) msgid "How to update Tor Browser" -msgstr "Mettre à jour le Navigateur Tor" +msgstr "Mettre le Navigateur Tor à jour" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1810,8 +1810,8 @@ msgstr "LES GREFFONS, LES MODULES COMPLÉMENTAIRES ET JAVASCRIPT" #: (content/plugins/contents+en.lrtopic.description) msgid "How Tor Browser handles add-ons, plugins and JavaScript" msgstr "" -"Comment le Navigateur Tor gère-t-il les extensions, les greffons et " -"JavaScript ?" +"La gestion des modules complémentaires, des greffons et de JavaScript par le" +" Navigateur Tor " #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1906,8 +1906,9 @@ msgid "" "Tor Browser is based on Firefox, and any browser add-ons or themes that are " "compatible with Firefox can also be installed in Tor Browser." msgstr "" -"Le Navigateur Tor est fondé sur Firefox et tout extension ou thème " -"compatible avec Firefox peut aussi être installé dans le Navigateur Tor." +"Le Navigateur Tor est fondé sur Firefox et tout module complémentaire ou " +"thème compatible avec Firefox peut aussi être installé dans le Navigateur " +"Tor." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1918,13 +1919,13 @@ msgid "" " privacy and security. It is strongly discouraged to install additional add-" "ons, and the Tor Project will not offer support for these configurations." msgstr "" -"Cependant, les seules extensions qui ont été testées pour être utilisées " -"avec le Navigateur Tor sont celles incluses par défaut. L’installation de " -"toute autre extension pourrait briser la fonctionnalité du Navigateur Tor ou" -" poser des problèmes plus graves qui affectent la protection de vos données " -"personnelles et la sécurité. Il est fortement déconseillé d’installer " -"d’autres extensions, et le Projet Tor n’offrira aucun soutien pour les " -"configurations qui en utilisent." +"Cependant, les modules complémentaires qui ont été testés pour être utilisés" +" avec le Navigateur Tor sont ceux inclus par défaut. L’installation de tout " +"autre module complémentaire pourrait briser la fonctionnalité du Navigateur " +"Tor ou poser des problèmes plus graves qui affectent la protection de vos " +"données personnelles et la sécurité. Il est fortement déconseillé " +"d’installer d’autres modules complémentaires et le Projet Tor n’offrira " +"aucun soutien pour les configurations qui en utilisent." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.title) @@ -2186,7 +2187,7 @@ msgstr "" #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.description) msgid "How to install Tor Browser onto removable media" -msgstr "" +msgstr "Installer le Navigateur Tor sur un support amovible" #: https//tb-manual.torproject.org/make-tor-portable/ #: (content/make-tor-portable/contents+en.lrtopic.body)

1 0

[stem/master] Include sixteen auth-client lines by default
by atagar＠torproject.org 22 Nov '19

22 Nov '19

commit f5c8c96cdd2cdc967d44ff017b68ea58ce77ca36 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 22 14:03:14 2019 -0800 Include sixteen auth-client lines by default auth-client are a required field... https://trac.torproject.org/projects/tor/ticket/32563 https://trac.torproject.org/projects/tor/ticket/31823#comment:16 Tor creates sixteen by default, so doing the same unless our caller specifies otherwise. % cat demo.py from stem.descriptor.hidden_service import OuterLayer print(OuterLayer.create()) % python demo.py desc-auth-type x25519 desc-auth-ephemeral-key fhUEgYTR3j4/8MC8aH75WTIKWFOzvKiXURvPHdIXTH4= auth-client 1J4LPB+umNA iOGHkI+vpsWJaugbv6akgg EtisFxHd3buXMcl30uxJ8A auth-client wbmXMy71u+Q aiFlaQQV3hBPrmOaQ8kXDg HP+ZFqEt0z47F5AVBnyzxA auth-client ahHWCcU8INM kQrwT8jZOXAdxiyeVZ/EWw tIBpoOqhvoGhFCOceSLZXA auth-client UrnUpDYoCTs 6VC/C7xcIWd4Dtmrj1nKig 1k2hfoPhGPwX4BORgHeDPw auth-client 5I03RmlXJps rgdrWYmq02EmMF+v7PMoLw lkxQtmEz3+CVniXM0E16vQ auth-client ub0ap7cdghQ gGjmEJTYcw6RGwri2DlPaQ Wz+vnYEc2PmeFxM85lNCcg auth-client TLgL1NsDjIU bKuIgs/blO3mL80mC13JDw 8sjbuwv3o9sQTt0yQbhIxw auth-client aytYGQGGAkE lqg3uBRYIX9DHjWl8aLmxQ Nsb6dvhnykFJtSyeGekUhw auth-client htPYuHAyOsA Wim8CZKo3o2toq+dqeGgMg m6vIoCpQWT0JRR+JgcHIqw auth-client oJJr9IpqKpc gwd5SFc0CWtRMAaZaqWQrQ iA8qoyKVXWs2N6DA9WzqiQ auth-client EEIi97LqhGA K+Vn6P2dfRgFZXHhgBvX9A 9bXjd6UBUXuBY3/aeNCR5w auth-client 1JCG9WKhPKY CgMjZquv+KPLzpqn72uMKQ kC6e5GM/1+2TIvq8kb47Lw auth-client 6MuN+1vob4w Wi1ktyiaiOaG6PaLbneydQ OEigSskYEZb8hGqWZMDKlg auth-client uOoXx8epem4 /VjgpZzC71Gj6WAXuVXzVw Q4dOW6GYc/JoQrKNLUQmbQ auth-client aC9d6RbIr1M FCY56VPOLEktEsQiCDrORQ 0fAhfjriUxnFvbjiTfGDrw auth-client 60vj3crxSwg XSytZMniMFUCDYbhyrdhDg 3P5Q5QaI70AvX/d8Wh7Etw encrypted -----BEGIN MESSAGE----- EqEXDglNZxN+TmE6I7U7fd9DM0ue9ys770n6AnH4ga+fLSJ8AOb0lX4XANG9TuFh 6hyOfGa0joPezoQSeAFf+yk= -----END MESSAGE----- --- stem/descriptor/hidden_service.py | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index e75c7a6e..983fb94b 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -1183,9 +1183,13 @@ class OuterLayer(Descriptor): return _encrypt_layer(content, b'hsdir-superencrypted-data', revision_counter, subcredential, blinded_key) @classmethod - def content(cls, attr = None, exclude = (), validate = True, sign = False, inner_layer = None, revision_counter = None, subcredential = None, blinded_key = None): + def content(cls, attr = None, exclude = (), validate = True, sign = False, inner_layer = None, revision_counter = None, authorized_clients = None, subcredential = None, blinded_key = None): if not stem.prereq.is_crypto_available(ed25519 = True): raise ImportError('Hidden service layer creation requires cryptography version 2.6') + elif not stem.prereq._is_sha3_available(): + raise ImportError('Hidden service layer creation requires python 3.6+ or the pysha3 module (https://pypi.org/project/pysha3/)') + elif authorized_clients and 'auth-client' in attr: + raise ValueError('Authorized clients cannot be specified through both attr and authorized_clients') from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey @@ -1195,16 +1199,31 @@ class OuterLayer(Descriptor): blinded_key = blinded_key if blinded_key else stem.util._pubkey_bytes(Ed25519PrivateKey.generate()) subcredential = subcredential if subcredential else HiddenServiceDescriptorV3._subcredential(Ed25519PrivateKey.generate(), blinded_key) - return _descriptor_content(attr, exclude, ( + if not authorized_clients: + authorized_clients = [] + + if attr and 'auth-client' in attr: + pass # caller is providing raw auth-client lines through the attr + else: + for i in range(16): + client_id = base64.b64encode(os.urandom(8)).rstrip(b'=') + iv = base64.b64encode(os.urandom(16)).rstrip(b'=') + cookie = base64.b64encode(os.urandom(16)).rstrip(b'=') + + authorized_clients.append(AuthorizedClient(client_id, iv, cookie)) + + return _descriptor_content(attr, exclude, [ ('desc-auth-type', 'x25519'), ('desc-auth-ephemeral-key', base64.b64encode(stem.util._pubkey_bytes(X25519PrivateKey.generate()))), - ), ( + ] + [ + ('auth-client', '%s %s %s' % (c.id, c.iv, c.cookie)) for c in authorized_clients + ], ( ('encrypted', b'\n' + inner_layer._encrypt(revision_counter, subcredential, blinded_key)), )) @classmethod - def create(cls, attr = None, exclude = (), validate = True, sign = False, inner_layer = None, revision_counter = None, subcredential = None, blinded_key = None): - return cls(cls.content(attr, exclude, validate, sign, inner_layer, revision_counter, subcredential, blinded_key), validate = validate) + def create(cls, attr = None, exclude = (), validate = True, sign = False, inner_layer = None, revision_counter = None, authorized_clients = None, subcredential = None, blinded_key = None): + return cls(cls.content(attr, exclude, validate, sign, inner_layer, revision_counter, authorized_clients, subcredential, blinded_key), validate = validate) def __init__(self, content, validate = False): content = stem.util.str_tools._to_bytes(content).rstrip(b'\x00') # strip null byte padding

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 22 Nov '19

22 Nov '19

commit 629672f052e746acad422ce8a254cdf7fae6cdfd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 22 21:50:19 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-BR.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 0533586cf..fecb11efe 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -954,6 +954,8 @@ msgstr "" msgid "" "In the Tor Network Settings window, select 'Tor is censored in my country.'" msgstr "" +"Na janela de configurações de rede Tor, selecione 'Tor é censurado no meu " +"país'" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -965,7 +967,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "Complete the CAPTCHA and click 'Submit'." -msgstr "" +msgstr "Complete o CAPTCHA e clique em 'Submeter'." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1058,7 +1060,7 @@ msgstr "" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) msgid "### THE URL BAR" -msgstr "" +msgstr "### A barra de endereço" #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body)

1 0

[stem/master] Generate desc-auth-ephemeral-key from a key
by atagar＠torproject.org 22 Nov '19

22 Nov '19

commit 2526db23a86022796d7d635e1081f2bcd976376b Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 22 13:40:45 2019 -0800 Generate desc-auth-ephemeral-key from a key Great catch from asn on #31823 that we should generate desc-auth-ephemeral-key fields from a key rather than random bytes. Otherwise this can be used as a fingerprint to differentiate our descriptors from tor's. --- stem/descriptor/hidden_service.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index ea1ae739..e75c7a6e 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -1188,6 +1188,7 @@ class OuterLayer(Descriptor): raise ImportError('Hidden service layer creation requires cryptography version 2.6') from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey + from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey inner_layer = inner_layer if inner_layer else InnerLayer.create() revision_counter = revision_counter if revision_counter else 1 @@ -1196,7 +1197,7 @@ class OuterLayer(Descriptor): return _descriptor_content(attr, exclude, ( ('desc-auth-type', 'x25519'), - ('desc-auth-ephemeral-key', base64.b64encode(os.urandom(32))), + ('desc-auth-ephemeral-key', base64.b64encode(stem.util._pubkey_bytes(X25519PrivateKey.generate()))), ), ( ('encrypted', b'\n' + inner_layer._encrypt(revision_counter, subcredential, blinded_key)), ))

1 0

[stem/master] Faster ed25519 blinding
by atagar＠torproject.org 22 Nov '19

22 Nov '19

commit a1d5d9726e3653f58035c76420582059b0c86d13 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 22 13:22:50 2019 -0800 Faster ed25519 blinding Thanks to Paul ed25519 blinding is now fully two orders of magnitude faster! https://github.com/pyca/cryptography/issues/5068 Replaced slow_ed25519.py with an optimized implementation from... https://github.com/pyca/ed25519/ This changes the runtime of test_blinding as follows: Python 2.7: 2.25s => 20 ms Python 3.5: 1.83s => 19 ms --- stem/descriptor/hidden_service.py | 44 ++--- stem/util/ed25519.py | 311 ++++++++++++++++++++++++++++++ stem/util/slow_ed25519.py | 171 ---------------- stem/util/test_tools.py | 11 ++ test/settings.cfg | 4 +- test/unit/descriptor/hidden_service_v3.py | 4 +- 6 files changed, 347 insertions(+), 198 deletions(-) diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py index 94edeba4..ea1ae739 100644 --- a/stem/descriptor/hidden_service.py +++ b/stem/descriptor/hidden_service.py @@ -51,7 +51,6 @@ import stem.util.tor_tools from stem.client.datatype import CertType from stem.descriptor.certificate import ExtensionType, Ed25519Extension, Ed25519Certificate, Ed25519CertificateV1 -from stem.util import slow_ed25519 from stem.descriptor import ( PGP_BLOCK_END, @@ -917,10 +916,8 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor): Construction through this method can supply any or none of these, with omitted parameters populated with randomized defaults. - `Ed25519 key blinding takes several seconds - <https://github.com/pyca/cryptography/issues/5068>`_, and as such is - disabled if a **blinding_nonce** is not provided. To blind with a random - nonce simply call... + Ed25519 key blinding adds an additional ~20 ms, and as such is disabled by + default. To blind with a random nonce simply call... :: @@ -1302,13 +1299,16 @@ class InnerLayer(Descriptor): def _blinded_pubkey(identity_key, blinding_nonce): - mult = 2 ** (slow_ed25519.b - 2) + sum(2 ** i * slow_ed25519.bit(blinding_nonce, i) for i in range(3, slow_ed25519.b - 2)) - P = slow_ed25519.decodepoint(stem.util._pubkey_bytes(identity_key)) - return slow_ed25519.encodepoint(slow_ed25519.scalarmult(P, mult)) + from stem.util import ed25519 + + mult = 2 ** (ed25519.b - 2) + sum(2 ** i * ed25519.bit(blinding_nonce, i) for i in range(3, ed25519.b - 2)) + P = ed25519.decodepoint(stem.util._pubkey_bytes(identity_key)) + return ed25519.encodepoint(ed25519.scalarmult(P, mult)) def _blinded_sign(msg, identity_key, blinded_key, blinding_nonce): from cryptography.hazmat.primitives import serialization + from stem.util import ed25519 identity_key_bytes = identity_key.private_bytes( encoding = serialization.Encoding.Raw, @@ -1318,28 +1318,28 @@ def _blinded_sign(msg, identity_key, blinded_key, blinding_nonce): # pad private identity key into an ESK (encrypted secret key) - h = slow_ed25519.H(identity_key_bytes) - a = 2 ** (slow_ed25519.b - 2) + sum(2 ** i * slow_ed25519.bit(h, i) for i in range(3, slow_ed25519.b - 2)) - k = b''.join([h[i:i + 1] for i in range(slow_ed25519.b // 8, slow_ed25519.b // 4)]) - esk = slow_ed25519.encodeint(a) + k + h = ed25519.H(identity_key_bytes) + a = 2 ** (ed25519.b - 2) + sum(2 ** i * ed25519.bit(h, i) for i in range(3, ed25519.b - 2)) + k = b''.join([h[i:i + 1] for i in range(ed25519.b // 8, ed25519.b // 4)]) + esk = ed25519.encodeint(a) + k # blind the ESK with this nonce - mult = 2 ** (slow_ed25519.b - 2) + sum(2 ** i * slow_ed25519.bit(blinding_nonce, i) for i in range(3, slow_ed25519.b - 2)) - s = slow_ed25519.decodeint(esk[:32]) - s_prime = (s * mult) % slow_ed25519.l + mult = 2 ** (ed25519.b - 2) + sum(2 ** i * ed25519.bit(blinding_nonce, i) for i in range(3, ed25519.b - 2)) + s = ed25519.decodeint(esk[:32]) + s_prime = (s * mult) % ed25519.l k = esk[32:] - k_prime = slow_ed25519.H(b'Derive temporary signing key hash input' + k)[:32] - blinded_esk = slow_ed25519.encodeint(s_prime) + k_prime + k_prime = ed25519.H(b'Derive temporary signing key hash input' + k)[:32] + blinded_esk = ed25519.encodeint(s_prime) + k_prime # finally, sign the message - a = slow_ed25519.decodeint(blinded_esk[:32]) - r = slow_ed25519.Hint(b''.join([blinded_esk[i:i + 1] for i in range(slow_ed25519.b // 8, slow_ed25519.b // 4)]) + msg) - R = slow_ed25519.scalarmult(slow_ed25519.B, r) - S = (r + slow_ed25519.Hint(slow_ed25519.encodepoint(R) + blinded_key + msg) * a) % slow_ed25519.l + a = ed25519.decodeint(blinded_esk[:32]) + r = ed25519.Hint(b''.join([blinded_esk[i:i + 1] for i in range(ed25519.b // 8, ed25519.b // 4)]) + msg) + R = ed25519.scalarmult(ed25519.B, r) + S = (r + ed25519.Hint(ed25519.encodepoint(R) + blinded_key + msg) * a) % ed25519.l - return slow_ed25519.encodepoint(R) + slow_ed25519.encodeint(S) + return ed25519.encodepoint(R) + ed25519.encodeint(S) # TODO: drop this alias in stem 2.x diff --git a/stem/util/ed25519.py b/stem/util/ed25519.py new file mode 100644 index 00000000..67b2db3c --- /dev/null +++ b/stem/util/ed25519.py @@ -0,0 +1,311 @@ +# The following is copied from... +# +# https://github.com/pyca/ed25519 +# +# This is under the CC0 license. For more information please see... +# +# https://github.com/pyca/cryptography/issues/5068 + + +# ed25519.py - Optimized version of the reference implementation of Ed25519 +# +# Written in 2011? by Daniel J. Bernstein <djb(a)cr.yp.to> +# 2013 by Donald Stufft <donald(a)stufft.io> +# 2013 by Alex Gaynor <alex.gaynor(a)gmail.com> +# 2013 by Greg Price <price(a)mit.edu> +# +# To the extent possible under law, the author(s) have dedicated all copyright +# and related and neighboring rights to this software to the public domain +# worldwide. This software is distributed without any warranty. +# +# You should have received a copy of the CC0 Public Domain Dedication along +# with this software. If not, see +# <http://creativecommons.org/publicdomain/zero/1.0/>. + +""" +NB: This code is not safe for use with secret keys or secret data. +The only safe use of this code is for verifying signatures on public messages. + +Functions for computing the public key of a secret key and for signing +a message are included, namely publickey_unsafe and signature_unsafe, +for testing purposes only. + +The root of the problem is that Python's long-integer arithmetic is +not designed for use in cryptography. Specifically, it may take more +or less time to execute an operation depending on the values of the +inputs, and its memory access patterns may also depend on the inputs. +This opens it to timing and cache side-channel attacks which can +disclose data to an attacker. We rely on Python's long-integer +arithmetic, so we cannot handle secrets without risking their disclosure. +""" + +import hashlib +import operator +import sys + + +__version__ = "1.0.dev0" + + +# Useful for very coarse version differentiation. +PY3 = sys.version_info[0] == 3 + +if PY3: + indexbytes = operator.getitem + intlist2bytes = bytes + int2byte = operator.methodcaller("to_bytes", 1, "big") +else: + int2byte = chr + range = xrange + + def indexbytes(buf, i): + return ord(buf[i]) + + def intlist2bytes(l): + return b"".join(chr(c) for c in l) + + +b = 256 +q = 2 ** 255 - 19 +l = 2 ** 252 + 27742317777372353535851937790883648493 + + +def H(m): + return hashlib.sha512(m).digest() + + +def pow2(x, p): + """== pow(x, 2**p, q)""" + while p > 0: + x = x * x % q + p -= 1 + return x + + +def inv(z): + """$= z^{-1} \mod q$, for z != 0""" + # Adapted from curve25519_athlon.c in djb's Curve25519. + z2 = z * z % q # 2 + z9 = pow2(z2, 2) * z % q # 9 + z11 = z9 * z2 % q # 11 + z2_5_0 = (z11 * z11) % q * z9 % q # 31 == 2^5 - 2^0 + z2_10_0 = pow2(z2_5_0, 5) * z2_5_0 % q # 2^10 - 2^0 + z2_20_0 = pow2(z2_10_0, 10) * z2_10_0 % q # ... + z2_40_0 = pow2(z2_20_0, 20) * z2_20_0 % q + z2_50_0 = pow2(z2_40_0, 10) * z2_10_0 % q + z2_100_0 = pow2(z2_50_0, 50) * z2_50_0 % q + z2_200_0 = pow2(z2_100_0, 100) * z2_100_0 % q + z2_250_0 = pow2(z2_200_0, 50) * z2_50_0 % q # 2^250 - 2^0 + return pow2(z2_250_0, 5) * z11 % q # 2^255 - 2^5 + 11 = q - 2 + + +d = -121665 * inv(121666) % q +I = pow(2, (q - 1) // 4, q) + + +def xrecover(y): + xx = (y * y - 1) * inv(d * y * y + 1) + x = pow(xx, (q + 3) // 8, q) + + if (x * x - xx) % q != 0: + x = (x * I) % q + + if x % 2 != 0: + x = q-x + + return x + + +By = 4 * inv(5) +Bx = xrecover(By) +B = (Bx % q, By % q, 1, (Bx * By) % q) +ident = (0, 1, 1, 0) + + +def edwards_add(P, Q): + # This is formula sequence 'addition-add-2008-hwcd-3' from + # http://www.hyperelliptic.org/EFD/g1p/auto-twisted-extended-1.html + (x1, y1, z1, t1) = P + (x2, y2, z2, t2) = Q + + a = (y1-x1)*(y2-x2) % q + b = (y1+x1)*(y2+x2) % q + c = t1*2*d*t2 % q + dd = z1*2*z2 % q + e = b - a + f = dd - c + g = dd + c + h = b + a + x3 = e*f + y3 = g*h + t3 = e*h + z3 = f*g + + return (x3 % q, y3 % q, z3 % q, t3 % q) + + +def edwards_double(P): + # This is formula sequence 'dbl-2008-hwcd' from + # http://www.hyperelliptic.org/EFD/g1p/auto-twisted-extended-1.html + (x1, y1, z1, t1) = P + + a = x1*x1 % q + b = y1*y1 % q + c = 2*z1*z1 % q + # dd = -a + e = ((x1+y1)*(x1+y1) - a - b) % q + g = -a + b # dd + b + f = g - c + h = -a - b # dd - b + x3 = e*f + y3 = g*h + t3 = e*h + z3 = f*g + + return (x3 % q, y3 % q, z3 % q, t3 % q) + + +def scalarmult(P, e): + if e == 0: + return ident + Q = scalarmult(P, e // 2) + Q = edwards_double(Q) + if e & 1: + Q = edwards_add(Q, P) + return Q + + +# Bpow[i] == scalarmult(B, 2**i) +Bpow = [] + + +def make_Bpow(): + P = B + for i in range(253): + Bpow.append(P) + P = edwards_double(P) +make_Bpow() + + +def scalarmult_B(e): + """ + Implements scalarmult(B, e) more efficiently. + """ + # scalarmult(B, l) is the identity + e = e % l + P = ident + for i in range(253): + if e & 1: + P = edwards_add(P, Bpow[i]) + e = e // 2 + assert e == 0, e + return P + + +def encodeint(y): + bits = [(y >> i) & 1 for i in range(b)] + return b''.join([ + int2byte(sum([bits[i * 8 + j] << j for j in range(8)])) + for i in range(b//8) + ]) + + +def encodepoint(P): + (x, y, z, t) = P + zi = inv(z) + x = (x * zi) % q + y = (y * zi) % q + bits = [(y >> i) & 1 for i in range(b - 1)] + [x & 1] + return b''.join([ + int2byte(sum([bits[i * 8 + j] << j for j in range(8)])) + for i in range(b // 8) + ]) + + +def bit(h, i): + return (indexbytes(h, i // 8) >> (i % 8)) & 1 + + +def publickey_unsafe(sk): + """ + Not safe to use with secret keys or secret data. + + See module docstring. This function should be used for testing only. + """ + h = H(sk) + a = 2 ** (b - 2) + sum(2 ** i * bit(h, i) for i in range(3, b - 2)) + A = scalarmult_B(a) + return encodepoint(A) + + +def Hint(m): + h = H(m) + return sum(2 ** i * bit(h, i) for i in range(2 * b)) + + +def signature_unsafe(m, sk, pk): + """ + Not safe to use with secret keys or secret data. + + See module docstring. This function should be used for testing only. + """ + h = H(sk) + a = 2 ** (b - 2) + sum(2 ** i * bit(h, i) for i in range(3, b - 2)) + r = Hint( + intlist2bytes([indexbytes(h, j) for j in range(b // 8, b // 4)]) + m + ) + R = scalarmult_B(r) + S = (r + Hint(encodepoint(R) + pk + m) * a) % l + return encodepoint(R) + encodeint(S) + + +def isoncurve(P): + (x, y, z, t) = P + return (z % q != 0 and + x*y % q == z*t % q and + (y*y - x*x - z*z - d*t*t) % q == 0) + + +def decodeint(s): + return sum(2 ** i * bit(s, i) for i in range(0, b)) + + +def decodepoint(s): + y = sum(2 ** i * bit(s, i) for i in range(0, b - 1)) + x = xrecover(y) + if x & 1 != bit(s, b-1): + x = q - x + P = (x, y, 1, (x*y) % q) + if not isoncurve(P): + raise ValueError("decoding point that is not on curve") + return P + + +class SignatureMismatch(Exception): + pass + + +def checkvalid(s, m, pk): + """ + Not safe to use when any argument is secret. + + See module docstring. This function should be used only for + verifying public signatures of public messages. + """ + if len(s) != b // 4: + raise ValueError("signature length is wrong") + + if len(pk) != b // 8: + raise ValueError("public-key length is wrong") + + R = decodepoint(s[:b // 8]) + A = decodepoint(pk) + S = decodeint(s[b // 8:b // 4]) + h = Hint(encodepoint(R) + pk + m) + + (x1, y1, z1, t1) = P = scalarmult_B(S) + (x2, y2, z2, t2) = Q = edwards_add(R, scalarmult(A, h)) + + if (not isoncurve(P) or not isoncurve(Q) or + (x1*z2 - x2*z1) % q != 0 or (y1*z2 - y2*z1) % q != 0): + raise SignatureMismatch("signature does not pass verification") diff --git a/stem/util/slow_ed25519.py b/stem/util/slow_ed25519.py deleted file mode 100644 index b23bf57c..00000000 --- a/stem/util/slow_ed25519.py +++ /dev/null @@ -1,171 +0,0 @@ -# Public domain ed25519 implementation from... -# -# http://ed25519.cr.yp.to/python/ed25519.py -# -# It isn't constant-time. Don't use it except for testing. Also, see -# warnings about how very slow it is. Only use this for generating -# test vectors, I'd suggest. -# -# Cryptography replacement of this is pending... -# -# https://github.com/pyca/cryptography/issues/5068 - -import hashlib -import stem.prereq - -b = 256 -q = 2 ** 255 - 19 -l = 2 ** 252 + 27742317777372353535851937790883648493 - - -def int_to_byte(val): - """ - Convert an integer to its byte value in an interpreter agnostic way. - """ - - return bytes([val]) if stem.prereq.is_python_3() else chr(val) - - -def H(m): - return hashlib.sha512(m).digest() - - -def expmod(b, e, m): - if e == 0: - return 1 - - t = expmod(b, e // 2, m) ** 2 % m - - if e & 1: - t = (t * b) % m - - return t - - -def inv(x): - return expmod(x, q - 2, q) - - -d = -121665 * inv(121666) -I = expmod(2, (q - 1) // 4, q) - - -def xrecover(y): - xx = (y * y - 1) * inv(d * y * y + 1) - x = expmod(xx, (q + 3) // 8, q) - - if (x * x - xx) % q != 0: - x = (x * I) % q - - if x % 2 != 0: - x = q - x - - return x - - -By = 4 * inv(5) -Bx = xrecover(By) -B = [Bx % q, By % q] - - -def edwards(P, Q): - x1 = P[0] - y1 = P[1] - x2 = Q[0] - y2 = Q[1] - x3 = (x1 * y2 + x2 * y1) * inv(1 + d * x1 * x2 * y1 * y2) - y3 = (y1 * y2 + x1 * x2) * inv(1 - d * x1 * x2 * y1 * y2) - return [x3 % q, y3 % q] - - -def scalarmult(P, e): - if e == 0: - return [0, 1] - - Q = scalarmult(P, e // 2) - Q = edwards(Q, Q) - - if e & 1: - Q = edwards(Q, P) - - return Q - - -def encodeint(y): - bits = [(y >> i) & 1 for i in range(b)] - return b''.join([int_to_byte(sum([bits[i * 8 + j] << j for j in range(8)])) for i in range(b // 8)]) - - -def encodepoint(P): - x = P[0] - y = P[1] - bits = [(y >> i) & 1 for i in range(b - 1)] + [x & 1] - - return b''.join([int_to_byte(sum([bits[i * 8 + j] << j for j in range(8)])) for i in range(b // 8)]) - - -def bit(h, i): - return (ord(h[i // 8:i // 8 + 1]) >> (i % 8)) & 1 - - -def publickey(sk): - h = H(sk) - a = 2 ** (b - 2) + sum(2 ** i * bit(h, i) for i in range(3, b - 2)) - A = scalarmult(B, a) - - return encodepoint(A) - - -def Hint(m): - h = H(m) - return sum(2 ** i * bit(h, i) for i in range(2 * b)) - - -def signature(m, sk, pk): - h = H(sk) - a = 2 ** (b - 2) + sum(2 ** i * bit(h, i) for i in range(3, b - 2)) - r = Hint(b''.join([h[i:i + 1] for i in range(b // 8, b // 4)]) + m) - R = scalarmult(B, r) - S = (r + Hint(encodepoint(R) + pk + m) * a) % l - return encodepoint(R) + encodeint(S) - - -def isoncurve(P): - x = P[0] - y = P[1] - return (-x * x + y * y - 1 - d * x * x * y * y) % q == 0 - - -def decodeint(s): - return sum(2 ** i * bit(s, i) for i in range(0, b)) - - -def decodepoint(s): - y = sum(2 ** i * bit(s, i) for i in range(0, b - 1)) - x = xrecover(y) - - if x & 1 != bit(s, b - 1): - x = q - x - - P = [x, y] - - if not isoncurve(P): - raise Exception('decoding point that is not on curve') - - return P - - -def checkvalid(s, m, pk): - if len(s) != b // 4: - raise Exception('signature length is wrong') - - if len(pk) != b // 8: - raise Exception('public-key length is wrong') - - R = decodepoint(s[0:b // 8]) - A = decodepoint(pk) - S = decodeint(s[b // 8:b // 4]) - h = Hint(encodepoint(R) + pk + m) - - if scalarmult(B, S) != edwards(R, scalarmult(A, h)): - raise Exception('signature does not pass verification') diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 03741d98..36c88f6a 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -455,6 +455,7 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa ignore_rules = [] ignore_for_file = [] + ignore_all_for_files = [] for rule in CONFIG['pycodestyle.ignore'] + CONFIG['pep8.ignore']: if '=>' in rule: @@ -463,6 +464,8 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa if ':' in rule_entry: rule, code = rule_entry.split(':', 1) ignore_for_file.append((path.strip(), rule.strip(), code.strip())) + elif rule_entry.strip() == '*': + ignore_all_for_files.append(path.strip()) else: ignore_rules.append(rule) @@ -471,6 +474,10 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa if path.endswith(ignored_path) and ignored_rule == rule and code.strip().startswith(ignored_code): return True + for ignored_path in ignore_all_for_files: + if path.endswith(ignored_path): + return True + return False if is_pycodestyle_available(): @@ -488,6 +495,10 @@ def stylistic_issues(paths, check_newlines = False, check_exception_keyword = Fa is_block_comment = False + for ignored_path in ignore_all_for_files: + if filename.endswith(ignored_path): + return + for index, line in enumerate(lines): content = line.split('#', 1)[0].strip() diff --git a/test/settings.cfg b/test/settings.cfg index 5443df41..2e7b7a80 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -169,6 +169,8 @@ pycodestyle.ignore E127 pycodestyle.ignore E131 pycodestyle.ignore E722 +pycodestyle.ignore stem/util/ed25519.py => * + pycodestyle.ignore stem/__init__.py => E402: import stem.util.connection pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.bandwidth_file pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.extrainfo_descriptor @@ -177,8 +179,6 @@ pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.m pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.networkstatus pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.server_descriptor pycodestyle.ignore stem/descriptor/__init__.py => E402: import stem.descriptor.tordnsel -pycodestyle.ignore stem/util/slow_ed25519.py => E741: l = 2 ** 252 + 27742317777372353535851937790883648493 -pycodestyle.ignore stem/util/slow_ed25519.py => E741: I = expmod(2, (q - 1) // 4, q) pycodestyle.ignore test/unit/util/connection.py => W291: _tor tor 15843 10 pipe 0x0 state: pycodestyle.ignore test/unit/util/connection.py => W291: _tor tor 15843 11 pipe 0x0 state: diff --git a/test/unit/descriptor/hidden_service_v3.py b/test/unit/descriptor/hidden_service_v3.py index 715a2b65..cb1e9c68 100644 --- a/test/unit/descriptor/hidden_service_v3.py +++ b/test/unit/descriptor/hidden_service_v3.py @@ -463,9 +463,7 @@ class TestHiddenServiceDescriptorV3(unittest.TestCase): @test.require.ed25519_support def test_blinding(self): """ - Create a descriptor with key blinding. `This takes a while - <https://github.com/pyca/cryptography/issues/5068>`_, so we should not do - this more than once. + Create a descriptor with key blinding. """ from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2019