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

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

20 Feb '20

commit bc45142d4a19f3a0167ef994938b4c98158a9b99 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 20 17:50:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-PT.po | 100 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 80 insertions(+), 20 deletions(-) diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 2c4fccc6b8..c2f18fb37c 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -1318,6 +1318,12 @@ msgid "" " does not clear any private information or unlink your activity, nor does it" " affect your current connections to other websites." msgstr "" +"Esta opção é útil se o [retransmissor de saída](/about/#how-tor-works) que " +"está a utilizar não for capaz de aceder ao site que deseja ou não estiver a " +"carregar adequadamente. Ao selecioná-la, o separador ou a janela atualmente " +"ativa será recarregada através de um novo circuito Tor. Esta opção não " +"elimina nenhuma informação privada, não desvincula a sua atividade na rede " +"nem afeta as suas conexões atuais a outros sites." #: https//tb-manual.torproject.org/managing-identities/ #: (content/managing-identities/contents+en.lrtopic.body) @@ -1372,6 +1378,9 @@ msgid "" "so you do not need to worry about [connecting over HTTPS](/secure-" "connections)." msgstr "" +"* Todo o tráfego entre os utilizadores do Tor e os serviços onion é " +"encriptado de ponta-a-ponta, e asiim não precisa de se preocupar em [ligar-" +"se por HTTPS](/secure-connections)." #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1389,7 +1398,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 "### COMO ACEDER A UM SERVIÇO ONION" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1421,7 +1430,7 @@ msgstr "" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) msgid "### TROUBLESHOOTING" -msgstr "" +msgstr "### RESOLUÇÃO DE PROBLEMAS" #: https//tb-manual.torproject.org/onion-services/ #: (content/onion-services/contents+en.lrtopic.body) @@ -1451,6 +1460,8 @@ msgid "" "You can also ensure that you're able to access other onion services by " "connecting to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/)." msgstr "" +"Também pode certificar-se que é possível aceder a outros serviços onion, " +"ligando-se ao [serviço onion do DuckDuckGo](http://3g2upl4pq6kufc4m.onion/)." #: https//tb-manual.torproject.org/secure-connections/ #: (content/secure-connections/contents+en.lrtopic.title) @@ -1514,6 +1525,8 @@ msgid "" "You can do this by increasing Tor Browser's Security Levels in the shield " "menu." msgstr "" +"Pode fazer isto, aumentando os Níveis de Segurança do Tor Browser no menu do" +" escudo." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1529,7 +1542,7 @@ msgstr "" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "### ACCESSING THE SECURITY SETTINGS" -msgstr "" +msgstr "### ACEDER ÀS DEFINIÇÕES DE SEGURANÇA" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1561,7 +1574,7 @@ msgstr "" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "### SECURITY LEVELS" -msgstr "" +msgstr "### NÍVEIS DE SEGURANÇA" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1595,17 +1608,19 @@ msgstr "" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "###### Standard" -msgstr "" +msgstr "###### Padrão" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "* At this level, all Tor Browser and website features are enabled." msgstr "" +"* Neste nível, todos as funcionalidades do Tor Browser e do site da Web " +"estão ativadas." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "###### Safer" -msgstr "" +msgstr "###### Mais seguro" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1613,6 +1628,8 @@ msgid "" "* This level disables website features that are often dangerous. This may " "cause some sites to lose functionality." msgstr "" +"* Este nível desativa funcionalidades do site que muitas vezes são " +"perigosas. Isto pode causar que alguns sites percam a funcionalidade." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1621,11 +1638,14 @@ msgid "" " fonts and math symbols are disabled; audio and video (HTML5 media) are " "click-to-play." msgstr "" +"* O Javascript está desativado em todos os websites sem [HTTPS](/secure-" +"connections); alguns tipo de letra e símbolos matemáticos estão desativados;" +" áudio e vídeo (HTML5 media) são presse-para-ver." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) msgid "###### Safest" -msgstr "" +msgstr "###### O Mais Seguro" #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1633,6 +1653,8 @@ msgid "" "* This level only allows website features required for static sites and " "basic services." msgstr "" +"* Este nível permite apenas as funcionalidades de sites necessários para os " +"sites estáticos e serviços básicos." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body) @@ -1646,6 +1668,9 @@ msgid "" "symbols, and images are disabled; audio and video (HTML5 media) are click-" "to-play." msgstr "" +"* O Javascript está desativado em todos os websites por padrão; alguns tipo " +"de letra, ícones, símbolos matemáticos e imagens estão desativados; áudio e " +"vídeo (HTML5 media) são presse-para-ver." #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.title) @@ -1684,7 +1709,7 @@ msgstr "" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "### UPDATING TOR BROWSER AUTOMATICALLY" -msgstr "" +msgstr "### ATUALIZAR O TOR BROWSER AUTOMATICAMENTE" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1697,11 +1722,13 @@ msgid "" "When you are prompted to update Tor Browser, click on hamburger menu (main " "menu), then select “Restart to update Tor browser”." msgstr "" +"Ao ver o alerta para atualizar o Tor Browser, clique no menu hamburger (menu" +" principal), e em seguida em \"Reiniciar para atualizar o Tor Browser\"." #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "<img width=\"500\" src=\"../../static/images/update4.png\" />" -msgstr "" +msgstr "<img width=\"500\" src=\"../../static/images/update4.png\" />" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1709,11 +1736,14 @@ msgid "" "Wait for the update to download and install, then Tor Browser will restart " "itself. You will now be running the latest version." msgstr "" +"Aguarde até que a atualização seja transferida e instalada, depois o Tor " +"Browser irá reiniciar sozinho. Agora estará a utilizar a última versão do " +"Tor." #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) msgid "### UPDATING TOR BROWSER MANUALLY" -msgstr "" +msgstr "### ATUALIZAR TOR BROWSER MANUALMENTE" #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1730,6 +1760,8 @@ msgid "" "Remove Tor Browser from your system by deleting the folder that contains it " "(see the [Uninstalling](/uninstalling) section for more information)." msgstr "" +"Remova o Tor Browser do seu sistema eliminando a pasta do Tor (consulte a " +"secção [Desinstalar](/uninstalling) para mais informações)." #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) @@ -1764,7 +1796,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### QUICK FIXES" -msgstr "" +msgstr "### CORREÇÕES RÁPIDAS" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1823,7 +1855,7 @@ msgstr "" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### IS YOUR CONNECTION CENSORED?" -msgstr "" +msgstr "### A SUA LIGAÇÃO ESTÁ CENSURADA?" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1832,11 +1864,14 @@ msgid "" "censoring connections to the Tor network. Read the " "[Circumvention](/circumvention) section for possible solutions." msgstr "" +"Se ainda assim não conseguir ligar-se à rede, talvez o seu fornecedor de " +"acesso à Internet esteja a bloquear ligações à rede Tor. Leia a secção " +"[Contornar](/circumvention) para encontrar soluções. " #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) msgid "### KNOWN ISSUES" -msgstr "" +msgstr "### PROBLEMAS CONHECIDOS" #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body) @@ -1845,6 +1880,10 @@ msgid "" "but not yet fixed. Please check the [Known Issues](/known-issues) page to " "see if the problem you are experiencing is already listed there." msgstr "" +"O Tor Browser está em constante desenvolvimento. Alguns problemas são " +"conhecidos, mas ainda não foram solucionados. Por favor, consulte a página " +"[Problemas Conhecidos](/pt-PT/known-issues) para ver se o problema que está " +"a ter já foi reportado e é conhecido pelos programadores." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.title) @@ -1859,7 +1898,7 @@ msgstr "Como o Tor Browser lida com os extras, plug-ins e JavaScript" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### FLASH PLAYER" -msgstr "" +msgstr "### FLASH PLAYER" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1893,7 +1932,7 @@ msgstr "" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### JAVASCRIPT" -msgstr "" +msgstr "### JAVASCRIPT" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1917,6 +1956,11 @@ msgid "" "control the JavaScript (and other scripts) that runs on individual web " "pages, or block it entirely." msgstr "" +"O Tor Browser inclui uma extensão chamada NoScript. Este está acessível " +"através das \"Preferências\" no menu hamburger (menu principal), daí clique " +"em \"Customizar\" e arraste o ícone \"S\" para o canto superior direito da " +"janel. O NoScript permite controlar o JavaScript (e outros scripts) " +"executado em páginas da Web individuais ou bloqueá-lo totalmente." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1928,11 +1972,18 @@ msgid "" " displaying correctly, so Tor Browser’s default setting is to allow all " "websites to run scripts in \"Standard\" mode." msgstr "" +"O utilizadores que exijam um alto grau de segurança na sua navegação web " +"devem ajustar o [Nível de Segurança](../security-settings/) até ao ajuste " +"\"Mais Seguro\" (que desativa o Javascript em todos os sites sem HTTPS) ou " +"\"Segurança Máxima\". No entanto, se desativar o JavaScript impedirá a " +"visualização correta de diversos sites. Por isso a configuração padrão do " +"Tor Browser é permitir a todos os sites que executem os scripts no modo " +"\"Padrão\"." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) msgid "### BROWSER ADD-ONS" -msgstr "" +msgstr "### EXTRAS DE NAVEGADOR" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -1977,7 +2028,7 @@ msgstr "Remover o Tor Browser do seu sistema é simples:" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) msgid "On Windows:" -msgstr "" +msgstr "No Windows:" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -1985,6 +2036,8 @@ msgid "" "* Locate your Tor Browser folder or application. The default location is the" " Desktop." msgstr "" +"* Localize a sua pasta ou aplicação do Tor Browser. A localização padrão é o" +" Ambiente de Trabalho." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -1999,7 +2052,7 @@ msgstr "* Limpe a sua 'Reciclagem'" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) msgid "On macOS:" -msgstr "" +msgstr "No macOS:" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -2007,16 +2060,18 @@ msgid "" "* Locate your Tor Browser application. The default location is the " "Applications folder." msgstr "" +"* Localize a sua pasta ou aplicação do Tor Browser. A localização padrão é a" +" pasta de Aplicações." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) msgid "* Move the Tor Browser application to Trash." -msgstr "" +msgstr "* Mova o Tor Browser para o Lixo." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) msgid "* Go to your `~/Library/Application Support/` folder." -msgstr "" +msgstr "* Vá até à pasta `~/Library/Application Support/`." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -2024,6 +2079,9 @@ msgid "" "* Note the Library folder is hidden on newer versions of macOS. To navigate " "to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu." msgstr "" +"* Note que a pasta Livraria está escondida nas novas versões do macOS. Para " +"navegar até esta pasta no Finder, selecione \"Ir até à pasta...\" no menu " +"\"Ir\"." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -2031,6 +2089,8 @@ msgid "" "<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go " "to folder menu option.\">" msgstr "" +"<img class=\"\" src=\"/static/images/macos-go-to-folder-menu.png\" alt=\"Go " +"to folder menu option.\">" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body)

