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

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 18 Jun '18

18 Jun '18

commit 3da153ea467b4cfc4bdb787eb7911a41f1764dcb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 18 18:49:39 2018 +0000 Update translations for support-tbb --- pt_BR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR.json b/pt_BR.json index 996dd8215..1056868e2 100644 --- a/pt_BR.json +++ b/pt_BR.json @@ -147,7 +147,7 @@ "id": "#tbb-24", "control": "tbb-24", "title": "Eu estou tendo um problema com o DuckDuckGo.", - "description": "Please see the <a href=\"https://duck.co/help\">DuckDuckGo support portal</a>. If you believe this is a Tor Browser issue, please report it on our <a href=\"https://trac.torproject.org/\">bug tracker</a>." + "description": "Por favor veja o <a href=\"https://duck.co/help\">portal de suporte do DuckDuckGo</a>. Caso acredite que esse é um problema com o navegador TOR, favor reportá-lo em nosso <a href=\"https://trac.torproject.org/\">rastreador de erros</a>." }, "tbb-25": { "id": "#tbb-25",

1 0

[translation/support-miscellaneous_completed] Update translations for support-miscellaneous_completed
by translation＠torproject.org 18 Jun '18

18 Jun '18

commit 3b8871d8e92b1631106be3a87661bef6131b1660 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 18 18:49:35 2018 +0000 Update translations for support-miscellaneous_completed --- pt_BR.json | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/pt_BR.json b/pt_BR.json new file mode 100644 index 000000000..8b6f55d9f --- /dev/null +++ b/pt_BR.json @@ -0,0 +1,92 @@ +{ + "misc-1": { + "id": "#misc-1", + "control": "misc-1", + "title": "Eu tenho uma razão válida para rastrear um usuário do Tor. Vocês podem me ajudar? ", + "description": "Os programadores do Tor não podem por nenhum meio seguir alguém que usa Tor. As mesmas proteções que impedem que outras pessoas quebrem o anonimato garantido pelo Tor também impedem que nós sigamos as pessoas que usam Tor." + }, + "misc-2": { + "id": "#misc-2", + "control": "misc-2", + "title": "Por que vocês não impedem que pessoas ruins façam coisas ruins enquanto usando o Tor?", + "description": "Tor é projetado para defender os direitos humanos e a privacidade, impedindo qualquer pessoa, e inclusive nós, de censurar o que quer que seja. Nós odiamos que algumas pessoas utilizem Tor para fazer coisas ruins, mas não podemos fazer nada para nos livrarmos dessas pessoas sem com isso minar os ativistas dos direitos humanos, jornalistas, sobreviventes de abuso, e outras pessoas que usam Tor para coisas boas. Se quiséssemos bloquear o uso de Tor a certas pessoas, basicamente estaríamos adicionando uma backdoor ao software, o que iria expor nossos usuários mais vulneráveis a ataques de governos repressores e outros adversários." + }, + "misc-3": { + "id": "#misc-3", + "control": "misc-3", + "title": "Quem financia o Tor?", + "description": "Tor é financiado por vários patrocinadores, incluindo agências federais dos Estados Unidos, fundações privadas e doadores individuais. Veja uma lista de todos os <a href=\"https://www.torproject.org/about/sponsors.html.en\">nossos patrocinadores</a> e uma série de<a href=\"https://blog.torproject.org/category/tags/form-990\"> postagens de blog</a> sobre os nossos relatórios financeiros. No Tor, nós pensamos que falar abertamente sobre os nossos patrocinadores e o modelo de financiamento que adotamos é a melhor maneira de manter a confiança da nossa comunidade. Estamos sempre procurando diversificar as nossas fontes de financiamento, especialmente de fundações e indivíduos." + }, + "misc-4": { + "id": "#misc-4", + "control": "misc-4", + "title": "Eu posso Tor e BitTorrent juntos?", + "description": "Nós não recomendamos o uso de Tor com Bittorrent. Para maiores detalhes, por favor, consulte o nosso<a href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\">blog post on the subject</a>." + }, + "misc-5": { + "id": "#misc-5", + "control": "misc-5", + "title": "Os arquivos do meu computador foram bloqueados, e alguém está exigindo que eu baixe o Navegador Tor para pagar um resgate pelos meus arquivos!", + "description": "É uma pena muito grande, mas você infectou-se com malware. O Projeto Tor não criou esse malware. Os autores de malware estão pedindo para você baixar o Navegador Tor presumivelmente para contactá-los anonimamente com o resgate que eles estão exigindo de você. Se esta for sua primeira experiência usando o Navegador Tor, nós entendemos que talvez você pense que somos pessoas ruins que auxiliam pessoas ainda piores. Mas, por favor, considere que o nosso software é utilizado todos os dias para uma grande variedade de propósitos por ativistas de direitos humanos, jornalistas, sobreviventes de violência doméstica, whistleblowers, agentes oficiais, e muitos outros. Infelizmente, a proteção que nosso software pode proporcionar a esses grupos de pessoas também pode ser usada por criminosos e autores de malware. O Projeto Tor não apoia nem condorda com o uso do nosso software para fins maliciosos." + }, + "misc-6": { + "id": "#misc-6", + "control": "misc-6", + "title": "O Tor mantém registros?", + "description": "\n" + }, + "misc-7": { + "id": "#misc-7", + "control": "misc-7", + "title": "O Projeto Tor oferece serviços de correio eletrônico ou outros serviços web de proteção de privacidade?", + "description": "Não, nós não oferecemos nenhum serviço online. Você encontrará a lista de todos os nossos softwares em <a href=\"https://www.torproject.org/projects/projects.html.en\">projects page</a>." + }, + "misc-8": { + "id": "#misc-8", + "control": "misc-8", + "title": "Posso usar a logo do Tor em meu produto?", + "description": "Você pode ler tudo sobre esse assunto na nossa <a href=\"https://www.torproject.org/docs/trademark-faq.html\">Página de perguntas frequentes</a>." + }, + "misc-9": { + "id": "#misc-9", + "control": "misc-9", + "title": "Estou tendo problema em atualizar ou usar o Vidalia.", + "description": "Vidalia não é mantido nem possui suporte. Uma grande parte das funções do Vidalia foram integradas no próprio Navegador Tor." + }, + "misc-10": { + "id": "#misc-10", + "control": "misc-10", + "title": "O Projeto Tor oferece serviços de hospedagem?", + "description": "Não, o Projeto Tor não oferece serviços de hospedagem." + }, + "misc-11": { + "id": "#misc-11", + "control": "misc-11", + "title": "Posso alterar o número de saltos que o TOR usa?", + "description": "Nesse momento, o comprimento do trajeto é codificado em 3, mais o número de nós no seu caminho, que são variáveis. Isto é, normalmente são 3, mas, por exemplo, se você estiver acessando um serviço .onion ou um endereço de \"saída\", pode ser mais.<p class=\"mb-3\"We don't want to encourage people to use paths longer than this as it increases load on the network without (as far as we can tell) providing any more security. Also, using paths longer than 3 could harm anonymity, first because it makes<a href=\"https://www.freehaven.net/anonbib/#ccs07-doa\"> ataques de denegação de segurança</a> mais fáceis. segundo, porque ele poderia ser usado como um identificador se apenas um pequeno número de usuários tivessem o mesmo comprimento de caminho que você." + }, + "misc-12": { + "id": "#misc-12", + "control": "misc-12", + "title": "Como eu posso compartilhar arquivos de maneira anônima usando Tor?", + "description": "Muitos relays de saída sao configurados para bloquear certos tipos de tráfegos de compartilhamento de arquivos, como Bittorrent. Bittorrent em particular <a href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\">não é anônimo no Tor</a>.Para compartilhar arquivos no Tor, <a href=\"https://onionshare.org/\">OnionShare</a> é a melhor opção." + }, + "misc-13": { + "id": "#misc-13", + "control": "misc-13", + "title": "Eu posso utilizar VPN com o Tor?", + "description": "De um modo geral, não recomendamos usar um VPN com Tor a menos que você tenha conhecimentos avançados para configurar ambos de uma forma que não comprometa a sua privacidade. Você pode encontrar informações mais detalhadas sobre o Tor + VPN no <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN\">nosso wiki</a>." + }, + "misc-14": { + "id": "#misc-14", + "control": "misc-14", + "title": "Como eu posso ser voluntária/o no Projeto Tor?", + "description": "Por favor, consulte a nossa <a href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">página de voluntariado</a> para saber como participar!" + }, + "misc-15": { + "id": "#misc-15", + "control": "misc-15", + "title": "Como posso doar ao Projeto Tor?", + "description": "Agradecemos o seu apoio! Você encontrará mais informações sobre como doar na nossa <a href=\"https://donate.torproject.org/donor-faq\">Página de perguntas frequentes sobre doação</a>." + } +}

1 0

[translation/support-miscellaneous] Update translations for support-miscellaneous
by translation＠torproject.org 18 Jun '18

18 Jun '18

commit b68a2de94ce02b3e08cba77d78f965b826002838 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 18 18:49:30 2018 +0000 Update translations for support-miscellaneous --- pt_BR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR.json b/pt_BR.json index 99c7be2f6..8b6f55d9f 100644 --- a/pt_BR.json +++ b/pt_BR.json @@ -62,7 +62,7 @@ "misc-11": { "id": "#misc-11", "control": "misc-11", - "title": "Can I change the number of hops Tor uses?", + "title": "Posso alterar o número de saltos que o TOR usa?", "description": "Nesse momento, o comprimento do trajeto é codificado em 3, mais o número de nós no seu caminho, que são variáveis. Isto é, normalmente são 3, mas, por exemplo, se você estiver acessando um serviço .onion ou um endereço de \"saída\", pode ser mais.<p class=\"mb-3\"We don't want to encourage people to use paths longer than this as it increases load on the network without (as far as we can tell) providing any more security. Also, using paths longer than 3 could harm anonymity, first because it makes<a href=\"https://www.freehaven.net/anonbib/#ccs07-doa\"> ataques de denegação de segurança</a> mais fáceis. segundo, porque ele poderia ser usado como um identificador se apenas um pequeno número de usuários tivessem o mesmo comprimento de caminho que você." }, "misc-12": {

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 18 Jun '18

18 Jun '18

commit 8c2307c12a4dc8f8f45682eb2709ab5e49f3764c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 18 18:48:40 2018 +0000 Update translations for exoneratorproperties --- te/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/te/exonerator.properties b/te/exonerator.properties index 936754ae5..199a0a71e 100644 --- a/te/exonerator.properties +++ b/te/exonerator.properties @@ -1,7 +1,7 @@ form.explanation=Enter an IP address and date to find out whether that address was used as a Tor relay: form.ip.label=IP address form.timestamp.label=Date -form.search.label=Search +form.search.label=శోధన summary.heading=Summary summary.serverproblem.dbnoconnect.title=Server problem summary.serverproblem.dbnoconnect.body.text=Unable to connect to the database. Please try again later. If this problem persists, please %s!

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 18 Jun '18

18 Jun '18

commit 434d2fae009b4483140403c168255b0f7501bafc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 18 18:48:31 2018 +0000 Update translations for tails-greeter-2 --- te/te.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/te/te.po b/te/te.po index 56860e37e..98470a266 100644 --- a/te/te.po +++ b/te/te.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-01 20:26+0100\n" +"POT-Creation-Date: 2018-05-07 19:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Tor Project <support-team-private(a)lists.torproject.org>, 2016\n" +"Last-Translator: sonusandeep <kapalawai.sandeep.sandeep(a)gmail.com>, 2018\n" "Language-Team: Telugu (https://www.transifex.com/otf/teams/1519/te/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -255,7 +255,7 @@ msgstr "Cancel" #: ../tailsgreeter/gui.py:608 msgid "Add" -msgstr "" +msgstr "జోడించండి" #: ../tailsgreeter/gui.py:616 msgid "Back"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 18 Jun '18

18 Jun '18

commit 5269dfe2d02ef7b1cc27e27014bf9126bd9e03bf Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 18 18:46:11 2018 +0000 Update translations for mat-gui --- te.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/te.po b/te.po index bd4fcd217..8808b12cd 100644 --- a/te.po +++ b/te.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2017-09-19 19:57+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-06-18 18:44+0000\n" +"Last-Translator: sonusandeep <kapalawai.sandeep.sandeep(a)gmail.com>\n" "Language-Team: Telugu (http://www.transifex.com/otf/torproject/language/te/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -148,7 +148,7 @@ msgstr "" #: data/mat.glade:187 msgid "Add" -msgstr "" +msgstr "జోడించండి" #: data/mat.glade:256 msgid "State"

1 0

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

18 Jun '18

commit c72ab056a35a283e25fa09d17a772f287a4b0c00 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 18 18:45:39 2018 +0000 Update translations for https_everywhere_completed --- pt_BR/https-everywhere.dtd | 10 ++++++++-- pt_BR/ssl-observatory.dtd | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd index 9039aacd5..8a5fcb2b7 100644 --- a/pt_BR/https-everywhere.dtd +++ b/pt_BR/https-everywhere.dtd @@ -2,6 +2,7 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Criptografar a Web! Use automaticamente a segurança HTTPS em diversos sites."> <!ENTITY https-everywhere.about.version "Versão"> +<!ENTITY https-everywhere.about.rulesets_version "Versão de Rulesets para"> <!ENTITY https-everywhere.about.add_new_rule "Adicionar nova regra "> <!ENTITY https-everywhere.menu.donate_eff_imperative "Doar para EFF"> @@ -12,18 +13,23 @@ <!ENTITY https-everywhere.menu.viewAllRules "Consultar Todas as Regras"> <!ENTITY https-everywhere.options.generalSettings "Configurações Gerais"> +<!ENTITY https-everywhere.options.advancedSettings "Configurações Avançadas"> <!ENTITY https-everywhere.options.importSettings "Importar Configurações"> <!ENTITY https-everywhere.options.import "Importar"> +<!ENTITY https-everywhere.options.enableMixedRulesets "Habilitar conjuntos de regras de conteúdo misto"> +<!ENTITY https-everywhere.options.showDevtoolsTab "Exibir aba das ferramentas de desenvolvedor"> +<!ENTITY https-everywhere.options.autoUpdateRulesets "Atualizar automaticamente os conjuntos de regras"> <!ENTITY https-everywhere.options.imported "As suas configurações foram importadas."> <!ENTITY https-everywhere.prefs.export_settings "Exportar Configurações"> <!ENTITY https-everywhere.prefs.reset_defaults "Restaurar as configurações padrão"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "Isso colocará cada conjunto de regras de volta ao seu estado inicial. Deseja continuar?"> -<!ENTITY https-everywhere.chrome.stable_rules "protecção colectiva"> +<!ENTITY https-everywhere.chrome.stable_rules "Regras estáveis"> <!ENTITY https-everywhere.chrome.stable_rules_description "Forçar conexões criptografadas para estes sites:"> <!ENTITY https-everywhere.chrome.experimental_rules "Regras experimentais"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Pode causar avisos ou ruptura. Desabilitado por padrão."> -<!ENTITY https-everywhere.chrome.add_rule "Adicione uma regra para esse site"> +<!ENTITY https-everywhere.chrome.add_rule "Adicione uma exceção para esse site"> <!ENTITY https-everywhere.chrome.add_new_rule "Adicione uma nova regra para esse site"> <!ENTITY https-everywhere.chrome.always_https_for_host "Sempre usar https para este hospedeiro"> <!ENTITY https-everywhere.chrome.host "Hospedeiro:"> diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd index 34003060d..c08ac1e47 100644 --- a/pt_BR/ssl-observatory.dtd +++ b/pt_BR/ssl-observatory.dtd @@ -88,7 +88,7 @@ recebido pelo Observatório indicará que alguém visitou esse site, mas não qu <!ENTITY ssl-observatory.warning.title "AVISO do Observatório SSL de EFF"> <!ENTITY ssl-observatory.warning.showcert "Mostrar a cadeia de certificado"> <!ENTITY ssl-observatory.warning.okay "Eu entendo"> -<!ENTITY ssl-observatory.warning.text "O Observatório SSL de EFF emitiu um aviso sobre o(s) certificados(s) HTTPS para este site:"> +<!ENTITY ssl-observatory.warning.text "O Observatório de SSL da EFF emitiu um aviso sobre o(s) certificado(s) HTTPS desse site:"> <!ENTITY ssl-observatory.warning.defense "Se você estiver registrado neste site, é conselhável trocar a sua senha assim que você tiver uma conexão segura. (Essas advertências podem ser desabilitadas na opção "Observatório SSL" na seção Preferências da caixa de diálogo do HTTP Everywhere)."> <!ENTITY ssl-observatory.prefs.self_signed

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 18 Jun '18

18 Jun '18

commit 0356d77f39e119910da748c433c3d3ab69e58b21 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 18 18:45:30 2018 +0000 Update translations for https_everywhere --- pt_BR/https-everywhere.dtd | 10 +++++----- pt_BR/ssl-observatory.dtd | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd index da1eced6f..8a5fcb2b7 100644 --- a/pt_BR/https-everywhere.dtd +++ b/pt_BR/https-everywhere.dtd @@ -16,16 +16,16 @@ <!ENTITY https-everywhere.options.advancedSettings "Configurações Avançadas"> <!ENTITY https-everywhere.options.importSettings "Importar Configurações"> <!ENTITY https-everywhere.options.import "Importar"> -<!ENTITY https-everywhere.options.enableMixedRulesets "Enable mixed content rulesets"> -<!ENTITY https-everywhere.options.showDevtoolsTab "Show Devtools tab"> -<!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-update rulesets"> +<!ENTITY https-everywhere.options.enableMixedRulesets "Habilitar conjuntos de regras de conteúdo misto"> +<!ENTITY https-everywhere.options.showDevtoolsTab "Exibir aba das ferramentas de desenvolvedor"> +<!ENTITY https-everywhere.options.autoUpdateRulesets "Atualizar automaticamente os conjuntos de regras"> <!ENTITY https-everywhere.options.imported "As suas configurações foram importadas."> <!ENTITY https-everywhere.prefs.export_settings "Exportar Configurações"> <!ENTITY https-everywhere.prefs.reset_defaults "Restaurar as configurações padrão"> -<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "Isso colocará cada conjunto de regras de volta ao seu estado inicial. Deseja continuar?"> -<!ENTITY https-everywhere.chrome.stable_rules "protecção colectiva"> +<!ENTITY https-everywhere.chrome.stable_rules "Regras estáveis"> <!ENTITY https-everywhere.chrome.stable_rules_description "Forçar conexões criptografadas para estes sites:"> <!ENTITY https-everywhere.chrome.experimental_rules "Regras experimentais"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Pode causar avisos ou ruptura. Desabilitado por padrão."> diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd index 436786e1d..c08ac1e47 100644 --- a/pt_BR/ssl-observatory.dtd +++ b/pt_BR/ssl-observatory.dtd @@ -88,7 +88,7 @@ recebido pelo Observatório indicará que alguém visitou esse site, mas não qu <!ENTITY ssl-observatory.warning.title "AVISO do Observatório SSL de EFF"> <!ENTITY ssl-observatory.warning.showcert "Mostrar a cadeia de certificado"> <!ENTITY ssl-observatory.warning.okay "Eu entendo"> -<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificate(s) for this site:"> +<!ENTITY ssl-observatory.warning.text "O Observatório de SSL da EFF emitiu um aviso sobre o(s) certificado(s) HTTPS desse site:"> <!ENTITY ssl-observatory.warning.defense "Se você estiver registrado neste site, é conselhável trocar a sua senha assim que você tiver uma conexão segura. (Essas advertências podem ser desabilitadas na opção "Observatório SSL" na seção Preferências da caixa de diálogo do HTTP Everywhere)."> <!ENTITY ssl-observatory.prefs.self_signed

1 0

[tor/master] Split vote_{microdesc_hash, routerstatus}_t into their own headers
by nickm＠torproject.org 18 Jun '18

18 Jun '18

commit 72d2fd83d898c2a7151c7fdbbffbc4c25fe34894 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 15 13:23:02 2018 -0400 Split vote_{microdesc_hash,routerstatus}_t into their own headers --- src/or/dirauth/dircollate.c | 2 ++ src/or/dirauth/dirvote.c | 2 ++ src/or/dirserv.c | 1 + src/or/include.am | 2 ++ src/or/networkstatus.c | 2 ++ src/or/or.h | 41 ++--------------------------------------- src/or/routerlist.c | 1 + src/or/routerparse.c | 2 ++ src/or/vote_microdesc_hash_st.h | 22 ++++++++++++++++++++++ src/or/vote_routerstatus_st.h | 39 +++++++++++++++++++++++++++++++++++++++ src/test/fuzz/fuzz_vrs.c | 3 +++ src/test/test_dir.c | 2 ++ src/test/test_dir_common.c | 3 +++ src/test/test_guardfraction.c | 3 +++ 14 files changed, 86 insertions(+), 39 deletions(-) diff --git a/src/or/dirauth/dircollate.c b/src/or/dirauth/dircollate.c index dec6f7515..388885fe0 100644 --- a/src/or/dirauth/dircollate.c +++ b/src/or/dirauth/dircollate.c @@ -25,6 +25,8 @@ #include "dircollate.h" #include "dirvote.h" +#include "vote_routerstatus_st.h" + static void dircollator_collate_by_ed25519(dircollator_t *dc); /** Hashtable entry mapping a pair of digests (actually an ed25519 key and an diff --git a/src/or/dirauth/dirvote.c b/src/or/dirauth/dirvote.c index 41acc21d6..c702ca697 100644 --- a/src/or/dirauth/dirvote.c +++ b/src/or/dirauth/dirvote.c @@ -30,6 +30,8 @@ #include "dir_server_st.h" #include "node_st.h" +#include "vote_microdesc_hash_st.h" +#include "vote_routerstatus_st.h" #include "vote_timing_st.h" /** diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 3af057c6c..c4edb94af 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -39,6 +39,7 @@ #include "dir_connection_st.h" #include "node_st.h" #include "tor_version_st.h" +#include "vote_routerstatus_st.h" /** * \file dirserv.c diff --git a/src/or/include.am b/src/or/include.am index ee1ee562c..d9eeb15f3 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -301,6 +301,8 @@ ORHEADERS = \ src/or/torcert.h \ src/or/tor_api_internal.h \ src/or/tor_version_st.h \ + src/or/vote_microdesc_hash_st.h \ + src/or/vote_routerstatus_st.h \ src/or/vote_timing_st.h \ src/or/voting_schedule.h diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 4ac2034cd..3f90fea4e 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -77,6 +77,8 @@ #include "dir_connection_st.h" #include "dir_server_st.h" #include "node_st.h" +#include "vote_microdesc_hash_st.h" +#include "vote_routerstatus_st.h" /** Most recently received and validated v3 "ns"-flavored consensus network * status. */ diff --git a/src/or/or.h b/src/or/or.h index f2de729ec..23f565857 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1858,45 +1858,8 @@ typedef struct microdesc_t { } microdesc_t; typedef struct node_t node_t; - -/** Linked list of microdesc hash lines for a single router in a directory - * vote. - */ -typedef struct vote_microdesc_hash_t { - /** Next element in the list, or NULL. */ - struct vote_microdesc_hash_t *next; - /** The raw contents of the microdesc hash line, from the "m" through the - * newline. */ - char *microdesc_hash_line; -} vote_microdesc_hash_t; - -/** The claim about a single router, made in a vote. */ -typedef struct vote_routerstatus_t { - routerstatus_t status; /**< Underlying 'status' object for this router. - * Flags are redundant. */ - /** How many known-flags are allowed in a vote? This is the width of - * the flags field of vote_routerstatus_t */ -#define MAX_KNOWN_FLAGS_IN_VOTE 64 - uint64_t flags; /**< Bit-field for all recognized flags; index into - * networkstatus_t.known_flags. */ - char *version; /**< The version that the authority says this router is - * running. */ - char *protocols; /**< The protocols that this authority says this router - * provides. */ - unsigned int has_measured_bw:1; /**< The vote had a measured bw */ - /** True iff the vote included an entry for ed25519 ID, or included - * "id ed25519 none" to indicate that there was no ed25519 ID. */ - unsigned int has_ed25519_listing:1; - /** True if the Ed25519 listing here is the consensus-opinion for the - * Ed25519 listing; false if there was no consensus on Ed25519 key status, - * or if this VRS doesn't reflect it. */ - unsigned int ed25519_reflects_consensus:1; - uint32_t measured_bw_kb; /**< Measured bandwidth (capacity) of the router */ - /** The hash or hashes that the authority claims this microdesc has. */ - vote_microdesc_hash_t *microdesc; - /** Ed25519 identity for this router, or zero if it has none. */ - uint8_t ed25519_id[ED25519_PUBKEY_LEN]; -} vote_routerstatus_t; +typedef struct vote_microdesc_hash_t vote_microdesc_hash_t; +typedef struct vote_routerstatus_t vote_routerstatus_t; /** A signature of some document by an authority. */ typedef struct document_signature_t { diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 313685784..4d02c42a4 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -128,6 +128,7 @@ #include "dir_connection_st.h" #include "dir_server_st.h" #include "node_st.h" +#include "vote_routerstatus_st.h" // #define DEBUG_ROUTERLIST diff --git a/src/or/routerparse.c b/src/or/routerparse.c index e75dc2ee9..b7d50a1da 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -85,6 +85,8 @@ #include "rend_intro_point_st.h" #include "rend_service_descriptor_st.h" #include "tor_version_st.h" +#include "vote_microdesc_hash_st.h" +#include "vote_routerstatus_st.h" #undef log #include <math.h> diff --git a/src/or/vote_microdesc_hash_st.h b/src/or/vote_microdesc_hash_st.h new file mode 100644 index 000000000..a7cbf5acd --- /dev/null +++ b/src/or/vote_microdesc_hash_st.h @@ -0,0 +1,22 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2017, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef VOTE_MICRODESC_HASH_ST_H +#define VOTE_MICRODESC_HASH_ST_H + +/** Linked list of microdesc hash lines for a single router in a directory + * vote. + */ +struct vote_microdesc_hash_t { + /** Next element in the list, or NULL. */ + struct vote_microdesc_hash_t *next; + /** The raw contents of the microdesc hash line, from the "m" through the + * newline. */ + char *microdesc_hash_line; +}; + +#endif + diff --git a/src/or/vote_routerstatus_st.h b/src/or/vote_routerstatus_st.h new file mode 100644 index 000000000..71c204fad --- /dev/null +++ b/src/or/vote_routerstatus_st.h @@ -0,0 +1,39 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2017, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef VOTE_ROUTERSTATUS_ST_H +#define VOTE_ROUTERSTATUS_ST_H + +/** The claim about a single router, made in a vote. */ +struct vote_routerstatus_t { + routerstatus_t status; /**< Underlying 'status' object for this router. + * Flags are redundant. */ + /** How many known-flags are allowed in a vote? This is the width of + * the flags field of vote_routerstatus_t */ +#define MAX_KNOWN_FLAGS_IN_VOTE 64 + uint64_t flags; /**< Bit-field for all recognized flags; index into + * networkstatus_t.known_flags. */ + char *version; /**< The version that the authority says this router is + * running. */ + char *protocols; /**< The protocols that this authority says this router + * provides. */ + unsigned int has_measured_bw:1; /**< The vote had a measured bw */ + /** True iff the vote included an entry for ed25519 ID, or included + * "id ed25519 none" to indicate that there was no ed25519 ID. */ + unsigned int has_ed25519_listing:1; + /** True if the Ed25519 listing here is the consensus-opinion for the + * Ed25519 listing; false if there was no consensus on Ed25519 key status, + * or if this VRS doesn't reflect it. */ + unsigned int ed25519_reflects_consensus:1; + uint32_t measured_bw_kb; /**< Measured bandwidth (capacity) of the router */ + /** The hash or hashes that the authority claims this microdesc has. */ + vote_microdesc_hash_t *microdesc; + /** Ed25519 identity for this router, or zero if it has none. */ + uint8_t ed25519_id[ED25519_PUBKEY_LEN]; +}; + +#endif + diff --git a/src/test/fuzz/fuzz_vrs.c b/src/test/fuzz/fuzz_vrs.c index baf0610a0..7225fd545 100644 --- a/src/test/fuzz/fuzz_vrs.c +++ b/src/test/fuzz/fuzz_vrs.c @@ -7,6 +7,9 @@ #include "memarea.h" #include "microdesc.h" #include "networkstatus.h" + +#include "vote_routerstatus_st.h" + #include "fuzzing.h" static void diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 43fc5c5fb..963d97a32 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -47,6 +47,8 @@ #include "port_cfg_st.h" #include "tor_version_st.h" +#include "vote_microdesc_hash_st.h" +#include "vote_routerstatus_st.h" #define NS_MODULE dir diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c index 230410f7f..4b36025b5 100644 --- a/src/test/test_dir_common.c +++ b/src/test/test_dir_common.c @@ -14,6 +14,9 @@ #include "test_dir_common.h" #include "voting_schedule.h" +#include "vote_microdesc_hash_st.h" +#include "vote_routerstatus_st.h" + void dir_common_setup_vote(networkstatus_t **vote, time_t now); networkstatus_t * dir_common_add_rs_and_parse(networkstatus_t *vote, networkstatus_t **vote_out, diff --git a/src/test/test_guardfraction.c b/src/test/test_guardfraction.c index 51ca8f08e..24bf58f94 100644 --- a/src/test/test_guardfraction.c +++ b/src/test/test_guardfraction.c @@ -15,6 +15,9 @@ #include "routerparse.h" #include "networkstatus.h" +#include "vote_microdesc_hash_st.h" +#include "vote_routerstatus_st.h" + #include "test.h" #include "test_helpers.h" #include "log_test_helpers.h"

1 0

[tor/master] Split socks_request_t into its own header.
by nickm＠torproject.org 18 Jun '18

18 Jun '18

commit 8b7df723596d068cbf91abf7535651ab8445810b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 15 13:01:50 2018 -0400 Split socks_request_t into its own header. --- src/or/circuituse.c | 1 + src/or/connection.c | 1 + src/or/connection_edge.c | 1 + src/or/control.c | 1 + src/or/dnsserv.c | 1 + src/or/include.am | 1 + src/or/main.c | 1 + src/or/or.h | 48 ------------------------------- src/or/proto_socks.c | 2 ++ src/or/relay.c | 1 + src/or/socks_request_st.h | 59 +++++++++++++++++++++++++++++++++++++++ src/test/fuzz/fuzz_http_connect.c | 1 + src/test/test_connection.c | 1 + src/test/test_entryconn.c | 1 + src/test/test_hs_client.c | 1 + src/test/test_relaycell.c | 1 + src/test/test_socks.c | 1 + 17 files changed, 75 insertions(+), 48 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 626aff7bb..370e2c0b7 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -62,6 +62,7 @@ #include "entry_connection_st.h" #include "or_circuit_st.h" #include "origin_circuit_st.h" +#include "socks_request_st.h" static void circuit_expire_old_circuits_clientside(void); static void circuit_increment_failure_count(void); diff --git a/src/or/connection.c b/src/or/connection.c index 867c4d72d..283f09652 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -119,6 +119,7 @@ #include "listener_connection_st.h" #include "or_connection_st.h" #include "port_cfg_st.h" +#include "socks_request_st.h" static connection_t *connection_listener_new( const struct sockaddr *listensockaddr, diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 27ee0ea27..ce018e874 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -102,6 +102,7 @@ #include "entry_connection_st.h" #include "or_circuit_st.h" #include "origin_circuit_st.h" +#include "socks_request_st.h" #ifdef HAVE_LINUX_TYPES_H #include <linux/types.h> diff --git a/src/or/control.c b/src/or/control.c index 966ddfa8c..20da12259 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -90,6 +90,7 @@ #include "rend_authorized_client_st.h" #include "rend_encoded_v2_service_descriptor_st.h" #include "rend_service_descriptor_st.h" +#include "socks_request_st.h" #ifndef _WIN32 #include <pwd.h> diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 020cabb16..c286d4f93 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -33,6 +33,7 @@ #include "control_connection_st.h" #include "entry_connection_st.h" #include "listener_connection_st.h" +#include "socks_request_st.h" #include <event2/dns.h> #include <event2/dns_compat.h> diff --git a/src/or/include.am b/src/or/include.am index 87a353828..4e0e1e9a4 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -294,6 +294,7 @@ ORHEADERS = \ src/or/scheduler.h \ src/or/server_port_cfg_st.h \ src/or/shared_random_client.h \ + src/or/socks_request_st.h \ src/or/statefile.h \ src/or/status.h \ src/or/torcert.h \ diff --git a/src/or/main.c b/src/or/main.c index 7b6010170..0daebfc4f 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -125,6 +125,7 @@ #include "entry_connection_st.h" #include "or_connection_st.h" #include "port_cfg_st.h" +#include "socks_request_st.h" #ifdef HAVE_SYSTEMD # if defined(__COVERITY__) && !defined(__INCLUDE_LEVEL__) diff --git a/src/or/or.h b/src/or/or.h index 5707e0202..19d0bb2ab 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3587,54 +3587,6 @@ typedef struct { #define SOCKS_COMMAND_IS_RESOLVE(c) ((c)==SOCKS_COMMAND_RESOLVE || \ (c)==SOCKS_COMMAND_RESOLVE_PTR) -/** State of a SOCKS request from a user to an OP. Also used to encode other - * information for non-socks user request (such as those on TransPort and - * DNSPort) */ -struct socks_request_t { - /** Which version of SOCKS did the client use? One of "0, 4, 5" -- where - * 0 means that no socks handshake ever took place, and this is just a - * stub connection (e.g. see connection_ap_make_link()). */ - uint8_t socks_version; - /** If using socks5 authentication, which authentication type did we - * negotiate? currently we support 0 (no authentication) and 2 - * (username/password). */ - uint8_t auth_type; - /** What is this stream's goal? One of the SOCKS_COMMAND_* values */ - uint8_t command; - /** Which kind of listener created this stream? */ - uint8_t listener_type; - size_t replylen; /**< Length of reply. */ - uint8_t reply[MAX_SOCKS_REPLY_LEN]; /**< Write an entry into this string if - * we want to specify our own socks reply, - * rather than using the default socks4 or - * socks5 socks reply. We use this for the - * two-stage socks5 handshake. - */ - char address[MAX_SOCKS_ADDR_LEN]; /**< What address did the client ask to - connect to/resolve? */ - uint16_t port; /**< What port did the client ask to connect to? */ - unsigned int has_finished : 1; /**< Has the SOCKS handshake finished? Used to - * make sure we send back a socks reply for - * every connection. */ - unsigned int got_auth : 1; /**< Have we received any authentication data? */ - /** If this is set, we will choose "no authentication" instead of - * "username/password" authentication if both are offered. Used as input to - * parse_socks. */ - unsigned int socks_prefer_no_auth : 1; - - /** Number of bytes in username; 0 if username is NULL */ - size_t usernamelen; - /** Number of bytes in password; 0 if password is NULL */ - uint8_t passwordlen; - /** The negotiated username value if any (for socks5), or the entire - * authentication string (for socks4). This value is NOT nul-terminated; - * see usernamelen for its length. */ - char *username; - /** The negotiated password value if any (for socks5). This value is NOT - * nul-terminated; see passwordlen for its length. */ - char *password; -}; - /********************************* circuitbuild.c **********************/ /** How many hops does a general-purpose circuit have by default? */ diff --git a/src/or/proto_socks.c b/src/or/proto_socks.c index 57a7d1cd6..1b67c6c28 100644 --- a/src/or/proto_socks.c +++ b/src/or/proto_socks.c @@ -14,6 +14,8 @@ #include "proto_socks.h" #include "reasons.h" +#include "socks_request_st.h" + static void socks_request_set_socks5_error(socks_request_t *req, socks5_reply_status_t reason); diff --git a/src/or/relay.c b/src/or/relay.c index 127609a2b..1eaf6f7db 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -87,6 +87,7 @@ #include "entry_connection_st.h" #include "or_circuit_st.h" #include "origin_circuit_st.h" +#include "socks_request_st.h" static edge_connection_t *relay_lookup_conn(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction, diff --git a/src/or/socks_request_st.h b/src/or/socks_request_st.h new file mode 100644 index 000000000..debf87bf0 --- /dev/null +++ b/src/or/socks_request_st.h @@ -0,0 +1,59 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2017, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef SOCKS_REQUEST_ST_H +#define SOCKS_REQUEST_ST_H + +/** State of a SOCKS request from a user to an OP. Also used to encode other + * information for non-socks user request (such as those on TransPort and + * DNSPort) */ +struct socks_request_t { + /** Which version of SOCKS did the client use? One of "0, 4, 5" -- where + * 0 means that no socks handshake ever took place, and this is just a + * stub connection (e.g. see connection_ap_make_link()). */ + uint8_t socks_version; + /** If using socks5 authentication, which authentication type did we + * negotiate? currently we support 0 (no authentication) and 2 + * (username/password). */ + uint8_t auth_type; + /** What is this stream's goal? One of the SOCKS_COMMAND_* values */ + uint8_t command; + /** Which kind of listener created this stream? */ + uint8_t listener_type; + size_t replylen; /**< Length of reply. */ + uint8_t reply[MAX_SOCKS_REPLY_LEN]; /**< Write an entry into this string if + * we want to specify our own socks reply, + * rather than using the default socks4 or + * socks5 socks reply. We use this for the + * two-stage socks5 handshake. + */ + char address[MAX_SOCKS_ADDR_LEN]; /**< What address did the client ask to + connect to/resolve? */ + uint16_t port; /**< What port did the client ask to connect to? */ + unsigned int has_finished : 1; /**< Has the SOCKS handshake finished? Used to + * make sure we send back a socks reply for + * every connection. */ + unsigned int got_auth : 1; /**< Have we received any authentication data? */ + /** If this is set, we will choose "no authentication" instead of + * "username/password" authentication if both are offered. Used as input to + * parse_socks. */ + unsigned int socks_prefer_no_auth : 1; + + /** Number of bytes in username; 0 if username is NULL */ + size_t usernamelen; + /** Number of bytes in password; 0 if password is NULL */ + uint8_t passwordlen; + /** The negotiated username value if any (for socks5), or the entire + * authentication string (for socks4). This value is NOT nul-terminated; + * see usernamelen for its length. */ + char *username; + /** The negotiated password value if any (for socks5). This value is NOT + * nul-terminated; see passwordlen for its length. */ + char *password; +}; + +#endif + diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c index 4b1ea8c72..255a34169 100644 --- a/src/test/fuzz/fuzz_http_connect.c +++ b/src/test/fuzz/fuzz_http_connect.c @@ -16,6 +16,7 @@ #include "torlog.h" #include "entry_connection_st.h" +#include "socks_request_st.h" #include "fuzzing.h" diff --git a/src/test/test_connection.c b/src/test/test_connection.c index 9f50d9f84..93d5dc846 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -27,6 +27,7 @@ #include "dir_connection_st.h" #include "entry_connection_st.h" #include "or_connection_st.h" +#include "socks_request_st.h" static void * test_conn_get_basic_setup(const struct testcase_t *tc); static int test_conn_get_basic_teardown(const struct testcase_t *tc, diff --git a/src/test/test_entryconn.c b/src/test/test_entryconn.c index ec8d7196e..1c1eda02f 100644 --- a/src/test/test_entryconn.c +++ b/src/test/test_entryconn.c @@ -20,6 +20,7 @@ #include "rendcache.h" #include "entry_connection_st.h" +#include "socks_request_st.h" static void * entryconn_rewrite_setup(const struct testcase_t *tc) diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c index 98e95be09..b75e743d3 100644 --- a/src/test/test_hs_client.c +++ b/src/test/test_hs_client.c @@ -42,6 +42,7 @@ #include "dir_connection_st.h" #include "entry_connection_st.h" #include "origin_circuit_st.h" +#include "socks_request_st.h" static int mock_connection_ap_handshake_send_begin(entry_connection_t *ap_conn) diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index 0d78f97d8..b5aba766d 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -19,6 +19,7 @@ #include "crypt_path_st.h" #include "entry_connection_st.h" #include "origin_circuit_st.h" +#include "socks_request_st.h" static int srm_ncalls; static entry_connection_t *srm_conn; diff --git a/src/test/test_socks.c b/src/test/test_socks.c index 8da7191e8..6c266438e 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -9,6 +9,7 @@ #include "proto_socks.h" #include "test.h" #include "log_test_helpers.h" +#include "socks_request_st.h" typedef struct socks_test_data_t { socks_request_t *req;

1 0