- tor-commits - lists.torproject.org

[collector/master] Provide executable jar containing all dependencies, removed obsolete ant-tasks, changed scripts for implementing task-18719.
by karsten＠torproject.org 04 May '16

04 May '16

commit 2be9f6890af28bcb78d29fb00eb66b8cd8edf9c2 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue May 3 20:00:52 2016 +0000 Provide executable jar containing all dependencies, removed obsolete ant-tasks, changed scripts for implementing task-18719. --- bin/run-bridgedescs | 2 +- bin/run-bridgepools | 2 +- bin/run-exitlists | 2 +- bin/run-relaydescs | 2 +- bin/run-torperf | 2 +- bin/update-index | 2 +- build.xml | 56 +++++----------------- src/org/torproject/collector/Main.java | 85 ++++++++++++++++++++++++++++++++++ 8 files changed, 103 insertions(+), 50 deletions(-) diff --git a/bin/run-bridgedescs b/bin/run-bridgedescs index 78e4cab..37eeea5 100755 --- a/bin/run-bridgedescs +++ b/bin/run-bridgedescs @@ -1,3 +1,3 @@ #!/bin/sh -ant bridgedescs | grep "\[java\]" +java -Xmx2g -jar collector-0.9.0-dev.jar bridgedescs diff --git a/bin/run-bridgepools b/bin/run-bridgepools index 7c34e91..9c5c53a 100755 --- a/bin/run-bridgepools +++ b/bin/run-bridgepools @@ -1,3 +1,3 @@ #!/bin/sh -ant bridgepools | grep "\[java\]" +java -Xmx2g -jar collector-0.9.0-dev.jar bridgepools diff --git a/bin/run-exitlists b/bin/run-exitlists index 20064d6..3bdef11 100755 --- a/bin/run-exitlists +++ b/bin/run-exitlists @@ -1,3 +1,3 @@ #!/bin/sh -ant exitlists | grep "\[java\]" +java -Xmx2g -jar collector-0.9.0-dev.jar exitlists diff --git a/bin/run-relaydescs b/bin/run-relaydescs index e39c31a..8ad7506 100755 --- a/bin/run-relaydescs +++ b/bin/run-relaydescs @@ -1,3 +1,3 @@ #!/bin/sh -ant relaydescs | grep "\[java\]" +java -Xmx2g -jar collector-0.9.0-dev.jar relaydescs diff --git a/bin/run-torperf b/bin/run-torperf index c1bc2ba..267df58 100755 --- a/bin/run-torperf +++ b/bin/run-torperf @@ -1,3 +1,3 @@ #!/bin/sh -ant torperf | grep "\[java\]" +java -Xmx2g -jar collector-0.9.0-dev.jar torperf diff --git a/bin/update-index b/bin/update-index index 4a3f2f8..70b0067 100755 --- a/bin/update-index +++ b/bin/update-index @@ -1,3 +1,3 @@ #!/bin/sh -ant updateindex | grep "\[java\]" +java -Xmx2g -jar collector-0.9.0-dev.jar updateindex diff --git a/build.xml b/build.xml index 8e99076..f07c67b 100644 --- a/build.xml +++ b/build.xml @@ -18,14 +18,17 @@ <property name="jarfile" value="collector-${release.version}.jar" /> <property name="jarsourcesfile" value="collector-${release.version}-sources.jar" /> <property name="jarjavadocfile" value="collector-${release.version}-javadoc.jar" /> - <path id="classpath"> - <pathelement path="${classes}"/> - <fileset dir="${libs}"> + <patternset id="runtime" > <include name="commons-codec-1.9.jar"/> <include name="commons-compress-1.9.jar"/> <include name="gson-2.2.4.jar"/> <include name="xz-1.5.jar"/> <include name="descriptor-${descriptorversion}.jar"/> + </patternset> + <path id="classpath"> + <pathelement path="${classes}"/> + <fileset dir="${libs}"> + <patternset refid="runtime" /> </fileset> </path> <path id="checkstyle.classpath" > @@ -114,11 +117,17 @@ </exec> <jar destfile="${jarfile}" basedir="${classes}"> + <fileset dir="${classes}"/> + <zipgroupfileset dir="${libs}" > + <patternset refid="runtime" /> + </zipgroupfileset> <manifest> <attribute name="Created-By" value="The Tor Project" /> <attribute name="Implementation-Title" value="${name}"/> <attribute name="Implementation-Version" value="${release.version}-${git.revision}"/> + <attribute name="Main-Class" + value="org.torproject.collector.Main" /> </manifest> </jar> <jar destfile="${jarsourcesfile}"> @@ -197,46 +206,5 @@ </batchtest> </junit> </target> - <target name="bridgedescs" depends="compile"> - <java fork="true" - maxmemory="2048m" - classname="org.torproject.collector.bridgedescs.SanitizedBridgesWriter"> - <classpath refid="classpath"/> - </java> - </target> - <target name="bridgepools" depends="compile"> - <java fork="true" - maxmemory="2048m" - classname="org.torproject.collector.bridgepools.BridgePoolAssignmentsProcessor"> - <classpath refid="classpath"/> - </java> - </target> - <target name="exitlists" depends="compile"> - <java fork="true" - maxmemory="2048m" - classname="org.torproject.collector.exitlists.ExitListDownloader"> - <classpath refid="classpath"/> - </java> - </target> - <target name="relaydescs" depends="compile"> - <java fork="true" - maxmemory="2048m" - classname="org.torproject.collector.relaydescs.ArchiveWriter"> - <classpath refid="classpath"/> - </java> - </target> - <target name="torperf" depends="compile"> - <java fork="true" - maxmemory="2048m" - classname="org.torproject.collector.torperf.TorperfDownloader"> - <classpath refid="classpath"/> - </java> - </target> - <target name="updateindex" depends="compile"> - <java fork="true" - classname="org.torproject.collector.index.CreateIndexJson"> - <classpath refid="classpath"/> - </java> - </target> </project> diff --git a/src/org/torproject/collector/Main.java b/src/org/torproject/collector/Main.java new file mode 100644 index 0000000..44182ed --- /dev/null +++ b/src/org/torproject/collector/Main.java @@ -0,0 +1,85 @@ +/* Copyright 2016 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.collector; + +import org.torproject.collector.bridgedescs.SanitizedBridgesWriter; +import org.torproject.collector.bridgepools.BridgePoolAssignmentsProcessor; +import org.torproject.collector.exitlists.ExitListDownloader; +import org.torproject.collector.index.CreateIndexJson; +import org.torproject.collector.relaydescs.ArchiveWriter; +import org.torproject.collector.torperf.TorperfDownloader; + +import java.lang.reflect.InvocationTargetException; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Logger; + +/** + * Main class for starting a CollecTor instance. + * <br> + * Run without arguments in order to read the usage information, i.e. + * <br> + * <code>java -jar collector.jar</code> + */ +public class Main { + + private static Logger log = Logger.getLogger(Main.class.getName()); + + /** All possible main classes. + * If a new CollecTorMain class is available, just add it to this map. + */ + private static final Map<String, Class> collecTorMains = new HashMap<>(); + + static { // add a new main class here + collecTorMains.put("bridgedescs", SanitizedBridgesWriter.class); + collecTorMains.put("bridgepools", BridgePoolAssignmentsProcessor.class); + collecTorMains.put("exitlists", ExitListDownloader.class); + collecTorMains.put("updateindex", CreateIndexJson.class); + collecTorMains.put("relaydescs", ArchiveWriter.class); + collecTorMains.put("torperf", TorperfDownloader.class); + } + + private static final String modules = collecTorMains.keySet().toString() + .replace("[", "").replace("]", "").replaceAll(", ", "|"); + + /** + * One argument is necessary. + * See class description {@link Main}. + */ + public static void main(String[] args) { + if (null == args || args.length != 1) { + printUsageAndExit("CollecTor needs exactly one argument."); + } else { + invokeGivenMainAndExit(args[0]); + } + } + + private static void printUsageAndExit(String msg) { + final String usage = "Usage:\njava -jar collector.jar " + + "<" + modules + ">"; + System.out.println(msg + "\n" + usage); + System.exit(0); + } + + private static void invokeGivenMainAndExit(String mainId) { + Class clazz = collecTorMains.get(mainId); + if (null == clazz) { + printUsageAndExit("Unknown argument: " + mainId); + } + invokeMainOnClassAndExit(clazz); + } + + private static void invokeMainOnClassAndExit(Class clazz) { + try { + clazz.getMethod("main", new Class[] { String[].class }) + .invoke(null, (Object) new String[]{}); + System.exit(0); + } catch (NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + log.severe("Cannot invoke 'main' method on " + + clazz.getName() + ". " + e); + } + } +} +

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] fixup! Bug #13670.1: Isolate favicon requests by first party
by gk＠torproject.org 04 May '16

