tor-commits November 2014

tor-commits@lists.torproject.org

24 participants
954 discussions

[tor/master] Document the calloc function overflow check.
by nickm＠torproject.org 02 Nov '14

02 Nov '14

commit 81b452d245c19e9a16681567b9dbcf0f7a71ac78 Author: Mansour Moufid <mansourmoufid(a)gmail.com> Date: Sun Oct 19 13:12:11 2014 -0400 Document the calloc function overflow check. --- src/common/util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/util.c b/src/common/util.c index 013a501..74a538e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -195,8 +195,10 @@ tor_malloc_zero_(size_t size DMALLOC_PARAMS) return result; } +/* Estimate the … [View More]

1 0

[support-tools/master] train-spam-filters: do perform deletions
by lunar＠torproject.org 02 Nov '14

02 Nov '14

commit c890f5afe28d703dc0358aaf29debc22d1869657 Author: Lunar <lunar(a)torproject.org> Date: Sun Nov 2 15:50:34 2014 +0100 train-spam-filters: do perform deletions --- train-spam-filters/train_spam_filters | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/train-spam-filters/train_spam_filters b/train-spam-filters/train_spam_filters index c8f64dc..b2f89fe 100755 --- a/train-spam-filters/train_spam_filters +++ b/train-spam-filters/train_spam_filters @@ -82,7 … [View More]

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 02 Nov '14

02 Nov '14

commit ad07d82b613e77cbc7bf5e093191103548574c05 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 2 11:15:46 2014 +0000 Update translations for torbutton-torbuttonproperties --- sl_SI/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sl_SI/torbutton.properties b/sl_SI/torbutton.properties index 63f1cb7..b5e73da 100644 --- a/sl_SI/torbutton.properties +++ b/sl_SI/torbutton.properties @@ -41,14 +41,14 @@ … [View More]torbutton.popup.pref_error = Torbutton ne more posodobiti nastavitve v imeniku p torbutton.popup.permission_denied = Prosimo vas, da ponastavite dovoljenja imenika Tor brskalnika ali pa ga kopirate na novo lokacijo. torbutton.popup.device_full = Disk je verjetno poln. Prosimo sprostite prostor ali premaknite Tor brskalnik na drugo napravo. torbutton.title.prompt_torbrowser = Pomembne Torbutton informacije -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. +torbutton.popup.prompt_torbrowser = Torbutton sedaj deluje drugače: Nemogoče ga je ugasniti.\n\nTo spremembo smo naredili, ker ni varna uporaba Torbutton v brskalniku, ki je namenjena tudi za brskanje non-Tor. Bilo je preveč hroščev in nismo našli nobene druge poti.\n\nČe želite še naprej uporabljati Firefox običajno, morate odstraniti Torbutton in naložiti sveženj Tor brskalnik. Lastnosti zasebnosti Tor brskalnika so tudi boljše od običajnega Firefox-a, tudi ko se Firefox uporablja z Torbutton.\n\nČe želite odstraniti Torbutton, pojdite v Orodja-> Dodatki-> Razširitve, nato kliknite na gumb Odstrani Torbutton. torbutton.popup.short_torbrowser = Važna informacija Torbutton!\n\nTorbutton je sedaj vedno omogočen.\n\nKliknite na Torbutton za več informacij. -torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n +torbutton.popup.confirm_plugins = Vtičniki kot Flash lahko poškodujejo vašo privatnost in anonimnost\n\nLahko tudi obidejo Tor za razkritje vaše lokacije in IP naslova.\n\nSte prepričani, da želite omogočiti vtičnike?\n\n torbutton.popup.never_ask_again = Ne vprašaj me ponovno # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Ta spletna stran (% S) poskušal izvleči podatke platno slikovne HTML5, ki se lahko uporabljajo za identifikacijo vaše computer.\n\nAli lahko Tor brskalnik dopusti spletni strani pridobivanje podatkov HTML5 canvas slike? +canvas.siteprompt=Ta spletna stran (% S) poskuša izvleči HTML5 canvas slikovne podatke , ki se lahko uporabljajo za identifikacijo vašega računalnika.\n\nAli lahko Tor brskalnik dovoli tej spletni strani pridobivanje HTML5 canvas slikovnih podatkov? canvas.notNow=Ne sedaj canvas.notNowAccessKey=N canvas.allow=Dovoli v prihodnje [View Less]

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 02 Nov '14

02 Nov '14

commit 4c25fa7d7bd526c9e4e36b9f7d7d2bff7a783a67 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 2 10:45:49 2014 +0000 Update translations for torbutton-torbuttonproperties --- sl_SI/torbutton.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sl_SI/torbutton.properties b/sl_SI/torbutton.properties index 26f5b27..63f1cb7 100644 --- a/sl_SI/torbutton.properties +++ b/sl_SI/torbutton.properties @@ -34,21 +34,21 @… [View More]@ torbutton.popup.captcha.ask = Torbutton je zaznal Google Captcha. Želite preusm torbutton.popup.captcha.always = Vedno izvedi to dejanje torbutton.popup.redirect = Preusmeri torbutton.popup.no_redirect = Brez preusmeritve -torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? -torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor(a)torproject.org or by downloading it at the following URL: -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. +torbutton.popup.prompted_language = Za vašo večjo privatnost lahko Torbutton zahteva angleško verzijo web strani. To povzroči, da berete web stran, namesto v vašem jeziku, v angleščini.\n\nŽelite zahtevati, za boljšo privatnost, angleške web strani? +torbutton.popup.no_newnym = Torbutton vam ne more varno zagotoviti nove identite. Nima dostopa do Tor kontrolnega porta.\n\nAli zaganjate sveženj Tor brskalnika? +torbutton.popup.use_tbb = Zgleda, da uporabljate Torbutton z Firefox-om, ki ni več vreden zaupanja.\n\nZato vam priporočamo, da pridobite najnovejši sveženj Tor brskalnika s pošiljanjem e-pisma na gettor(a)torproject.org ali prenosom iz sledečega URL-ja: +torbutton.popup.pref_error = Torbutton ne more posodobiti nastavitve v imeniku profila Tor brskalnika. +torbutton.popup.permission_denied = Prosimo vas, da ponastavite dovoljenja imenika Tor brskalnika ali pa ga kopirate na novo lokacijo. torbutton.popup.device_full = Disk je verjetno poln. Prosimo sprostite prostor ali premaknite Tor brskalnik na drugo napravo. torbutton.title.prompt_torbrowser = Pomembne Torbutton informacije torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. -torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. +torbutton.popup.short_torbrowser = Važna informacija Torbutton!\n\nTorbutton je sedaj vedno omogočen.\n\nKliknite na Torbutton za več informacij. torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n torbutton.popup.never_ask_again = Ne vprašaj me ponovno # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? +canvas.siteprompt=Ta spletna stran (% S) poskušal izvleči podatke platno slikovne HTML5, ki se lahko uporabljajo za identifikacijo vaše computer.\n\nAli lahko Tor brskalnik dopusti spletni strani pridobivanje podatkov HTML5 canvas slike? canvas.notNow=Ne sedaj canvas.notNowAccessKey=N canvas.allow=Dovoli v prihodnje [View Less]

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 02 Nov '14

02 Nov '14

commit f1a441b932d4951a6a7ee4bcbbd5e4dda4bafdc4 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 2 10:15:46 2014 +0000 Update translations for torbutton-torbuttonproperties --- sl_SI/torbutton.properties | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sl_SI/torbutton.properties b/sl_SI/torbutton.properties index 966b178..26f5b27 100644 --- a/sl_SI/torbutton.properties +++ b/sl_SI/torbutton.properties @@ -… [View More]9,28 +9,28 @@ torbutton.panel.label.enabled = Tor omogočen extensions.torbutton(a)torproject.org.description = Torbutton omogoča gumb za oblikovanje nastavitev Tor, ter hitro in enostavno očisti podatke zasebnega brskanja. torbutton.popup.history.warning = Torbutton blokira dejavnosti iz tabulatorja naloženega v drugačnem Tor stanju.\n\nTo je, da se izognete Firefox hroščem 409737 in 417869.\n\nČe se pojavno okno naloži brez razloga je verjetno, da se eden izmed zavihkov poskuša osvežiti v ozadju, in to je bilo blokirano.\n\nZa ponoven zagon tab-a v tem stanju Tor, pritisnite 'enter' v okencu URL\n\n torbutton.popup.plugin.warning = Torbutton blokiral vsebino naloženega Tor vtičnika.\n\nRaje uporabite Shrani kot.\n\n -torbutton.popup.confirm_ca_certs = Torbutton Opomba: Zdi se da nimate veljavnega Certificata. Pregledovanje seznama pooblaščencev deluje počasi in upočasni preklop Tor. Želite onemogočiti osamitev certifikatnih pooblaščencev? (Če tega ne razumete, lahko varno kliknete OK) -torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway? +torbutton.popup.confirm_ca_certs = Torbutton Opomba: Zdi se da nimate veljavnega Certificata. Pregledovanje seznama pooblaščencev deluje počasi in upočasni preklop Tor. Želite onemogočiti osamitev certifikatnih pooblaščencev? (Če tega ne razumete, lahko varno kliknete Vredu) +torbutton.popup.ff3.warning = Opozorilo!\n\nTorbutton v Firefox 3 je poznan po prepustnosti časovnega pasu in aktivne oznake preko Tor-a.\n\nAli vseeno želite nadaljevati? torbutton.popup.toggle.warning = Preklopiti morate Tor ali ga ponovno zagnati, da uveljavite nastavitve. torbutton.popup.test.success = Tor proxy test uspešen! -torbutton.popup.test.failure = Tor proxy test NEUSPEŠEN! Preverite vaša proxy in Polipo nastavitve. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. +torbutton.popup.test.failure = Tor proxy test NEUSPEŠEN! Preverite vaše proxy in Polipo nastavitve. +torbutton.popup.test.confirm_toggle = Nedavni test Tor proxy ni uspel uporabiti Tor.\n\n\nAli ste prepričani, da ga želite omogočiti vseeno?\n\n\nOpomba: Če ste težavo odpravili, lahko ponovite preizkus v oknu Nastavitve proxy Torbutton, da odpraviti to opozorilo. +torbutton.popup.test.ff3_notice = Kliknite Vredu za testiranje Tor proxy nastavitve. Test se odvija v ozadju. Prosim bodite potrpežljivi. torbutton.panel.label.verified = Tor preverjen -torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway? +torbutton.popup.test.auto_failed = Avtomatski test Tor proxy neuspešno uporabil Tor\n\nAli ste prepričani, da ga želite vseeno omogočiti? torbutton.prefs.recommended = (priporočljivo) torbutton.prefs.optional = (opcija) torbutton.prefs.crucial = (ključno) -torbutton.popup.external.title = Download an external file type? -torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n -torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n -torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n +torbutton.popup.external.title = Prenesem zunanji tip datoteke? +torbutton.popup.external.app = Tor brskalnik ne more prikazati te datoteke. Odpreti jo morate v drugi aplikaciji.\n\n +torbutton.popup.external.note = Nekatere datoteke lahko sprožijo povezavo na omrežje brez uporabe Tor\n\n +torbutton.popup.external.suggest = Da ostanete varni odpirajte prenešene datoteke, le ko ste nepovezani ali uporabite Tor živi CD kot npr.: Sledi.\n torbutton.popup.launch = Prenos datoteke torbutton.popup.cancel = Opusti -torbutton.popup.dontask = Automatically download files from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? +torbutton.popup.dontask = Od sedaj naprej Avtomatsko prenesite datoteke +torbutton.popup.test.no_http_proxy = Tor proxy testiranje: Lokalni HTTP proxy je nedosegljiv. Ali teče Polipo pravilno? torbutton.popup.captcha.title = Razveljavi Google Captchas? -torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query? +torbutton.popup.captcha.ask = Torbutton je zaznal Google Captcha. Želite preusmeritev na drugi iskalnik za to poizvedbo? torbutton.popup.captcha.always = Vedno izvedi to dejanje torbutton.popup.redirect = Preusmeri torbutton.popup.no_redirect = Brez preusmeritve [View Less]

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 02 Nov '14

02 Nov '14

commit 7f92bb1b49ba588e7cb8267fa8d1c448b64c0e18 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 2 09:45:50 2014 +0000 Update translations for torbutton-torbuttondtd --- sl_SI/torbutton.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sl_SI/torbutton.dtd b/sl_SI/torbutton.dtd index 0b258e8..e11cbc8 100644 --- a/sl_SI/torbutton.dtd +++ b/sl_SI/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.… [View More]openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Klik za začetek Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Nastavitve zasebnosti in varnosti"> <!ENTITY torbutton.prefs.block_thread "Blokiraj zgodovino branja med Tor (ključno)"> <!ENTITY torbutton.prefs.block_thwrite "Blokiraj zgodovino zapisovanja med Tor (priporočljivo)"> <!ENTITY torbutton.prefs.block_nthread "Blokiraj zgodovino branja med Ne-Tor (opcija)"> @@ -144,14 +144,14 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Odstrani platformo in jezik v iskalnem oknu Google poizvedbe"> <!ENTITY torbutton.prefs.transparentTor "Pregledna Torifikacija (potrebna pomeri transproxy ali Tor usmernik)"> -<!ENTITY torbutton.prefs.priv_caption "Privacy Settings"> +<!ENTITY torbutton.prefs.priv_caption "Nastavitve zasebnosti"> <!ENTITY torbutton.prefs.block_disk "Ne zapisuj zgodovine brskanja ali podatke strani ( omogočeno zasebno brskanje)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Omeji piškotke tretjih oseb in druge podatke o sledenju"> <!ENTITY torbutton.prefs.block_plugins "Onemogoči vtičnike brskalnika ( kot Flash )"> <!ENTITY torbutton.prefs.resist_fingerprinting "Spremeni podatke, ki vas ločijo od drugih uporabnikov Tor Browser"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "Varnostni nivo"> +<!ENTITY torbutton.prefs.sec_low "Nizek (privzeto)"> +<!ENTITY torbutton.prefs.sec_med_low "Srednji - Nizek"> +<!ENTITY torbutton.prefs.sec_med_high "Srednji - Visok"> +<!ENTITY torbutton.prefs.sec_high "Visok"> +<!ENTITY torbutton.prefs.sec_custom "Vrednosti po meri"> [View Less]

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 02 Nov '14

02 Nov '14

commit b2a1d6bb7c65cfb82e1205b96c7d5dd8e2316093 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 2 09:45:46 2014 +0000 Update translations for torbutton-torbuttonproperties --- sl_SI/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sl_SI/torbutton.properties b/sl_SI/torbutton.properties index e8e25b0..966b178 100644 --- a/sl_SI/torbutton.properties +++ b/sl_SI/torbutton.properties @@ -9,11 +9,11 @@ … [View More]torbutton.panel.label.enabled = Tor omogočen extensions.torbutton(a)torproject.org.description = Torbutton omogoča gumb za oblikovanje nastavitev Tor, ter hitro in enostavno očisti podatke zasebnega brskanja. torbutton.popup.history.warning = Torbutton blokira dejavnosti iz tabulatorja naloženega v drugačnem Tor stanju.\n\nTo je, da se izognete Firefox hroščem 409737 in 417869.\n\nČe se pojavno okno naloži brez razloga je verjetno, da se eden izmed zavihkov poskuša osvežiti v ozadju, in to je bilo blokirano.\n\nZa ponoven zagon tab-a v tem stanju Tor, pritisnite 'enter' v okencu URL\n\n torbutton.popup.plugin.warning = Torbutton blokiral vsebino naloženega Tor vtičnika.\n\nRaje uporabite Shrani kot.\n\n -torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK) +torbutton.popup.confirm_ca_certs = Torbutton Opomba: Zdi se da nimate veljavnega Certificata. Pregledovanje seznama pooblaščencev deluje počasi in upočasni preklop Tor. Želite onemogočiti osamitev certifikatnih pooblaščencev? (Če tega ne razumete, lahko varno kliknete OK) torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway? -torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect. +torbutton.popup.toggle.warning = Preklopiti morate Tor ali ga ponovno zagnati, da uveljavite nastavitve. torbutton.popup.test.success = Tor proxy test uspešen! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. +torbutton.popup.test.failure = Tor proxy test NEUSPEŠEN! Preverite vaša proxy in Polipo nastavitve. torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.panel.label.verified = Tor preverjen [View Less]

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 01 Nov '14

01 Nov '14

commit 3f20c80aaf78e66365149a34c1caf94603d6d76f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 1 23:45:46 2014 +0000 Update translations for torbutton-torbuttondtd --- pt_BR/torbutton.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd index 95f2099..07a9b4b 100644 --- a/pt_BR/torbutton.dtd +++ b/pt_BR/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.… [View More]

1 0

[tor/master] Use digest256_len in networkstatus_copy_old_consensus_info()
by nickm＠torproject.org 01 Nov '14

01 Nov '14

commit efd5001c3b94c633850d7ae9b9f5b6e1ee45ab4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 31 11:36:31 2014 -0400 Use digest256_len in networkstatus_copy_old_consensus_info() Now, if a router ever changes its microdescriptor, but the new microdescriptor SHA256 hash has the same 160-bit prefix as the old one, we treat it as a new microdescriptor when deciding whether to copy status information. (This function also is used to compare … [View More]

1 0

[tor/master] Use digest256map for computing microdescriptor downloads
by nickm＠torproject.org 01 Nov '14

01 Nov '14

commit dc05b8549a73064337020eb3f0d8d91c8149518a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 31 11:32:32 2014 -0400 Use digest256map for computing microdescriptor downloads --- changes/bug13399 | 7 +++++++ src/or/microdesc.c | 36 ++++++++++++++++++------------------ src/or/microdesc.h | 2 +- src/or/routerlist.c | 30 ++++++++++++++++++------------ src/or/routerlist.h | 2 +- 5 files changed, 45 insertions(+), 32 deletions(-) diff --git a/… [View More]changes/bug13399 b/changes/bug13399 new file mode 100644 index 0000000..bbd0b23 --- /dev/null +++ b/changes/bug13399 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - Use a full 256 bits of the SHA256 digest of a microdescriptor when + computing which microdescriptors to download. This keeps us from + erroneous download behavior if two microdescriptor digests ever have + the same first 160 bits. Fixes part of bug 13399; bugfix on + 0.2.3.1-alpha. + diff --git a/src/or/microdesc.c b/src/or/microdesc.c index e8c11a9..7b82600 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -163,19 +163,18 @@ microdescs_add_to_cache(microdesc_cache_t *cache, md->last_listed = listed_at); } if (requested_digests256) { - digestmap_t *requested; /* XXXX actually we should just use a - digest256map */ - requested = digestmap_new(); + digest256map_t *requested; + requested = digest256map_new(); /* Set requested[d] to DIGEST_REQUESTED for every md we requested. */ - SMARTLIST_FOREACH(requested_digests256, const char *, cp, - digestmap_set(requested, cp, DIGEST_REQUESTED)); + SMARTLIST_FOREACH(requested_digests256, const uint8_t *, cp, + digest256map_set(requested, cp, DIGEST_REQUESTED)); /* Set requested[d] to DIGEST_INVALID for every md we requested which we * will never be able to parse. Remove the ones we didn't request from * invalid_digests. */ - SMARTLIST_FOREACH_BEGIN(invalid_digests, char *, cp) { - if (digestmap_get(requested, cp)) { - digestmap_set(requested, cp, DIGEST_INVALID); + SMARTLIST_FOREACH_BEGIN(invalid_digests, uint8_t *, cp) { + if (digest256map_get(requested, cp)) { + digest256map_set(requested, cp, DIGEST_INVALID); } else { tor_free(cp); SMARTLIST_DEL_CURRENT(invalid_digests, cp); @@ -185,8 +184,9 @@ microdescs_add_to_cache(microdesc_cache_t *cache, * ones we never requested from the 'descriptors' smartlist. */ SMARTLIST_FOREACH_BEGIN(descriptors, microdesc_t *, md) { - if (digestmap_get(requested, md->digest)) { - digestmap_set(requested, md->digest, DIGEST_RECEIVED); + if (digest256map_get(requested, (const uint8_t*)md->digest)) { + digest256map_set(requested, (const uint8_t*)md->digest, + DIGEST_RECEIVED); } else { log_fn(LOG_PROTOCOL_WARN, LD_DIR, "Received non-requested microdesc"); microdesc_free(md); @@ -195,14 +195,14 @@ microdescs_add_to_cache(microdesc_cache_t *cache, } SMARTLIST_FOREACH_END(md); /* Remove the ones we got or the invalid ones from requested_digests256. */ - SMARTLIST_FOREACH_BEGIN(requested_digests256, char *, cp) { - void *status = digestmap_get(requested, cp); + SMARTLIST_FOREACH_BEGIN(requested_digests256, uint8_t *, cp) { + void *status = digest256map_get(requested, cp); if (status == DIGEST_RECEIVED || status == DIGEST_INVALID) { tor_free(cp); SMARTLIST_DEL_CURRENT(requested_digests256, cp); } } SMARTLIST_FOREACH_END(cp); - digestmap_free(requested, NULL); + digest256map_free(requested, NULL); } /* For every requested microdescriptor that was unparseable, mark it @@ -794,7 +794,7 @@ microdesc_average_size(microdesc_cache_t *cache) * smartlist. Omit all microdescriptors whose digest appear in <b>skip</b>. */ smartlist_t * microdesc_list_missing_digest256(networkstatus_t *ns, microdesc_cache_t *cache, - int downloadable_only, digestmap_t *skip) + int downloadable_only, digest256map_t *skip) { smartlist_t *result = smartlist_new(); time_t now = time(NULL); @@ -806,7 +806,7 @@ microdesc_list_missing_digest256(networkstatus_t *ns, microdesc_cache_t *cache, !download_status_is_ready(&rs->dl_status, now, get_options()->TestingMicrodescMaxDownloadTries)) continue; - if (skip && digestmap_get(skip, rs->descriptor_digest)) + if (skip && digest256map_get(skip, (const uint8_t*)rs->descriptor_digest)) continue; if (tor_mem_is_zero(rs->descriptor_digest, DIGEST256_LEN)) continue; @@ -831,7 +831,7 @@ update_microdesc_downloads(time_t now) const or_options_t *options = get_options(); networkstatus_t *consensus; smartlist_t *missing; - digestmap_t *pending; + digest256map_t *pending; if (should_delay_dir_fetches(options, NULL)) return; @@ -845,14 +845,14 @@ update_microdesc_downloads(time_t now) if (!we_fetch_microdescriptors(options)) return; - pending = digestmap_new(); + pending = digest256map_new(); list_pending_microdesc_downloads(pending); missing = microdesc_list_missing_digest256(consensus, get_microdesc_cache(), 1, pending); - digestmap_free(pending, NULL); + digest256map_free(pending, NULL); launch_descriptor_downloads(DIR_PURPOSE_FETCH_MICRODESC, missing, NULL, now); diff --git a/src/or/microdesc.h b/src/or/microdesc.h index f858d9f..fdfe892 100644 --- a/src/or/microdesc.h +++ b/src/or/microdesc.h @@ -37,7 +37,7 @@ size_t microdesc_average_size(microdesc_cache_t *cache); smartlist_t *microdesc_list_missing_digest256(networkstatus_t *ns, microdesc_cache_t *cache, int downloadable_only, - digestmap_t *skip); + digest256map_t *skip); void microdesc_free_(microdesc_t *md, const char *fname, int line); #define microdesc_free(md) \ diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 0099486..214b7c4 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -79,6 +79,7 @@ static const char *signed_descriptor_get_body_impl( const signed_descriptor_t *desc, int with_annotations); static void list_pending_downloads(digestmap_t *result, + digest256map_t *result256, int purpose, const char *prefix); static void list_pending_fpsk_downloads(fp_pair_map_t *result); static void launch_dummy_descriptor_download_as_needed(time_t now, @@ -717,7 +718,8 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) * First, we get the lists of already pending downloads so we don't * duplicate effort. */ - list_pending_downloads(pending_id, DIR_PURPOSE_FETCH_CERTIFICATE, "fp/"); + list_pending_downloads(pending_id, NULL, + DIR_PURPOSE_FETCH_CERTIFICATE, "fp/"); list_pending_fpsk_downloads(pending_cert); /* @@ -4268,7 +4270,7 @@ clear_dir_servers(void) * corresponding elements of <b>result</b> to a nonzero value. */ static void -list_pending_downloads(digestmap_t *result, +list_pending_downloads(digestmap_t *result, digest256map_t *result256, int purpose, const char *prefix) { const size_t p_len = strlen(prefix); @@ -4278,7 +4280,7 @@ list_pending_downloads(digestmap_t *result, if (purpose == DIR_PURPOSE_FETCH_MICRODESC) flags = DSR_DIGEST256|DSR_BASE64; - tor_assert(result); + tor_assert(result || result256); SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { if (conn->type == CONN_TYPE_DIR && @@ -4291,11 +4293,19 @@ list_pending_downloads(digestmap_t *result, } } SMARTLIST_FOREACH_END(conn); - SMARTLIST_FOREACH(tmp, char *, d, + if (result) { + SMARTLIST_FOREACH(tmp, char *, d, { digestmap_set(result, d, (void*)1); tor_free(d); }); + } else if (result256) { + SMARTLIST_FOREACH(tmp, uint8_t *, d, + { + digest256map_set(result256, d, (void*)1); + tor_free(d); + }); + } smartlist_free(tmp); } @@ -4307,20 +4317,16 @@ list_pending_descriptor_downloads(digestmap_t *result, int extrainfo) { int purpose = extrainfo ? DIR_PURPOSE_FETCH_EXTRAINFO : DIR_PURPOSE_FETCH_SERVERDESC; - list_pending_downloads(result, purpose, "d/"); + list_pending_downloads(result, NULL, purpose, "d/"); } /** For every microdescriptor we are currently downloading by descriptor - * digest, set result[d] to (void*)1. (Note that microdescriptor digests - * are 256-bit, and digestmap_t only holds 160-bit digests, so we're only - * getting the first 20 bytes of each digest here.) - * - * XXXX Let there be a digestmap256_t, and use that instead. + * digest, set result[d] to (void*)1. */ void -list_pending_microdesc_downloads(digestmap_t *result) +list_pending_microdesc_downloads(digest256map_t *result) { - list_pending_downloads(result, DIR_PURPOSE_FETCH_MICRODESC, "d/"); + list_pending_downloads(NULL, result, DIR_PURPOSE_FETCH_MICRODESC, "d/"); } /** For every certificate we are currently downloading by (identity digest, diff --git a/src/or/routerlist.h b/src/or/routerlist.h index ac6f95b..c6151de 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -196,7 +196,7 @@ int hid_serv_get_responsible_directories(smartlist_t *responsible_dirs, int hid_serv_acting_as_directory(void); int hid_serv_responsible_for_desc_id(const char *id); -void list_pending_microdesc_downloads(digestmap_t *result); +void list_pending_microdesc_downloads(digest256map_t *result); void launch_descriptor_downloads(int purpose, smartlist_t *downloadable, const routerstatus_t *source, [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2014