1 0

[tor/maint-0.4.3] practracker: Read unicode files when using Python 2
by nickm＠torproject.org 20 Feb '20

20 Feb '20

commit 57ff8d4a5323356a8d879caf8226c934f2e82260 Author: teor <teor(a)torproject.org> Date: Wed Feb 19 08:22:01 2020 +1000 practracker: Read unicode files when using Python 2 Allow the "practracker" coding best practices checking script to read unicode files, when using Python 2. We made the script use unicode literals in 0.4.3.1-alpha, but didn't change the codec for opening files. Fixes bug 33374; bugfix on 0.4.3.1-alpha. --- changes/bug33374 | 5 +++++ scripts/maint/practracker/practracker.py | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/changes/bug33374 b/changes/bug33374 new file mode 100644 index 000000000..d1141faf7 --- /dev/null +++ b/changes/bug33374 @@ -0,0 +1,5 @@ + o Minor bugfixes (coding best practices checks): + - Allow the "practracker" coding best practices checking script to read + unicode files, when using Python 2. We made the script use unicode + literals in 0.4.3.1-alpha, but didn't change the codec for opening files. + Fixes bug 33374; bugfix on 0.4.3.1-alpha. diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 6149fb79c..79b13cb05 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -24,7 +24,7 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -import os, sys +import codecs, os, sys import metrics import util @@ -63,12 +63,8 @@ TOR_TOPDIR = None ####################################################### -if sys.version_info[0] <= 2: - def open_file(fname): - return open(fname, 'r') -else: - def open_file(fname): - return open(fname, 'r', encoding='utf-8') +def open_file(fname): + return codecs.open(fname, 'r', encoding='utf-8') def consider_file_size(fname, f): """Consider the size of 'f' and yield an FileSizeItem for it.