04 May '16

commit ac739a883c7960eda72ce71e82e8b3f704381c4d Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Apr 26 13:33:46 2016 -0700 fixup! Bug #13670.1: Isolate favicon requests by first party This fixes the isolation issues on the Page Info dialog (both video and audio related). See bug 18703 for more details. --- browser/base/content/content.js | 1 + browser/base/content/pageinfo/pageInfo.js | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/browser/base/content/content.js b/browser/base/content/content.js index 55f579f..ee456df 100644 --- a/browser/base/content/content.js +++ b/browser/base/content/content.js @@ -972,6 +972,7 @@ var PageInfoListener = { catch (exception) { } windowInfo.hostName = hostName; + windowInfo.firstParty = window.top.location.href; return windowInfo; }, diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js index 3683b06..beff551 100644 --- a/browser/base/content/pageinfo/pageInfo.js +++ b/browser/base/content/pageinfo/pageInfo.js @@ -152,6 +152,7 @@ pageInfoTreeView.prototype = { // mmm, yummy. global variables. var gDocInfo = null; var gImageElement = null; +var gFirstParty = null; // column number to help using the data array const COL_IMAGE_ADDRESS = 0; @@ -378,6 +379,8 @@ function loadPageInfo(frameOuterWindowID, imageElement) gImageElement = pageInfoData.imageInfo; + gFirstParty = windowInfo.firstParty; + var titleFormat = windowInfo.isTopWindow ? "pageInfo.page.title" : "pageInfo.frame.title"; document.title = gBundle.getFormattedString(titleFormat, [docInfo.location]); @@ -881,7 +884,7 @@ function makePreview(row) var newImage = new Image; newImage.id = "thepreviewimage"; // Ensure "Media" items are fetched over the first-party domain. - newImage.setAttribute("firstparty", gWindow.top.document.location); + newImage.setAttribute("firstparty", gFirstParty); var physWidth = 0, physHeight = 0; var width = 0, height = 0; @@ -929,6 +932,7 @@ function makePreview(row) else if (item.HTMLVideoElement && isProtocolAllowed) { newImage = document.createElementNS("http://www.w3.org/1999/xhtml", "video"); newImage.id = "thepreviewimage"; + newImage.setAttribute("firstparty", gFirstParty); newImage.src = url; newImage.controls = true; width = physWidth = item.videoWidth; @@ -940,6 +944,7 @@ function makePreview(row) else if (item.HTMLAudioElement && isProtocolAllowed) { newImage = new Audio; newImage.id = "thepreviewimage"; + newImage.setAttribute("firstparty", gFirstParty); newImage.src = url; newImage.controls = true; isAudio = true;

