March 2015 - tor-commits - lists.torproject.org

[depictor/master] Unify files on tabs, not spaces
by tom＠torproject.org 23 Mar '15

23 Mar '15

commit d53048d3d5cc26cda821acbd366903e90e7ce25f Author: Tom Ritter <tom(a)ritter.vg> Date: Sun Mar 8 13:46:51 2015 -0500 Unify files on tabs, not spaces --- write_website.py | 161 +++++++++++++++++++++++++++--------------------------- 1 file changed, 80 insertions(+), 81 deletions(-) diff --git a/write_website.py b/write_website.py index 415c7ea..9c5463e 100755 --- a/write_website.py +++ b/write_website.py @@ -27,120 +27,119 @@ from website import WebsiteWriter DIRECTORY_AUTHORITIES = stem.descriptor.remote.get_authorities() CONFIG = stem.util.conf.config_dict('consensus', { - 'ignored_authorities': [], - 'bandwidth_authorities': [], - 'known_params': [], + 'ignored_authorities': [], + 'bandwidth_authorities': [], + 'known_params': [], }) downloader = stem.descriptor.remote.DescriptorDownloader( - timeout = 60, - fall_back_to_authority = False, - document_handler = stem.descriptor.DocumentHandler.DOCUMENT, + timeout = 60, + fall_back_to_authority = False, + document_handler = stem.descriptor.DocumentHandler.DOCUMENT, ) @lru_cache() def directory_authorities(): - return dict((k, v) for (k, v) in DIRECTORY_AUTHORITIES.items() if k not in CONFIG['ignored_authorities']) + return dict((k, v) for (k, v) in DIRECTORY_AUTHORITIES.items() if k not in CONFIG['ignored_authorities']) def main(): - # loads configuration data - - config = stem.util.conf.get_config("consensus") - config.load(os.path.join(os.path.dirname(__file__), 'data', 'consensus.cfg')) - - consensuses, consensus_fetching_issues, consensus_fetching_runtimes = get_consensuses() - votes, vote_fetching_issues, vote_fetching_runtimes = get_votes() - - # updates the download statistics file - 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() - - # great for debugging - #import pickle - #pickle.dump(consensuses, open('consensus.p', 'wb')) - #pickle.dump(votes, open('votes.p', 'wb')) - - # produces the website - w = WebsiteWriter() - w.set_consensuses(consensuses) - w.set_votes(votes) - w.set_config(CONFIG) - w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), True) - w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'index.html'), False) - - archived = os.path.join(os.path.dirname(__file__), 'out', \ - 'consensus-health-' + w.get_consensus_time().strftime("%Y-%m-%d-%H-%M") + '.html') - subprocess.call(["cp", os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), archived]) - subprocess.call(["gzip", "-9", archived]) + # loads configuration data + config = stem.util.conf.get_config("consensus") + config.load(os.path.join(os.path.dirname(__file__), 'data', 'consensus.cfg')) + + consensuses, consensus_fetching_issues, consensus_fetching_runtimes = get_consensuses() + votes, vote_fetching_issues, vote_fetching_runtimes = get_votes() + + # updates the download statistics file + 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() + + # great for debugging + #import pickle + #pickle.dump(consensuses, open('consensus.p', 'wb')) + #pickle.dump(votes, open('votes.p', 'wb')) + + # produces the website + w = WebsiteWriter() + w.set_consensuses(consensuses) + w.set_votes(votes) + w.set_config(CONFIG) + w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), True) + w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'index.html'), False) + + archived = os.path.join(os.path.dirname(__file__), 'out', \ + 'consensus-health-' + w.get_consensus_time().strftime("%Y-%m-%d-%H-%M") + '.html') + subprocess.call(["cp", os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), archived]) + subprocess.call(["gzip", "-9", archived]) def get_consensuses(): - """ - Provides a mapping of directory authority nicknames to their present consensus. + """ + Provides a mapping of directory authority nicknames to their present consensus. - :returns: tuple of the form ({authority => consensus}, issues, runtimes) - """ + :returns: tuple of the form ({authority => consensus}, issues, runtimes) + """ - return _get_documents('consensus', '/tor/status-vote/current/consensus') + return _get_documents('consensus', '/tor/status-vote/current/consensus') def get_votes(): - """ - Provides a mapping of directory authority nicknames to their present vote. + """ + Provides a mapping of directory authority nicknames to their present vote. - :returns: tuple of the form ({authority => vote}, issues, runtimes) - """ + :returns: tuple of the form ({authority => vote}, issues, runtimes) + """ - return _get_documents('vote', '/tor/status-vote/current/authority') + return _get_documents('vote', '/tor/status-vote/current/authority') def _get_documents(label, resource): - queries, documents, issues, runtimes = {}, {}, [], {} + queries, documents, issues, runtimes = {}, {}, [], {} - for authority in directory_authorities().values(): - if authority.v3ident is None: - continue # not a voting authority + for authority in directory_authorities().values(): + if authority.v3ident is None: + continue # not a voting authority - queries[authority.nickname] = downloader.query( - resource, - endpoints = [(authority.address, authority.dir_port)], - default_params = False, - ) + queries[authority.nickname] = downloader.query( + resource, + endpoints = [(authority.address, authority.dir_port)], + default_params = False, + ) - for authority, query in queries.items(): - try: - result = query.run() - documents[authority] = result[0] - runtimes[authority] = query.runtime - except Exception, exc: - if label == 'vote': - # try to download the vote via the other authorities + for authority, query in queries.items(): + try: + result = query.run() + documents[authority] = result[0] + runtimes[authority] = query.runtime + except Exception, exc: + if label == 'vote': + # try to download the vote via the other authorities - v3ident = directory_authorities()[authority].v3ident + v3ident = directory_authorities()[authority].v3ident - query = downloader.query( - '/tor/status-vote/current/%s' % v3ident, - default_params = False, - ) + query = downloader.query( + '/tor/status-vote/current/%s' % v3ident, + default_params = False, + ) - query.run(True) + query.run(True) - if not query.error: - documents[authority] = list(query)[0] - continue + if not query.error: + documents[authority] = list(query)[0] + continue - issues.append(('AUTHORITY_UNAVAILABLE', label, authority, query.download_url, exc)) + issues.append(('AUTHORITY_UNAVAILABLE', label, authority, query.download_url, exc)) - return documents, issues, runtimes + return documents, issues, runtimes if __name__ == '__main__': - try: - main() - except: - msg = "%s failed with:\n\n%s" % (sys.argv[0], traceback.format_exc()) - print "Error: %s" % msg + try: + main() + except: + msg = "%s failed with:\n\n%s" % (sys.argv[0], traceback.format_exc()) + print "Error: %s" % msg