1 0

[tor/maint-0.4.3] Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3
by nickm＠torproject.org 20 Feb '20

20 Feb '20

commit 7b4250286962da0f8dc6731d7f1c8cec9ccb4146 Merge: f733b8acd 57ff8d4a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 20 10:44:36 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3 changes/bug33374 | 5 +++++ scripts/maint/practracker/practracker.py | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-)

1 0

[tor/master] practracker: Read unicode files when using Python 2
by nickm＠torproject.org 20 Feb '20

20 Feb '20

commit 57ff8d4a5323356a8d879caf8226c934f2e82260 Author: teor <teor(a)torproject.org> Date: Wed Feb 19 08:22:01 2020 +1000 practracker: Read unicode files when using Python 2 Allow the "practracker" coding best practices checking script to read unicode files, when using Python 2. We made the script use unicode literals in 0.4.3.1-alpha, but didn't change the codec for opening files. Fixes bug 33374; bugfix on 0.4.3.1-alpha. --- changes/bug33374 | 5 +++++ scripts/maint/practracker/practracker.py | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/changes/bug33374 b/changes/bug33374 new file mode 100644 index 000000000..d1141faf7 --- /dev/null +++ b/changes/bug33374 @@ -0,0 +1,5 @@ + o Minor bugfixes (coding best practices checks): + - Allow the "practracker" coding best practices checking script to read + unicode files, when using Python 2. We made the script use unicode + literals in 0.4.3.1-alpha, but didn't change the codec for opening files. + Fixes bug 33374; bugfix on 0.4.3.1-alpha. diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 6149fb79c..79b13cb05 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -24,7 +24,7 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -import os, sys +import codecs, os, sys import metrics import util @@ -63,12 +63,8 @@ TOR_TOPDIR = None ####################################################### -if sys.version_info[0] <= 2: - def open_file(fname): - return open(fname, 'r') -else: - def open_file(fname): - return open(fname, 'r', encoding='utf-8') +def open_file(fname): + return codecs.open(fname, 'r', encoding='utf-8') def consider_file_size(fname, f): """Consider the size of 'f' and yield an FileSizeItem for it.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3
by nickm＠torproject.org 20 Feb '20