1 0

[torbutton/master] Bug 18905: Hide unusable items from help menu
by gk＠torproject.org 04 May '16

04 May '16

commit b72f495c9593bb7df8fab34b642325c22e4e7393 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Apr 26 15:59:36 2016 -0700 Bug 18905: Hide unusable items from help menu --- src/chrome.manifest | 3 +++ src/chrome/content/menu-overlay.xul | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/chrome.manifest b/src/chrome.manifest index 30aa2ff..e85a205 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -12,6 +12,9 @@ override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/aboutDialog.xul +# UI customization +overlay chrome://browser/content/baseMenuOverlay.xul chrome://torbutton/content/menu-overlay.xul + # Strings for the about:tbupdate page override chrome://browser/locale/aboutTBUpdate.dtd chrome://torbutton/locale/aboutTBUpdate.dtd diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul new file mode 100644 index 0000000..ceadf85 --- /dev/null +++ b/src/chrome/content/menu-overlay.xul @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?>  + + +<overlay id="torbutton-menu-overlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + <menupopup id="menu_HelpPopup"> + <menuitem id="menu_openHelp" removeelement="true"/> + <menuitem id="menu_openTour" removeelement="true"/> + <menuitem id="healthReport" removeelement="true"/> + <menuitem id="feedbackPage" removeelement="true"/> + <menuitem id="helpSafeMode" removeelement="true"/> + <menuitem id="menu_HelpPopup_reportPhishingtoolmenu" removeelement="true"/> + <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu" removeelement="true"/> +  + <box id="menu_HelpPopup_reportPhishingtoolmenu"/> + <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/> + </menupopup> +</overlay>

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 04 May '16