1 0

[depictor/master] Attempt to reduce memorysize before forking a bunch of times...
by tom＠torproject.org 23 Mar '15

23 Mar '15

commit 487b01f79309521ea15f3781ce0fcd0482152c10 Author: Tom Ritter <tom(a)ritter.vg> Date: Sun Mar 8 14:29:37 2015 -0500 Attempt to reduce memorysize before forking a bunch of times... --- write_website.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/write_website.py b/write_website.py index f761643..6fe9089 100755 --- a/write_website.py +++ b/write_website.py @@ -71,9 +71,14 @@ def main(): w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), True) w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'index.html'), False) + # delete giant data structures for subprocess forking by piling hacks on top of each other consensus_time = w.get_consensus_time() + import gc + del w, consensuses, votes + gc.collect() + time.sleep(1) archived = os.path.join(os.path.dirname(__file__), 'out', \ - 'consensus-health-' + consensus_time.strftime("%Y-%m-%d-%H-%M") + '.html') + 'consensus-health-' + consensus_time.strftime("%Y-%m-%d-%H-%M") + '.html') subprocess.call(["cp", os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), archived]) subprocess.call(["gzip", "-9", archived]) subprocess.call(["ln", "-s", archived + ".gz", archived]) @@ -82,11 +87,9 @@ def main(): weeks_to_keep = 3 files = [f for f in os.listdir(os.path.join(os.path.dirname(__file__), 'out'))] for f in files: - print f if f.startswith("consensus-health-"): - f = f.replace("consensus-health-", "").replace(".html", "") + f = f.replace("consensus-health-", "").replace(".html", "").replace(".gz", "") f_time = datetime.datetime.strptime(f, "%Y-%m-%d-%H-%M") - print "\t", f_time if (consensus_time - f_time).days > weeks_to_keep * 7: os.remove(f)

1 0

[depictor/master] Remove old archival files after 3 weeks
by tom＠torproject.org 23 Mar '15

23 Mar '15