20 Feb '20

commit 7b4250286962da0f8dc6731d7f1c8cec9ccb4146 Merge: f733b8acd 57ff8d4a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 20 10:44:36 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3 changes/bug33374 | 5 +++++ scripts/maint/practracker/practracker.py | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 20 Feb '20

20 Feb '20

commit 7ba7f9c0de9d1b2435a01961379b3d85c4fc2ab5 Merge: 66bbdadbb 7b4250286 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 20 10:44:43 2020 -0500 Merge branch 'maint-0.4.3' changes/bug33374 | 5 +++++ scripts/maint/practracker/practracker.py | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-)

1 0

[tor/release-0.4.3] practracker: Read unicode files when using Python 2
by nickm＠torproject.org 20 Feb '20

20 Feb '20

commit 57ff8d4a5323356a8d879caf8226c934f2e82260 Author: teor <teor(a)torproject.org> Date: Wed Feb 19 08:22:01 2020 +1000 practracker: Read unicode files when using Python 2 Allow the "practracker" coding best practices checking script to read unicode files, when using Python 2. We made the script use unicode literals in 0.4.3.1-alpha, but didn't change the codec for opening files. Fixes bug 33374; bugfix on 0.4.3.1-alpha. --- changes/bug33374 | 5 +++++ scripts/maint/practracker/practracker.py | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/changes/bug33374 b/changes/bug33374 new file mode 100644 index 000000000..d1141faf7 --- /dev/null +++ b/changes/bug33374 @@ -0,0 +1,5 @@ + o Minor bugfixes (coding best practices checks): + - Allow the "practracker" coding best practices checking script to read + unicode files, when using Python 2. We made the script use unicode + literals in 0.4.3.1-alpha, but didn't change the codec for opening files. + Fixes bug 33374; bugfix on 0.4.3.1-alpha. diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 6149fb79c..79b13cb05 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -24,7 +24,7 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -import os, sys +import codecs, os, sys import metrics import util @@ -63,12 +63,8 @@ TOR_TOPDIR = None ####################################################### -if sys.version_info[0] <= 2: - def open_file(fname): - return open(fname, 'r') -else: - def open_file(fname): - return open(fname, 'r', encoding='utf-8') +def open_file(fname): + return codecs.open(fname, 'r', encoding='utf-8') def consider_file_size(fname, f): """Consider the size of 'f' and yield an FileSizeItem for it.

1 0