04 May '16

commit 49603b1f767f3d5a07f7f0759749f80d605529d7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 4 07:16:28 2016 +0000 Update translations for torbutton-aboutdialogdtd --- pa/aboutdialog.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pa/aboutdialog.dtd b/pa/aboutdialog.dtd index 5099ad7..8defa78 100644 --- a/pa/aboutdialog.dtd +++ b/pa/aboutdialog.dtd @@ -3,15 +3,15 @@ <!ENTITY project.tpoLink "the &vendorShortName;"> <!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> -<!ENTITY help.start "Want to help? "> +<!ENTITY help.start "ਮਦਦ ਚਾਹੀਦੀ ਹੈ?">  -<!ENTITY help.donateLink "Donate"> -<!ENTITY help.or " or "> +<!ENTITY help.donateLink "ਦਾਨ ਦਿਓ"> +<!ENTITY help.or "ਜਾਂ">  -<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.getInvolvedLink "ਭਾਗ ਲਵੋ"> <!ENTITY help.end "!">  -<!ENTITY bottomLinks.questions "Questions?"> +<!ENTITY bottomLinks.questions "ਸਵਾਲ?">  <!ENTITY bottomLinks.grow "Help the Tor Network Grow!">

1 0

[tor/master] Fix keccak-tiny portability on `exotic` platforms.
by nickm＠torproject.org 03 May '16

03 May '16