commit 1bb85aa4be437c54ee687ed67bc0f553140e180b Author: Tom Ritter <tom(a)ritter.vg> Date: Sun Mar 8 14:11:01 2015 -0500 Remove old archival files after 3 weeks --- write_website.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/write_website.py b/write_website.py index 06fe35f..f761643 100755 --- a/write_website.py +++ b/write_website.py @@ -71,12 +71,25 @@ def main(): w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), True) w.write_website(os.path.join(os.path.dirname(__file__), 'out', 'index.html'), False) + consensus_time = w.get_consensus_time() archived = os.path.join(os.path.dirname(__file__), 'out', \ - 'consensus-health-' + w.get_consensus_time().strftime("%Y-%m-%d-%H-%M") + '.html') + 'consensus-health-' + consensus_time.strftime("%Y-%m-%d-%H-%M") + '.html') subprocess.call(["cp", os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), archived]) subprocess.call(["gzip", "-9", archived]) subprocess.call(["ln", "-s", archived + ".gz", archived]) + # remove old files + weeks_to_keep = 3 + files = [f for f in os.listdir(os.path.join(os.path.dirname(__file__), 'out'))] + for f in files: + print f + if f.startswith("consensus-health-"): + f = f.replace("consensus-health-", "").replace(".html", "") + f_time = datetime.datetime.strptime(f, "%Y-%m-%d-%H-%M") + print "\t", f_time + if (consensus_time - f_time).days > weeks_to_keep * 7: + os.remove(f) + def get_consensuses(): """

1 0

[depictor/master] Better recommended versions display
by tom＠torproject.org 23 Mar '15

23 Mar '15

commit abb8dff5d3f196e824351b1805d322af351f806a Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Mar 18 11:01:57 2015 -0700 Better recommended versions display This will highlight the individual versions that are different between an authority and the consensus. --- website.py | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/website.py b/website.py index d33d3fc..e75eca0 100755 --- a/website.py +++ b/website.py @@ -355,35 +355,25 @@ class WebsiteWriter: vote = self.votes[dirauth_nickname] if vote.client_versions: - if self.consensus.client_versions == vote.client_versions: - self.site.write(" <tr>\n" - + " <td>" + dirauth_nickname + "</td>\n" - + " <td>client-versions ") - self.site.write(", ".join([str(v) for v in vote.client_versions])) - self.site.write( "</td>\n" - + " </tr>\n"); - else: - self.site.write(" <tr>\n" - + " <td>" + dirauth_nickname + "</td>\n" - + " <td>client-versions ") - self.site.write(", ".join([str(v) for v in vote.client_versions])) - self.site.write("</td>\n" - + " </tr>\n") + self.site.write(" <tr>\n" + + " <td>" + dirauth_nickname + "</td>\n" + + " <td>client-versions ") + self.site.write(", ".join([(str(v) if v in self.consensus.client_versions else "" + str(v) + "") + for v in vote.client_versions])) + self.site.write("".join([(", <s>" + str(v) + "</s>") + for v in self.consensus.client_versions if v not in vote.client_versions])) + self.site.write("</td>\n" + + " </tr>\n") if vote.server_versions: - if self.consensus.server_versions == vote.server_versions: - self.site.write(" <tr>\n" - + " <td> </td>\n" - + " <td>server-versions ") - self.site.write(", ".join([str(v) for v in vote.server_versions])) - self.site.write("</td>\n" - + " </tr>\n"); - else: - self.site.write(" <tr>\n" - + " <td>" + dirauth_nickname + "</td>\n" - + " <td>server-versions "); - self.site.write(", ".join([str(v) for v in vote.server_versions])) - self.site.write("</td>\n" - + " </tr>\n") + self.site.write(" <tr>\n" + + " <td>" + dirauth_nickname + "</td>\n" + + " <td>server-versions ") + self.site.write(", ".join([(str(v) if v in self.consensus.server_versions else "" + str(v) + "") + for v in vote.server_versions])) + self.site.write("".join([(", <s>" + str(v) + "</s>") + for v in self.consensus.server_versions if v not in vote.server_versions])) + self.site.write("</td>\n" + + " </tr>\n") else: self.site.write(" <tr>\n" + " <td>" + dirauth_nickname + "</td>\n"

1 0

[depictor/master] Create symlink for .html file, necessary for serving gzips
by tom＠torproject.org 23 Mar '15

23 Mar '15

commit 9e3fb71a4589341caea3393db4d5e5b34179daa3 Author: Tom Ritter <tom(a)ritter.vg> Date: Sun Mar 8 13:47:26 2015 -0500 Create symlink for .html file, necessary for serving gzips --- write_website.py | 1 + 1 file changed, 1 insertion(+) diff --git a/write_website.py b/write_website.py index 9c5463e..06fe35f 100755 --- a/write_website.py +++ b/write_website.py @@ -75,6 +75,7 @@ def main(): 'consensus-health-' + w.get_consensus_time().strftime("%Y-%m-%d-%H-%M") + '.html') subprocess.call(["cp", os.path.join(os.path.dirname(__file__), 'out', 'consensus-health.html'), archived]) subprocess.call(["gzip", "-9", archived]) + subprocess.call(["ln", "-s", archived + ".gz", archived]) def get_consensuses():

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] 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

[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