tor-commits March 2015

tor-commits@lists.torproject.org

23 participants
1889 discussions

[depictor/master] Add the full fingerprint (in tiny text) to the big table.
by tom＠torproject.org 23 Mar '15

23 Mar '15

commit 5dc8eba37cbebe3787094fa8b272a48eb8939f8b Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Mar 4 15:20:52 2015 +0100 Add the full fingerprint (in tiny text) to the big table. --- out/stylesheet-ltr.css | 4 ++++ website.py | 15 ++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/out/stylesheet-ltr.css b/out/stylesheet-ltr.css index ce0c54e..77bd55f 100644 --- a/out/stylesheet-ltr.css +++ b/out/stylesheet-ltr.css @@ -94,6 +94,10 @@ td { vertical-align: top; } +.tiny { + font-size: 3px; +} + /* the banner */ table.banner { diff --git a/website.py b/website.py index 4279651..b5db508 100755 --- a/website.py +++ b/website.py @@ -854,10 +854,19 @@ class WebsiteWriter: if relay_fp in self.consensus.routers and \ "Named" in self.consensus.routers[relay_fp].flags and \ relay_nickname[0].isdigit(): - self.site.write(" <td id=\"" + relay_nickname + "\">" - + relay_fp.substring(0, 8) + "</td>\n") + self.site.write(" <td id=\"" \ + + relay_nickname \ + + "\">" \ + + relay_fp.substring(0, 8) \ + + " " \ + + relay_fp \ + + "</td>\n") else: - self.site.write(" <td>" + relay_fp[0:8] + "</td>\n") + self.site.write(" <td>" \ + + relay_fp[0:8] + + " " \ + + relay_fp + + "</td>\n") self.site.write(" <td>" + relay_nickname + "</td>\n")

1 0

[depictor/master] New TODO
by tom＠torproject.org 23 Mar '15

23 Mar '15

commit 9183914bae69ee4758c1022d49db2a0269dcb7af Author: Tom Ritter <tom(a)ritter.vg> Date: Tue Dec 16 23:20:15 2014 -0500 New TODO --- website.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website.py b/website.py index 30c0da2..4b20837 100755 --- a/website.py +++ b/website.py @@ -147,7 +147,8 @@ class WebsiteWriter: + " <col width=\"480\">\n" + " </colgroup>\n") - # XXX Should also write the keyszie here + # XXX Should also write the keysize here + # XXX Should also write if the displayed consensus is out of date signingFPs = {sig.identity:sig.method for sig in self.consensus.signatures} for dirauth_nickname in self.known_authorities: self.site.write(" <tr>\n"

1 0

[depictor/master] Include full path for the download-stats file
by tom＠torproject.org 23 Mar '15

23 Mar '15

commit 892710c61039b3f2730997b562accf9bdaf62c12 Author: Tom Ritter <tom(a)ritter.vg> Date: Tue Dec 16 23:46:56 2014 -0500 Include full path for the download-stats file --- website.py | 2 +- write_website.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website.py b/website.py index 4b20837..4279651 100755 --- a/website.py +++ b/website.py @@ -584,7 +584,7 @@ class WebsiteWriter: """ Write some download statistics. """ - f = open(os.path.join('out', 'download-stats.csv'), 'r') + f = open(os.path.join(os.path.dirname(__file__), 'out', 'download-stats.csv'), 'r') lines = f.readlines() f.close() diff --git a/write_website.py b/write_website.py index 6316c0c..f445a8e 100755 --- a/write_website.py +++ b/write_website.py @@ -53,7 +53,7 @@ def main(): votes, vote_fetching_issues, vote_fetching_runtimes = get_votes() # updates the download statistics file - f = open(os.path.join('out', 'download-stats.csv'), 'a') + f = open(os.path.join(os.path.dirname(__file__), 'out', 'download-stats.csv'), 'a') for ds in consensus_fetching_runtimes: f.write("%s,%i,%i\n" % (ds, time.time() * 1000, int(consensus_fetching_runtimes[ds] * 1000))) f.close()

1 0

[depictor/master] Add a TODO for myself
by tom＠torproject.org 23 Mar '15

23 Mar '15