commit 8f292f1c33b033f36e17969f206c9332c0241e9a Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon May 2 10:24:35 2016 +0000 Fix keccak-tiny portability on `exotic` platforms. * SHA-3/SHAKE use little endian for certain things, so byteswap as needed. * The code was written under the assumption that unaligned access to quadwords is allowed, which isn't true particularly on non-Intel. --- changes/bug18943 | 6 +++ src/ext/keccak-tiny/keccak-tiny-unrolled.c | 72 +++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/changes/bug18943 b/changes/bug18943 new file mode 100644 index 0000000..53569f0 --- /dev/null +++ b/changes/bug18943 @@ -0,0 +1,6 @@ + o Major bugfixes (crypto, portability): + - The SHA3 and SHAKE routines now produce the correct output on + Big Endian systems, unbreaking the unit tests. No code calls + either algorithm family yet, so this is primarily a build fix. + Closes ticket 18943. + diff --git a/src/ext/keccak-tiny/keccak-tiny-unrolled.c b/src/ext/keccak-tiny/keccak-tiny-unrolled.c index 4b4f51c..d1342c3 100644 --- a/src/ext/keccak-tiny/keccak-tiny-unrolled.c +++ b/src/ext/keccak-tiny/keccak-tiny-unrolled.c @@ -11,6 +11,29 @@ #include <string.h> #include "crypto.h" +/******** Endianness conversion helpers ********/ + +static inline uint64_t +loadu64le(const unsigned char *x) { + uint64_t r = 0; + size_t i; + + for (i = 0; i < 8; ++i) { + r |= (uint64_t)x[i] << 8 * i; + } + return r; +} + +static inline void +storeu64le(uint8_t *x, uint64_t u) { + size_t i; + + for(i=0; i<8; ++i) { + x[i] = u; + u >>= 8; + } +} + /******** The Keccak-f[1600] permutation ********/ /*** Constants. ***/ @@ -80,24 +103,26 @@ static inline void keccakf(void* state) { /*** Some helper macros. ***/ -#define _(S) do { S } while (0) -#define FOR(i, ST, L, S) \ - _(for (size_t i = 0; i < L; i += ST) { S; }) -#define mkapply_ds(NAME, S) \ - static inline void NAME(uint8_t* dst, \ - const uint8_t* src, \ - size_t len) { \ - FOR(i, 1, len, S); \ - } -#define mkapply_sd(NAME, S) \ - static inline void NAME(const uint8_t* src, \ - uint8_t* dst, \ - size_t len) { \ - FOR(i, 1, len, S); \ +// `xorin` modified to handle Big Endian systems, `buf` being unaligned on +// systems that care about such things. Assumes that len is a multiple of 8, +// which is always true for the rates we use, and the modified finalize. +static inline void +xorin8(uint8_t *dst, const uint8_t *src, size_t len) { + uint64_t* a = (uint64_t*)dst; // Always aligned. + for (size_t i = 0; i < len; i += 8) { + a[i/8] ^= loadu64le(src + i); } +} -mkapply_ds(xorin, dst[i] ^= src[i]) // xorin -mkapply_sd(setout, dst[i] = src[i]) // setout +// `setout` likewise modified to handle Big Endian systems. Assumes that len +// is a multiple of 8, which is true for every rate we use. +static inline void +setout8(const uint8_t *src, uint8_t *dst, size_t len) { + const uint64_t *si = (const uint64_t*)src; // Always aligned. + for (size_t i = 0; i < len; i+= 8) { + storeu64le(dst+i, si[i/8]); + } +} #define P keccakf #define Plen KECCAK_MAX_RATE @@ -118,7 +143,7 @@ static inline void keccak_absorb_blocks(keccak_state *s, const uint8_t *buf, size_t nr_blocks) { size_t blen = nr_blocks * s->rate; - foldP(buf, blen, xorin); + foldP(buf, blen, xorin8); } static int @@ -161,10 +186,14 @@ static void keccak_finalize(keccak_state *s) { // Xor in the DS and pad frame. - s->a[s->offset] ^= s->delim; - s->a[s->rate - 1] ^= 0x80; + s->block[s->offset++] = s->delim; // DS. + for (size_t i = s->offset; i < s->rate; i++) { + s->block[i] = 0; + } + s->block[s->rate - 1] |= 0x80; // Pad frame. + // Xor in the last block. - xorin(s->a, s->block, s->offset); + xorin8(s->a, s->block, s->rate); memwipe(s->block, 0, sizeof(s->block)); s->finalized = 1; @@ -176,7 +205,7 @@ keccak_squeeze_blocks(keccak_state *s, uint8_t *out, size_t nr_blocks) { for (size_t n = 0; n < nr_blocks; n++) { keccakf(s->a); - setout(s->a, out, s->rate); + setout8(s->a, out, s->rate); out += s->rate; } } @@ -321,6 +350,7 @@ static inline int hash(uint8_t* out, size_t outlen, int ret = 0; keccak_state s; + keccak_cleanse(&s); switch (delim) { case KECCAK_DELIM_DIGEST:

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 03 May '16

03 May '16

commit 230a3d1400939eddf17c3df26e398104a38f5fb1 Merge: 8340bec 8f292f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 3 16:12:29 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18943 | 6 +++ src/ext/keccak-tiny/keccak-tiny-unrolled.c | 72 +++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 21 deletions(-)

1 0

[tor/maint-0.2.8] Fix keccak-tiny portability on `exotic` platforms.
by nickm＠torproject.org 03 May '16

03 May '16