[tor/release-0.4.3] Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3
by nickm＠torproject.org 20 Feb '20

20 Feb '20

commit 7b4250286962da0f8dc6731d7f1c8cec9ccb4146 Merge: f733b8acd 57ff8d4a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 20 10:44:36 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3 changes/bug33374 | 5 +++++ scripts/maint/practracker/practracker.py | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-)

1 0

[tor/master] Disable routerkeys.c with --disable-relay-mode.
by nickm＠torproject.org 20 Feb '20

20 Feb '20

commit e425ffc6375f28554ad3491f3bfc57b69964a394 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 19 19:30:05 2020 -0500 Disable routerkeys.c with --disable-relay-mode. --- src/core/or/include.am | 4 +-- src/feature/relay/include.am | 4 +-- src/feature/relay/routerkeys.h | 82 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 4 deletions(-) diff --git a/src/core/or/include.am b/src/core/or/include.am index 8f0f0bb61..89445e698 100644 --- a/src/core/or/include.am +++ b/src/core/or/include.am @@ -3,7 +3,6 @@ LIBTOR_APP_A_SOURCES += \ src/core/or/address_set.c \ src/core/or/channel.c \ - src/core/or/relay_handshake.c \ src/core/or/channelpadding.c \ src/core/or/channeltls.c \ src/core/or/circuitbuild.c \ @@ -29,6 +28,7 @@ LIBTOR_APP_A_SOURCES += \ src/core/or/protover_rust.c \ src/core/or/reasons.c \ src/core/or/relay.c \ + src/core/or/relay_handshake.c \ src/core/or/scheduler.c \ src/core/or/scheduler_kist.c \ src/core/or/scheduler_vanilla.c \ @@ -43,7 +43,6 @@ noinst_HEADERS += \ src/core/or/cell_queue_st.h \ src/core/or/cell_st.h \ src/core/or/channel.h \ - src/core/or/relay_handshake.h \ src/core/or/channelpadding.h \ src/core/or/channeltls.h \ src/core/or/circuit_st.h \ @@ -90,6 +89,7 @@ noinst_HEADERS += \ src/core/or/reasons.h \ src/core/or/relay.h \ src/core/or/relay_crypto_st.h \ + src/core/or/relay_handshake.h \ src/core/or/scheduler.h \ src/core/or/sendme.h \ src/core/or/server_port_cfg_st.h \ diff --git a/src/feature/relay/include.am b/src/feature/relay/include.am index aa7c1b35b..f4b504a34 100644 --- a/src/feature/relay/include.am +++ b/src/feature/relay/include.am @@ -2,8 +2,7 @@ # Legacy shared relay code: migrate to the relay module over time LIBTOR_APP_A_SOURCES += \ src/feature/relay/onion_queue.c \ - src/feature/relay/router.c \ - src/feature/relay/routerkeys.c + src/feature/relay/router.c # The Relay module. @@ -15,6 +14,7 @@ MODULE_RELAY_SOURCES = \ src/feature/relay/relay_config.c \ src/feature/relay/relay_periodic.c \ src/feature/relay/relay_sys.c \ + src/feature/relay/routerkeys.c \ src/feature/relay/selftest.c \ src/feature/relay/transport_config.c diff --git a/src/feature/relay/routerkeys.h b/src/feature/relay/routerkeys.h index c2475f195..2b5f03a2a 100644 --- a/src/feature/relay/routerkeys.h +++ b/src/feature/relay/routerkeys.h @@ -11,6 +11,8 @@ #include "lib/crypt_ops/crypto_ed25519.h" +#ifdef HAVE_MODULE_RELAY + const ed25519_public_key_t *get_master_identity_key(void); MOCK_DECL(const ed25519_keypair_t *, get_master_signing_keypair,(void)); MOCK_DECL(const struct tor_cert_st *, get_master_signing_key_cert,(void)); @@ -24,6 +26,7 @@ void get_master_rsa_crosscert(const uint8_t **cert_out, int router_ed25519_id_is_me(const ed25519_public_key_t *id); +/* These are only used by router.c */ struct tor_cert_st *make_ntor_onion_key_crosscert( const curve25519_keypair_t *onion_key, const ed25519_public_key_t *master_id_key, @@ -42,6 +45,85 @@ int generate_ed_link_cert(const or_options_t *options, time_t now, int force); void routerkeys_free_all(void); +#else /* !defined(HAVE_MODULE_RELAY) */ + +#define router_ed25519_id_is_me(id) \ + ((void)(id), 0) + +static inline void * +relay_key_is_unavailable_(void) +{ + tor_assert_nonfatal_unreached(); + return NULL; +} +#define relay_key_is_unavailable(type) \ + ((type)(relay_key_is_unavailable_())) + +// Many of these can be removed once relay_handshake.c is relay-only. +#define get_current_auth_keypair() \ + relay_key_is_unavailable(const ed25519_keypair_t *) +#define get_master_signing_keypair() \ + relay_key_is_unavailable(const ed25519_keypair_t *) +#define get_current_link_cert_cert() \ + relay_key_is_unavailable(const struct tor_cert_st *) +#define get_current_auth_key_cert() \ + relay_key_is_unavailable(const struct tor_cert_st *) +#define get_master_signing_key_cert() \ + relay_key_is_unavailable(const struct tor_cert_st *) +#define get_master_rsa_crosscert(cert_out, size_out) \ + STMT_BEGIN \ + tor_assert_nonfatal_unreached(); \ + *(cert_out) = NULL; \ + *(size_out) = 0; \ + STMT_END +#define get_master_identity_key() \ + relay_key_is_unavailable(const ed25519_public_key_t *) + +#define generate_ed_link_cert(options, now, force) \ + ((void)(options), (void)(now), (void)(force), 0) +#define should_make_new_ed_keys(options, now) \ + ((void)(options), (void)(now), 0) + +// These can get removed once router.c becomes relay-only. +static inline struct tor_cert_st * +make_ntor_onion_key_crosscert(const curve25519_keypair_t *onion_key, + const ed25519_public_key_t *master_id_key, + time_t now, time_t lifetime, + int *sign_out) +{ + (void)onion_key; + (void)master_id_key; + (void)now; + (void)lifetime; + (void)sign_out; + tor_assert_nonfatal_unreached(); + return NULL; +} +static inline uint8_t * +make_tap_onion_key_crosscert(const crypto_pk_t *onion_key, + const ed25519_public_key_t *master_id_key, + const crypto_pk_t *rsa_id_key, + int *len_out) +{ + (void)onion_key; + (void)master_id_key; + (void)rsa_id_key; + (void)len_out; + tor_assert_nonfatal_unreached(); + return NULL; +} + +/* This calls is used outside of relay mode, but only to implement + * CMD_KEY_EXPIRATION */ +#define log_cert_expiration() \ + (puts("Not available: Tor has been compiled without relay support"), 0) +/* This calls is used outside of relay mode, but only to implement + * CMD_KEYGEN. */ +#define load_ed_keys(x,y) \ + (puts("Not available: Tor has been compiled without relay support"), 0) + +#endif /* defined(HAVE_MODULE_RELAY) */ + #ifdef TOR_UNIT_TESTS const ed25519_keypair_t *get_master_identity_keypair(void); void init_mock_ed_keys(const crypto_pk_t *rsa_identity_key);