commit e00f25504ea5bf77daa1bda3e2dc15ff227d4fde Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Dec 10 13:27:42 2014 -0600 Add a TODO for myself --- website.py | 1 + 1 file changed, 1 insertion(+) diff --git a/website.py b/website.py index 78fbd2a..30c0da2 100755 --- a/website.py +++ b/website.py @@ -147,6 +147,7 @@ class WebsiteWriter: + " <col width=\"480\">\n" + " </colgroup>\n") + # XXX Should also write the keyszie here signingFPs = {sig.identity:sig.method for sig in self.consensus.signatures} for dirauth_nickname in self.known_authorities: self.site.write(" <tr>\n"

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit 379d8778d59d76c14a1152677958a19c830ea89b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 14:45:49 2015 +0000 Update translations for torbutton-torbuttondtd --- it/torbutton.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/it/torbutton.dtd b/it/torbutton.dtd index f0d74e8..f151a60 100644 --- a/it/torbutton.dtd +++ b/it/torbutton.dtd @@ -157,9 +157,9 @@ <!ENTITY torbutton.prefs.sec_low_desc "A questo livello di sicurezza, tutte le features del browser sono abilitate."> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Il meccanismo di rendering SVG OpenType è disabilitato."> <!ENTITY torbutton.prefs.sec_med_low "Medio-Basso"> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> +<!ENTITY torbutton.prefs.sec_gen_desc "A questo livello di sicurezza, i seguenti cambiamenti si applicano a (passa sopra con il mouse per i dettagli):"> +<!ENTITY torbutton.prefs.sec_html5_desc "I video e audio in HTML5 diventano click-to-play grazie a NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "Su alcuni siti, potresti dover usare il pulsante toolbar di NoScript per attivare quei media."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Alcune ottimizzazioni di performance JavaScript sono disabilitate."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> @@ -169,9 +169,9 @@ <!ENTITY torbutton.prefs.sec_mathml_desc "Alcuni meccanismi di visualizzazione di equazioni matematiche sono disabilitati."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML è disabilitato."> <!ENTITY torbutton.prefs.sec_med_high "Medio-Alto"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Tutte le ottimizzazioni di JavaScript per le performance sono disattivate."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Alcuni rendering dei font sono disabilitati."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Il meccanismo di rendering font Graphite è disabilitato."> <!ENTITY torbutton.prefs.sec_svg_desc "Alcuni tipi di immagini sono disabilitati."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Le immagini SVG sono disabilitate."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript è disabilitato di default su tutti i siti non-HTTPS."> @@ -181,7 +181,7 @@ <!ENTITY torbutton.prefs.sec_audio_video_desc "Molti formati audio e video sono disabilitati."> <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM è l'unico codec che rimane abilitato."> <!ENTITY torbutton.prefs.sec_webfonts_desc "Alcuni caratteri e icone possono non essere visualizzati correttamente."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "I font provvisti dal sito sono bloccati."> <!ENTITY torbutton.prefs.sec_custom "Valori Customizzabili"> <!ENTITY torbutton.circuit_display.title "Circuito Tor per questo sito">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit 4006afde022d105cb7420dcc9de3163747b3825b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 14:45:45 2015 +0000 Update translations for torbutton-torbuttonproperties --- it/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/it/torbutton.properties b/it/torbutton.properties index 22db238..4244819 100644 --- a/it/torbutton.properties +++ b/it/torbutton.properties @@ -68,5 +68,5 @@ canvas.neverAccessKey=e # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=Problema Profilo %S profileReadOnly=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S in un altra posizione prima di usarlo. -profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. -profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileReadOnlyMac=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S nel tuo desktop o nella cartella Applicazioni prima di usarlo. +profileAccessDenied=%S non ha i permessi per accedere al profilo. Per favore, controlla i permessi del tuo file system e riprova.

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit 5d2b7501b8a9dd55dc862f3243e9d7cc672a37fe Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 14:15:47 2015 +0000 Update translations for torbutton-torbuttonproperties --- it/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/torbutton.properties b/it/torbutton.properties index 14bb304..22db238 100644 --- a/it/torbutton.properties +++ b/it/torbutton.properties @@ -67,6 +67,6 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=Problema Profilo %S -profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. +profileReadOnly=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S in un altra posizione prima di usarlo. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'
by nickm＠torproject.org 23 Mar '15

23 Mar '15

commit 190ed66b06833bcf3016e93f1c4ad98d1ebdb98d Merge: 98c3942 c113544 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 23 09:25:35 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/bug15436 | 4 ++++ src/ext/csiphash.c | 16 +++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6
by nickm＠torproject.org 23 Mar '15

23 Mar '15

commit c113544a94686f533c6654795429b3384d509579 Merge: ca03b10 732f522 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 23 09:25:15 2015 -0400 Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6 changes/bug15436 | 4 ++++ src/ext/csiphash.c | 16 +++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-)

1 0

[tor/master] Fix unaligned access in SipHash-2-4.
by nickm＠torproject.org 23 Mar '15

23 Mar '15

commit 732f522a42702494c4029da568a2603bb963e402 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sun Mar 22 22:31:08 2015 +0000 Fix unaligned access in SipHash-2-4. The compiler is allowed to assume that a "uint64_t *" is aligned correctly, and will inline a version of memcpy that acts as such. Use "uint8_t *", so the compiler does the right thing. --- changes/bug15436 | 4 ++++ src/ext/csiphash.c | 16 +++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/changes/bug15436 b/changes/bug15436 new file mode 100644 index 0000000..4fa44d1 --- /dev/null +++ b/changes/bug15436 @@ -0,0 +1,4 @@ + o Minor bugfixes (portability): + - Use the correct datatype in the SipHash-2-4 function to prevent compilers + from assuming any sort of alignment. Fixes bug 15436; bugfix on + 0.2.5.3-alpha. diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c index c247886..979990f 100644 --- a/src/ext/csiphash.c +++ b/src/ext/csiphash.c @@ -100,10 +100,18 @@ uint64_t siphash24(const void *src, unsigned long src_sz, const struct sipkey *k uint64_t k0 = key->k0; uint64_t k1 = key->k1; uint64_t b = (uint64_t)src_sz << 56; +#ifdef UNALIGNED_OK const uint64_t *in = (uint64_t*)src; +#else + /* On platforms where alignment matters, if 'in' is a pointer to a + * datatype that must be aligned, the compiler is allowed to + * generate code that assumes that it is aligned as such. + */ + const uint8_t *in = (uint8_t *)src; +#endif - uint64_t t; - uint8_t *pt, *m; + uint64_t t; + uint8_t *pt, *m; uint64_t v0 = k0 ^ 0x736f6d6570736575ULL; uint64_t v1 = k1 ^ 0x646f72616e646f6dULL; @@ -113,12 +121,14 @@ uint64_t siphash24(const void *src, unsigned long src_sz, const struct sipkey *k while (src_sz >= 8) { #ifdef UNALIGNED_OK uint64_t mi = _le64toh(*in); + in += 1; #else uint64_t mi; memcpy(&mi, in, 8); mi = _le64toh(mi); + in += 8; #endif - in += 1; src_sz -= 8; + src_sz -= 8; v3 ^= mi; DOUBLE_ROUND(v0,v1,v2,v3); v0 ^= mi;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2015