commit 8f292f1c33b033f36e17969f206c9332c0241e9a Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon May 2 10:24:35 2016 +0000 Fix keccak-tiny portability on `exotic` platforms. * SHA-3/SHAKE use little endian for certain things, so byteswap as needed. * The code was written under the assumption that unaligned access to quadwords is allowed, which isn't true particularly on non-Intel. --- changes/bug18943 | 6 +++ src/ext/keccak-tiny/keccak-tiny-unrolled.c | 72 +++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/changes/bug18943 b/changes/bug18943 new file mode 100644 index 0000000..53569f0 --- /dev/null +++ b/changes/bug18943 @@ -0,0 +1,6 @@ + o Major bugfixes (crypto, portability): + - The SHA3 and SHAKE routines now produce the correct output on + Big Endian systems, unbreaking the unit tests. No code calls + either algorithm family yet, so this is primarily a build fix. + Closes ticket 18943. + diff --git a/src/ext/keccak-tiny/keccak-tiny-unrolled.c b/src/ext/keccak-tiny/keccak-tiny-unrolled.c index 4b4f51c..d1342c3 100644 --- a/src/ext/keccak-tiny/keccak-tiny-unrolled.c +++ b/src/ext/keccak-tiny/keccak-tiny-unrolled.c @@ -11,6 +11,29 @@ #include <string.h> #include "crypto.h" +/******** Endianness conversion helpers ********/ + +static inline uint64_t +loadu64le(const unsigned char *x) { + uint64_t r = 0; + size_t i; + + for (i = 0; i < 8; ++i) { + r |= (uint64_t)x[i] << 8 * i; + } + return r; +} + +static inline void +storeu64le(uint8_t *x, uint64_t u) { + size_t i; + + for(i=0; i<8; ++i) { + x[i] = u; + u >>= 8; + } +} + /******** The Keccak-f[1600] permutation ********/ /*** Constants. ***/ @@ -80,24 +103,26 @@ static inline void keccakf(void* state) { /*** Some helper macros. ***/ -#define _(S) do { S } while (0) -#define FOR(i, ST, L, S) \ - _(for (size_t i = 0; i < L; i += ST) { S; }) -#define mkapply_ds(NAME, S) \ - static inline void NAME(uint8_t* dst, \ - const uint8_t* src, \ - size_t len) { \ - FOR(i, 1, len, S); \ - } -#define mkapply_sd(NAME, S) \ - static inline void NAME(const uint8_t* src, \ - uint8_t* dst, \ - size_t len) { \ - FOR(i, 1, len, S); \ +// `xorin` modified to handle Big Endian systems, `buf` being unaligned on +// systems that care about such things. Assumes that len is a multiple of 8, +// which is always true for the rates we use, and the modified finalize. +static inline void +xorin8(uint8_t *dst, const uint8_t *src, size_t len) { + uint64_t* a = (uint64_t*)dst; // Always aligned. + for (size_t i = 0; i < len; i += 8) { + a[i/8] ^= loadu64le(src + i); } +} -mkapply_ds(xorin, dst[i] ^= src[i]) // xorin -mkapply_sd(setout, dst[i] = src[i]) // setout +// `setout` likewise modified to handle Big Endian systems. Assumes that len +// is a multiple of 8, which is true for every rate we use. +static inline void +setout8(const uint8_t *src, uint8_t *dst, size_t len) { + const uint64_t *si = (const uint64_t*)src; // Always aligned. + for (size_t i = 0; i < len; i+= 8) { + storeu64le(dst+i, si[i/8]); + } +} #define P keccakf #define Plen KECCAK_MAX_RATE @@ -118,7 +143,7 @@ static inline void keccak_absorb_blocks(keccak_state *s, const uint8_t *buf, size_t nr_blocks) { size_t blen = nr_blocks * s->rate; - foldP(buf, blen, xorin); + foldP(buf, blen, xorin8); } static int @@ -161,10 +186,14 @@ static void keccak_finalize(keccak_state *s) { // Xor in the DS and pad frame. - s->a[s->offset] ^= s->delim; - s->a[s->rate - 1] ^= 0x80; + s->block[s->offset++] = s->delim; // DS. + for (size_t i = s->offset; i < s->rate; i++) { + s->block[i] = 0; + } + s->block[s->rate - 1] |= 0x80; // Pad frame. + // Xor in the last block. - xorin(s->a, s->block, s->offset); + xorin8(s->a, s->block, s->rate); memwipe(s->block, 0, sizeof(s->block)); s->finalized = 1; @@ -176,7 +205,7 @@ keccak_squeeze_blocks(keccak_state *s, uint8_t *out, size_t nr_blocks) { for (size_t n = 0; n < nr_blocks; n++) { keccakf(s->a); - setout(s->a, out, s->rate); + setout8(s->a, out, s->rate); out += s->rate; } } @@ -321,6 +350,7 @@ static inline int hash(uint8_t* out, size_t outlen, int ret = 0; keccak_state s; + keccak_cleanse(&s); switch (delim) { case KECCAK_DELIM_DIGEST:

1 0

[torbirdy/master] Make TorBirdy XPI deterministic (#15459)
by sukhbir＠torproject.org 03 May '16

03 May '16

commit caaf2b593ba2a116ac8f63416bb311bcdd140ee2 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue May 3 15:29:52 2016 -0400 Make TorBirdy XPI deterministic (#15459) --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 96214b1..48c661c 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,15 @@ SHELL := /bin/bash VERSION := $(shell cat install.rdf|grep '<em:version>'|cut -d\> -f2|cut -d\< -f1) +FAKETIME := 200001010000 + make-xpi: zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE" +make-reproducible: + find . -print0 | xargs -0 touch -t $(FAKETIME) + zip -X ../torbirdy-$(VERSION).xpi `find . | sort` -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE" -x *.git* + clean: rm -f ../torbirdy-$(VERSION).xpi

1 0

[tor-browser-bundle/master] Folding in changelogs
by gk＠torproject.org 03 May '16

03 May '16

commit 5bf62ce8d5e4bbeec5eace152ae90cc36657f836 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 3 19:28:59 2016 +0000 Folding in changelogs --- Bundle-Data/Docs/ChangeLog.txt | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5ea56f1..b96cb79 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,48 @@ +Tor Browser 6.0a5-hardened -- April 28 2016 + * All Platforms + * Update Firefox to 45.1.0esr + * Update Tor to 0.2.8.2-alpha + * Update Torbutton to 1.9.5.3 + * Bug 18466: Make Torbutton compatible with Firefox ESR 45 + * Translation updates + * Update Tor Launcher to 0.2.8.4 + * Bug 13252: Do not store data in the application bundle + * Bug 10534: Don't advertise the help desk directly anymore + * Translation updates + * Update HTTPS-Everywhere to 5.1.6 + * Update NoScript to 2.9.0.11 + * Update meek to 0.22 (tag 0.22-18371-2) + * Bug 18371: Symlinks are incompatible with Gatekeeper signing + * Bug 15197 and child tickets: Rebase Tor Browser patches to ESR 45 + * Bug 18900: Fix broken updater on Linux + * Bug 18042: Disable SHA1 certificate support + * Bug 18821: Disable libmdns support for desktop and mobile + * Bug 18848: Disable additional welcome URL shown on first start + * Bug 14970: Exempt our extensions from signing requirement + * Bug 16328: Disable MediaDevices.enumerateDevices + * Bug 16673: Disable HTTP Alternative-Services + * Bug 17167: Disable Mozilla's tracking protection + * Bug 18603: Disable performance-based WebGL fingerprinting option + * Bug 18738: Disable Selfsupport and Unified Telemetry + * Bug 18799: Disable Network Tickler + * Bug 18800: Remove DNS lookup in lockfile code + * Bug 18801: Disable dom.push preferences + * Bug 18802: Remove the JS-based Flash VM (Shumway) + * Bug 18863: Disable MozTCPSocket explicitly + * Bug 15640: Place Canvas MediaStream behind site permission + * Bug 16326: Verify cache isolation for Request and Fetch APIs + * Bug 18741: Fix OCSP and favicon isolation for ESR 45 + * Bug 16998: Disable <link rel="preconnect"> for now + * Bug 17506: Reenable building hardened Tor Browser with startup cache + * Bug 18898: Exempt the meek extension from the signing requirement as well + * Bug 18899: Don't copy Torbutton, TorLauncher, etc. into meek profile + * Bug 18890: Test importScripts() for cache and network isolation + * Bug 18726: Add new default obfs4 bridge (GreenBelt) + * Build System + * Bug 16224: Don't use BUILD_HOSTNAME anymore in Firefox builds + * Bug 18699: Stripping fails due to obsolete Browser/components directory + * Bug 18698: Include libgconf2-dev for our Linux builds + Tor Browser 6.0a5 -- April 28 2016 * All Platforms * Update Firefox to 45.1.0esr @@ -58,6 +103,16 @@ Tor Browser 6.0a5 -- April 28 2016 * Bug 18699: Stripping fails due to obsolete Browser/components directory * Bug 18698: Include libgconf2-dev for our Linux builds +Tor Browser 5.5.5 -- April 26 2016 + * All Platforms + * Update Firefox to 38.8.0esr + * Update Tor Launcher to 0.2.7.9 + * Bug 10534: Don't advertise the help desk directly anymore + * Translation updates + * Update HTTPS-Everywhere to 5.1.6 + * Update NoScript to 2.9.0.11 + * Bug 18726: Add new default obfs4 bridge (GreenBelt) + Tor Browser 6.0a4-hardened -- March 17 2016 * All Platforms * Update Firefox to 38.7.1esr

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 03 May '16

03 May '16

commit e51823989e0f57328f6b710e599ed3b564ac0c37 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon May 2 16:28:10 2016 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Avoid special handling and use of "add-if" for unpacked add-ons that are located under distribution/extensions (fixes bug #18951). --- tools/update-packaging/common.sh | 36 +++++++----------------------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh index 5af9e27..96bfa43 100755 --- a/tools/update-packaging/common.sh +++ b/tools/update-packaging/common.sh @@ -66,22 +66,10 @@ make_add_instruction() { forced= fi - is_extension=$(echo "$f" | grep -c 'distribution/extensions/.*/') - if [ $is_extension = "1" ]; then - # Use the subdirectory of the extensions folder as the file to test - # before performing this add instruction. - testdir=$(echo "$f" | sed 's/$.*distribution\/extensions\/[^\/]*$\/.*/\1/') - verbose_notice " add-if \"$testdir\" \"$f\"" - echo "add-if \"$testdir\" \"$f\"" >> "$filev2" - if [ ! "$filev3" = "" ]; then - echo "add-if \"$testdir\" \"$f\"" >> "$filev3" - fi - else - verbose_notice " add \"$f\"$forced" - echo "add \"$f\"" >> "$filev2" - if [ ! "$filev3" = "" ]; then - echo "add \"$f\"" >> "$filev3" - fi + verbose_notice " add \"$f\"$forced" + echo "add \"$f\"" >> "$filev2" + if [ ! "$filev3" = "" ]; then + echo "add \"$f\"" >> "$filev3" fi } @@ -132,19 +120,9 @@ make_patch_instruction() { filev2="$2" filev3="$3" - is_extension=$(echo "$f" | grep -c 'distribution/extensions/.*/') - if [ $is_extension = "1" ]; then - # Use the subdirectory of the extensions folder as the file to test - # before performing this add instruction. - testdir=$(echo "$f" | sed 's/$.*distribution\/extensions\/[^\/]*$\/.*/\1/') - verbose_notice " patch-if \"$testdir\" \"$f.patch\" \"$f\"" - echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" >> "$filev2" - echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" >> "$filev3" - else - verbose_notice " patch \"$f.patch\" \"$f\"" - echo "patch \"$f.patch\" \"$f\"" >> "$filev2" - echo "patch \"$f.patch\" \"$f\"" >> "$filev3" - fi + verbose_notice " patch \"$f.patch\" \"$f\"" + echo "patch \"$f.patch\" \"$f\"" >> "$filev2" + echo "patch \"$f.patch\" \"$f\"" >> "$filev3" } append_remove_instructions() {

1 0