1 0

[tor/master] Move relay_handshake.[ch] into src/feature/relay, and make it optional
by nickm＠torproject.org 20 Feb '20

20 Feb '20

commit 1d068625ddcc5ea9d629d0265eb6bbab7877d6ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 19 19:52:04 2020 -0500 Move relay_handshake.[ch] into src/feature/relay, and make it optional --- scripts/maint/practracker/exceptions.txt | 2 +- src/core/or/channeltls.c | 2 +- src/core/or/connection_or.c | 2 +- src/core/or/include.am | 2 - src/core/or/relay_handshake.h | 38 ---------- src/feature/relay/include.am | 2 + src/{core/or => feature/relay}/relay_handshake.c | 2 +- src/feature/relay/relay_handshake.h | 90 ++++++++++++++++++++++++ src/test/test_link_handshake.c | 2 +- 9 files changed, 97 insertions(+), 45 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index ac81c79b4..9c962bb04 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -145,7 +145,6 @@ problem dependency-violation /src/core/or/connection_edge.h 1 problem file-size /src/core/or/connection_or.c 3122 problem function-size /src/core/or/connection_or.c:connection_or_group_set_badness_() 105 problem function-size /src/core/or/connection_or.c:connection_or_client_learned_peer_id() 142 -problem function-size /src/core/or/relay_handshake.c:connection_or_compute_authenticate_cell_body() 231 problem dependency-violation /src/core/or/connection_or.c 20 problem dependency-violation /src/core/or/dos.c 6 problem dependency-violation /src/core/or/onion.c 2 @@ -275,6 +274,7 @@ problem function-size /src/feature/nodelist/routerlist.c:update_extrainfo_downlo problem function-size /src/feature/relay/dns.c:dns_resolve_impl() 131 problem function-size /src/feature/relay/dns.c:configure_nameservers() 161 problem function-size /src/feature/relay/dns.c:evdns_callback() 108 +problem function-size /src/feature/relay/relay_handshake.c:connection_or_compute_authenticate_cell_body() 231 problem file-size /src/feature/relay/router.c 3520 problem include-count /src/feature/relay/router.c 57 problem function-size /src/feature/relay/router.c:init_keys() 252 diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 71e0c6aa0..2a35237d3 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -47,7 +47,7 @@ #include "app/config/config.h" #include "core/mainloop/connection.h" #include "core/or/connection_or.h" -#include "core/or/relay_handshake.h" +#include "feature/relay/relay_handshake.h" #include "feature/control/control.h" #include "feature/client/entrynodes.h" #include "trunnel/link_handshake.h" diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c index 9302dc864..6dd646637 100644 --- a/src/core/or/connection_or.c +++ b/src/core/or/connection_or.c @@ -39,7 +39,7 @@ #include "app/config/config.h" #include "core/mainloop/connection.h" #include "core/or/connection_or.h" -#include "core/or/relay_handshake.h" +#include "feature/relay/relay_handshake.h" #include "feature/control/control_events.h" #include "lib/crypt_ops/crypto_util.h" #include "feature/dirauth/reachability.h" diff --git a/src/core/or/include.am b/src/core/or/include.am index 89445e698..4dd251d2e 100644 --- a/src/core/or/include.am +++ b/src/core/or/include.am @@ -28,7 +28,6 @@ LIBTOR_APP_A_SOURCES += \ src/core/or/protover_rust.c \ src/core/or/reasons.c \ src/core/or/relay.c \ - src/core/or/relay_handshake.c \ src/core/or/scheduler.c \ src/core/or/scheduler_kist.c \ src/core/or/scheduler_vanilla.c \ @@ -89,7 +88,6 @@ noinst_HEADERS += \ src/core/or/reasons.h \ src/core/or/relay.h \ src/core/or/relay_crypto_st.h \ - src/core/or/relay_handshake.h \ src/core/or/scheduler.h \ src/core/or/sendme.h \ src/core/or/server_port_cfg_st.h \ diff --git a/src/core/or/relay_handshake.h b/src/core/or/relay_handshake.h deleted file mode 100644 index 987038cc7..000000000 --- a/src/core/or/relay_handshake.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (c) 2001 Matej Pfajfar. - * Copyright (c) 2001-2004, Roger Dingledine. - * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2020, The Tor Project, Inc. */ -/* See LICENSE for licensing information */ - -/** - * @file relay_handshake.h - * @brief Header for core/or/relay_handshake.c - **/ - -#ifndef TOR_CORE_OR_RELAY_HANDSHAKE_H -#define TOR_CORE_OR_RELAY_HANDSHAKE_H - -struct ed25519_keypair_t; - -int connection_or_send_certs_cell(or_connection_t *conn); -int connection_or_send_auth_challenge_cell(or_connection_t *conn); - -var_cell_t *connection_or_compute_authenticate_cell_body( - or_connection_t *conn, - const int authtype, - crypto_pk_t *signing_key, - const struct ed25519_keypair_t *ed_signing_key, - int server); - -int authchallenge_type_is_supported(uint16_t challenge_type); -int authchallenge_type_is_better(uint16_t challenge_type_a, - uint16_t challenge_type_b); - -MOCK_DECL(int,connection_or_send_authenticate_cell, - (or_connection_t *conn, int type)); - -#ifdef TOR_UNIT_TESTS -extern int certs_cell_ed25519_disabled_for_testing; -#endif - -#endif /* !defined(TOR_CORE_OR_RELAY_HANDSHAKE_H) */ diff --git a/src/feature/relay/include.am b/src/feature/relay/include.am index f4b504a34..813ddb8fb 100644 --- a/src/feature/relay/include.am +++ b/src/feature/relay/include.am @@ -12,6 +12,7 @@ MODULE_RELAY_SOURCES = \ src/feature/relay/ext_orport.c \ src/feature/relay/routermode.c \ src/feature/relay/relay_config.c \ + src/feature/relay/relay_handshake.c \ src/feature/relay/relay_periodic.c \ src/feature/relay/relay_sys.c \ src/feature/relay/routerkeys.c \ @@ -25,6 +26,7 @@ noinst_HEADERS += \ src/feature/relay/ext_orport.h \ src/feature/relay/onion_queue.h \ src/feature/relay/relay_config.h \ + src/feature/relay/relay_handshake.h \ src/feature/relay/relay_periodic.h \ src/feature/relay/relay_sys.h \ src/feature/relay/router.h \ diff --git a/src/core/or/relay_handshake.c b/src/feature/relay/relay_handshake.c similarity index 99% rename from src/core/or/relay_handshake.c rename to src/feature/relay/relay_handshake.c index 78b7da737..030dc9495 100644 --- a/src/core/or/relay_handshake.c +++ b/src/feature/relay/relay_handshake.c @@ -17,7 +17,7 @@ #include "orconfig.h" #include "core/or/or.h" -#include "core/or/relay_handshake.h" +#include "feature/relay/relay_handshake.h" #include "app/config/config.h" #include "core/or/connection_or.h" diff --git a/src/feature/relay/relay_handshake.h b/src/feature/relay/relay_handshake.h new file mode 100644 index 000000000..99a658cbc --- /dev/null +++ b/src/feature/relay/relay_handshake.h @@ -0,0 +1,90 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file relay_handshake.h + * @brief Header for feature/relay/relay_handshake.c + **/ + +#ifndef TOR_CORE_OR_RELAY_HANDSHAKE_H +#define TOR_CORE_OR_RELAY_HANDSHAKE_H + +#ifdef HAVE_MODULE_RELAY +struct ed25519_keypair_t; + +int connection_or_send_certs_cell(or_connection_t *conn); +int connection_or_send_auth_challenge_cell(or_connection_t *conn); + +var_cell_t *connection_or_compute_authenticate_cell_body( + or_connection_t *conn, + const int authtype, + crypto_pk_t *signing_key, + const struct ed25519_keypair_t *ed_signing_key, + int server); + +int authchallenge_type_is_supported(uint16_t challenge_type); +int authchallenge_type_is_better(uint16_t challenge_type_a, + uint16_t challenge_type_b); + +MOCK_DECL(int,connection_or_send_authenticate_cell, + (or_connection_t *conn, int type)); + +#ifdef TOR_UNIT_TESTS +extern int certs_cell_ed25519_disabled_for_testing; +#endif +#else /* !defined(HAVE_MODULE_RELAY) */ + +static inline int +connection_or_send_certs_cell(or_connection_t *conn) +{ + (void)conn; + tor_assert_nonfatal_unreached(); + return -1; +} +static inline int +connection_or_send_auth_challenge_cell(or_connection_t *conn) +{ + (void)conn; + tor_assert_nonfatal_unreached(); + return -1; +} + +static inline var_cell_t * +connection_or_compute_authenticate_cell_body( + or_connection_t *conn, + const int authtype, + crypto_pk_t *signing_key, + const struct ed25519_keypair_t *ed_signing_key, + int server) +{ + (void)conn; + (void)authtype; + (void)signing_key; + (void)ed_signing_key; + (void)server; + tor_assert_nonfatal_unreached(); + return NULL; +} + +#define authchallenge_type_is_supported(t) (0) +#define authchallenge_type_is_better(a, b) (0) + +static inline int +connection_or_send_authenticate_cell(or_connection_t *conn, int type) +{ + (void)conn; + (void)type; + tor_assert_nonfatal_unreached(); + return -1; +} + +#ifdef TOR_UNIT_TESTS +extern int certs_cell_ed25519_disabled_for_testing; +#endif + +#endif /* defined(HAVE_MODULE_RELAY) */ + +#endif /* !defined(TOR_CORE_OR_RELAY_HANDSHAKE_H) */ diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index 98e8447d8..1566b349e 100644 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@ -18,7 +18,7 @@ #include "feature/relay/routerkeys.h" #include "core/or/scheduler.h" #include "feature/nodelist/torcert.h" -#include "core/or/relay_handshake.h" +#include "feature/relay/relay_handshake.h" #include "core/or/or_connection_st.h" #include "core/or/or_handshake_certs_st.h"

1 0