February 2016 - tor-commits - lists.torproject.org

[tor-browser-bundle/maint-5.5] Release preparations
by gk＠torproject.org 02 Feb '16

02 Feb '16

commit 71f272dcdb00007e9314cfef907ad092ad372b8d Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 2 12:47:29 2016 +0000 Release preparations --- Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++ gitian/versions | 2 +- tools/update-responses/config.yml | 9 +++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index dcd0398..286b370 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,11 @@ +Tor Browser 5.5.1 -- February 4 2016 + * All Platforms + * Bug 18168: Don't clear an iframe's window.name (fix of #16620) + * Bug 18172: Add Emoji support + * Bug 18137: Add two new obfs4 default bridges + * Windows + * Bug 18169: Whitelist zh-CN UI font + Tor Browser 5.5 -- January 26 2016 * All Platforms * Update Firefox to 38.6.0esr diff --git a/gitian/versions b/gitian/versions index 47b981b..a3e9f2f 100755 --- a/gitian/versions +++ b/gitian/versions @@ -11,7 +11,7 @@ FIREFOX_VERSION=38.6.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build2 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.8 TORBUTTON_TAG=1.9.4.3 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 362c146..470ee06 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,14 +10,15 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.5a6 - release: 5.5 + release: 5.5.1 versions: - 5.5: + 5.5.1: platformVersion: 38.6.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-55-released - download_url: https://www.torproject.org/dist/torbrowser/5.5 + detailsURL: https://blog.torproject.org/blog/tor-browser-551-released + download_url: https://www.torproject.org/dist/torbrowser/5.5.1 incremental_from: - 5.0.7 + - 5.5 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser/tor-browser-38.6.0esr-5.5-1] fixup! Bug 16620: Clear window.name when no referrer sent
by gk＠torproject.org 02 Feb '16

02 Feb '16

commit 89226c03e3aed9c1ff3c740e0dcdcb0ac7e8e5ff Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jan 29 16:47:26 2016 -0500 fixup! Bug 16620: Clear window.name when no referrer sent Only clear window.name for the top document, not for frames. This fixes Bug 18168: iframe-based AJAX call opening in new tab and more closely matches the behavior of Torbutton's old JavaScript-based implementation. --- docshell/base/nsDocShell.cpp | 18 +++-- docshell/test/mochitest.ini | 1 + docshell/test/test_tor_bug16620.html | 131 ++++++++++++++++++++++++++++------- docshell/test/tor_bug16620_form.html | 51 ++++++++++++++ 4 files changed, 173 insertions(+), 28 deletions(-) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 0c404fa..3f059673 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -8993,8 +8993,9 @@ nsDocShell::CreateContentViewer(const char* aContentType, } FirePageHideNotification(!mSavingOldViewer); - // Tor bug # 16620: Clear window.name if there is no referrer. We make an - // exception for new windows, e.g., window.open(url, "MyName"). + // Tor bug 16620: Clear window.name of top-level documents if + // there is no referrer. We make an exception for new windows, + // e.g., window.open(url, "MyName"). bool isNewWindowTarget = false; nsCOMPtr<nsIPropertyBag2> props(do_QueryInterface(aRequest, &rv)); if (props) { @@ -9008,6 +9009,13 @@ nsDocShell::CreateContentViewer(const char* aContentType, if (httpChannel) httpChannel->GetReferrer(getter_AddRefs(httpReferrer)); + bool isTopFrame = true; + nsCOMPtr<nsIDocShellTreeItem> targetParentTreeItem; + rv = GetSameTypeParent(getter_AddRefs(targetParentTreeItem)); + if (NS_SUCCEEDED(rv) && targetParentTreeItem) { + isTopFrame = false; + } + #ifdef DEBUG_WINDOW_NAME printf("DOCSHELL %p CreateContentViewer - possibly clearing window.name:\n", this); printf(" current window.name: \"%s\"\n", @@ -9020,6 +9028,7 @@ nsDocShell::CreateContentViewer(const char* aContentType, mLoadingURI->GetSpec(loadingSpec); printf(" current URI: %s\n", curSpec.get()); printf(" loading URI: %s\n", loadingSpec.get()); + printf(" is top document: %s\n", isTopFrame ? "Yes" : "No"); if (!httpReferrer) { printf(" referrer: None\n"); @@ -9030,12 +9039,13 @@ nsDocShell::CreateContentViewer(const char* aContentType, } #endif - if (!httpReferrer) + bool clearName = isTopFrame && !httpReferrer; + if (clearName) SetName(NS_LITERAL_STRING("")); #ifdef DEBUG_WINDOW_NAME printf(" action taken: %s window.name\n", - httpReferrer ? "Preserved" : "Cleared"); + clearName ? "Cleared" : "Preserved"); #endif } diff --git a/docshell/test/mochitest.ini b/docshell/test/mochitest.ini index a1325b9..274a77e 100644 --- a/docshell/test/mochitest.ini +++ b/docshell/test/mochitest.ini @@ -35,6 +35,7 @@ support-files = file_pushState_after_document_open.html historyframes.html tor_bug16620.html + tor_bug16620_form.html [test_anchor_scroll_after_document_open.html] [test_bfcache_plus_hash.html] diff --git a/docshell/test/test_tor_bug16620.html b/docshell/test/test_tor_bug16620.html index 0fe9603..d528e17 100644 --- a/docshell/test/test_tor_bug16620.html +++ b/docshell/test/test_tor_bug16620.html @@ -17,36 +17,80 @@ // ## Test constants const kTestPath = "/tests/docshell/test/"; -const kFile = "tor_bug16620.html"; +const kLinkFile = "tor_bug16620.html"; +const kFormFile = "tor_bug16620_form.html"; const kBaseURL1 = "http://example.com"; +const kBaseURL1_https = "https://example.com"; const kBaseURL2 = "http://example.net"; +const kSendReferrerPref = "network.http.sendRefererHeader"; +const kSendReferrerNever = 0; +const kSendReferrerForUserAction = 1; +const kSendReferrerAlways = 2; let gTests = [ - // Test #1: Same domain: + // Test #1: Same domain; never send referrer. { startURL: kBaseURL1, destURL: kBaseURL1, + referrerPref: kSendReferrerNever, + expectIsolation: true }, + + // Test #2: Same domain; send referrer upon user action. + { startURL: kBaseURL1, destURL: kBaseURL1, + referrerPref: kSendReferrerForUserAction, expectIsolation: false }, - // Test #2: Different top-level domains: + // Test #3: Same domain; always send referrer. + { startURL: kBaseURL1, destURL: kBaseURL1, + referrerPref: kSendReferrerAlways, + expectIsolation: false }, + + // Test #4: Different top-level domains; never send referrer. + { startURL: kBaseURL1, destURL: kBaseURL2, + referrerPref: kSendReferrerNever, + expectIsolation: true }, + + // Test #5: Different top-level domains; send referrer upon user action. { startURL: kBaseURL1, destURL: kBaseURL2, + referrerPref: kSendReferrerForUserAction, expectIsolation: false }, - // Test #3: Same domain, rel="noreferrer" on link: + // Test #6: Different top-level domains; always send referrer. + { startURL: kBaseURL1, destURL: kBaseURL2, + referrerPref: kSendReferrerAlways, + expectIsolation: false }, + + // Test #7: https -> http transition. + { startURL: kBaseURL1_https, destURL: kBaseURL1, + referrerPref: kSendReferrerForUserAction, + expectIsolation: true }, + + // Test #8: Same domain, rel="noreferrer" on link. { startURL: kBaseURL1, destURL: kBaseURL1, noReferrerOnLink: true, + referrerPref: kSendReferrerAlways, expectIsolation: true }, - // Test #4: Same domain, "no-referrer" meta tag in document: + // Test #9: Same domain, "no-referrer" meta tag in document. { startURL: kBaseURL1, destURL: kBaseURL1, noReferrerInMetaTag: true, + referrerPref: kSendReferrerAlways, expectIsolation: true }, - // Test #5: Like test 4, but reset window.name during unload: + // Test #10: Like test #9, but reset window.name during unload. // (similar to http://www.thomasfrank.se/sessvarsTestPage1.html) { startURL: kBaseURL1, destURL: kBaseURL1, noReferrerInMetaTag: true, resetInUnload: true, + referrerPref: kSendReferrerAlways, expectIsolation: true }, - // Test #6: Data URL as destination (no referrer): + // Test #11: Data URL as destination (no referrer). { startURL: kBaseURL1, + referrerPref: kSendReferrerAlways, expectIsolation: true }, + + // Test #12: Ensure that window.name is preserved when a dynamically loaded + // iframe is used to perform a form post (regression test for Tor bug 18168). + { startURL: kBaseURL1, + isFormTest: true, + referrerPref: kSendReferrerAlways, + expectIsolation: false }, ]; let gCurTest = 0; @@ -65,9 +109,19 @@ function startNextTest() { SimpleTest.finish(); } else { let curTest = gTests[gCurTest - 1]; - let url = curTest.startURL + kTestPath + kFile + "?firstDocLoaded"; + if ("referrerPref" in curTest) + SpecialPowers.setIntPref(kSendReferrerPref, curTest.referrerPref); + else + SpecialPowers.setIntPref(kSendReferrerPref, kSendReferrerForUserAction); gCurWinName = generateRandomName(); - gChildWin = window.open(url, gCurWinName); + let url = curTest.startURL + kTestPath; + if (curTest.isFormTest === true) { + url += kFormFile + "?" + gCurWinName; + gChildWin = window.open(url, undefined); + } else { + url += kLinkFile + "?firstDocLoaded"; + gChildWin = window.open(url, gCurWinName); + } } } @@ -78,16 +132,22 @@ window.addEventListener("message", function(aEvent) { // console.log("parent received message:" + JSON.stringify(aEvent.data)); + let proceedToNextTest = false; let curTest = gTests[gCurTest - 1]; let state = aEvent.data.state; let winName = aEvent.data.winName; if ("firstDocLoaded" == state) { - ok(winName === gCurWinName, "Test #" + gCurTest + + // Process response from step one of the link-based tests. + let step1Passed = (winName === gCurWinName); + if (!step1Passed) { + ok(step1Passed, "Test #" + gCurTest + " - first document's name matches window.open parameter"); + proceedToNextTest = true; + } // Send an "openURL" message to the loaded document. let url2 = (curTest.destURL) - ? curTest.destURL + kTestPath + kFile + "?secondDocLoaded" + ? curTest.destURL + kTestPath + kLinkFile + "?secondDocLoaded" : gDataURL; let noReferrerOnLink = (curTest.noReferrerOnLink === true); let noReferrerInMetaTag = (curTest.noReferrerInMetaTag === true); @@ -98,6 +158,7 @@ window.addEventListener("message", function(aEvent) { resetInUnload: resetInUnload }, aEvent.origin); } else if ("secondDocLoaded" == state) { + // Process response from step two of the link-based tests. if (curTest.expectIsolation) { ok(winName === "", "Test #" + gCurTest + " - second document: name was cleared"); @@ -105,25 +166,47 @@ window.addEventListener("message", function(aEvent) { ok(winName === gCurWinName, "Test #" + gCurTest + " - second document: name was preserved"); } + proceedToNextTest = true; + } else if ("formPostDone" == state) { + // Process response from the form post tests. + if (curTest.expectIsolation) { + ok(winName === "", + "Test #" + gCurTest + " - iframe form post: name was cleared"); + } else { + ok(winName === gCurWinName, + "Test #" + gCurTest + " - iframe form post: name was preserved"); + } + proceedToNextTest = true; + + } + if (proceedToNextTest) { gChildWin.close(); startNextTest(); } }, false); -SimpleTest.waitForExplicitFinish(); - -// Read file contents, construct a data URL (used by some tests), and -// then start the first test. -let url = kTestPath + kFile; -let xhr = new XMLHttpRequest(); -xhr.open("GET", url); -xhr.onload = function() { - gDataURL = "data:text/html;charset=utf-8," - + encodeURIComponent(this.responseText); - startNextTest(); -} -xhr.send(); + SimpleTest.waitForExplicitFinish(); + + if (SpecialPowers.getBoolPref("security.nocertdb")) { + // Mochitests don't simulate https correctly with "security.nocertdb" + // enabled. See https://bugs.torproject.org/18087 + ok(false, "Please disable the pref `security.nocertdb` before running this test."); + SimpleTest.finish(); + } else { + + // Read file contents, construct a data URL (used by some tests), and + // then start the first test. + let url = kTestPath + kLinkFile; + let xhr = new XMLHttpRequest(); + xhr.open("GET", url); + xhr.onload = function() { + gDataURL = "data:text/html;charset=utf-8," + + encodeURIComponent(this.responseText); + startNextTest(); + } + xhr.send(); + } </script> </body> </html> diff --git a/docshell/test/tor_bug16620_form.html b/docshell/test/tor_bug16620_form.html new file mode 100644 index 0000000..3b6e6c7 --- /dev/null +++ b/docshell/test/tor_bug16620_form.html @@ -0,0 +1,51 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta charset="UTF-8"> + <title>Supporting Form-based Doc for Tor Bug 16620 Tests</title> +</head> +<body> + +<script type="application/javascript;version=1.7"> +document.addEventListener("DOMContentLoaded", function () { + addPostTarget(); +}, false); + + +function addPostTarget() +{ + let frameName = location.search.substr(1); + let form = document.getElementById("postform"); + let iframe = document.createElement("iframe"); + iframe.style.border = "1px solid red"; + iframe.src = "about:blank"; + form.target = iframe.name = iframe.id = frameName; + document.body.appendChild(iframe); + + let didSubmit = false; + iframe.onload = function() { + if (!didSubmit) { + didSubmit = true; + let submitButton = document.getElementById("submitButton"); + submitButton.click(); + } else { + // Form submission complete. Report iframe's name to test driver. + opener.postMessage({ state: "formPostDone", winName: iframe.name }, "*"); + } + }; +} + +</script> +<form name="postform" id="postform" + action="data:text/plain;charset=utf-8,Hello%20world" + method="POST" enctype="multipart/form-data"> + <input type="hidden" name="field1" value="value1"><br> + <input id="submitButton" type="submit" value="Post It"> +</body> +</html>

1 0

[tor-browser/tor-browser-38.6.0esr-6.0-1] fixup! Bug 16620: Clear window.name when no referrer sent
by gk＠torproject.org 02 Feb '16

02 Feb '16

commit bc8af4dcdafd3de656bbff245eb70a0025829b90 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jan 29 16:47:26 2016 -0500 fixup! Bug 16620: Clear window.name when no referrer sent Only clear window.name for the top document, not for frames. This fixes Bug 18168: iframe-based AJAX call opening in new tab and more closely matches the behavior of Torbutton's old JavaScript-based implementation. --- docshell/base/nsDocShell.cpp | 18 +++-- docshell/test/mochitest.ini | 1 + docshell/test/test_tor_bug16620.html | 131 ++++++++++++++++++++++++++++------- docshell/test/tor_bug16620_form.html | 51 ++++++++++++++ 4 files changed, 173 insertions(+), 28 deletions(-) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 0c404fa..3f059673 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -8993,8 +8993,9 @@ nsDocShell::CreateContentViewer(const char* aContentType, } FirePageHideNotification(!mSavingOldViewer); - // Tor bug # 16620: Clear window.name if there is no referrer. We make an - // exception for new windows, e.g., window.open(url, "MyName"). + // Tor bug 16620: Clear window.name of top-level documents if + // there is no referrer. We make an exception for new windows, + // e.g., window.open(url, "MyName"). bool isNewWindowTarget = false; nsCOMPtr<nsIPropertyBag2> props(do_QueryInterface(aRequest, &rv)); if (props) { @@ -9008,6 +9009,13 @@ nsDocShell::CreateContentViewer(const char* aContentType, if (httpChannel) httpChannel->GetReferrer(getter_AddRefs(httpReferrer)); + bool isTopFrame = true; + nsCOMPtr<nsIDocShellTreeItem> targetParentTreeItem; + rv = GetSameTypeParent(getter_AddRefs(targetParentTreeItem)); + if (NS_SUCCEEDED(rv) && targetParentTreeItem) { + isTopFrame = false; + } + #ifdef DEBUG_WINDOW_NAME printf("DOCSHELL %p CreateContentViewer - possibly clearing window.name:\n", this); printf(" current window.name: \"%s\"\n", @@ -9020,6 +9028,7 @@ nsDocShell::CreateContentViewer(const char* aContentType, mLoadingURI->GetSpec(loadingSpec); printf(" current URI: %s\n", curSpec.get()); printf(" loading URI: %s\n", loadingSpec.get()); + printf(" is top document: %s\n", isTopFrame ? "Yes" : "No"); if (!httpReferrer) { printf(" referrer: None\n"); @@ -9030,12 +9039,13 @@ nsDocShell::CreateContentViewer(const char* aContentType, } #endif - if (!httpReferrer) + bool clearName = isTopFrame && !httpReferrer; + if (clearName) SetName(NS_LITERAL_STRING("")); #ifdef DEBUG_WINDOW_NAME printf(" action taken: %s window.name\n", - httpReferrer ? "Preserved" : "Cleared"); + clearName ? "Cleared" : "Preserved"); #endif } diff --git a/docshell/test/mochitest.ini b/docshell/test/mochitest.ini index a1325b9..274a77e 100644 --- a/docshell/test/mochitest.ini +++ b/docshell/test/mochitest.ini @@ -35,6 +35,7 @@ support-files = file_pushState_after_document_open.html historyframes.html tor_bug16620.html + tor_bug16620_form.html [test_anchor_scroll_after_document_open.html] [test_bfcache_plus_hash.html] diff --git a/docshell/test/test_tor_bug16620.html b/docshell/test/test_tor_bug16620.html index 0fe9603..d528e17 100644 --- a/docshell/test/test_tor_bug16620.html +++ b/docshell/test/test_tor_bug16620.html @@ -17,36 +17,80 @@ // ## Test constants const kTestPath = "/tests/docshell/test/"; -const kFile = "tor_bug16620.html"; +const kLinkFile = "tor_bug16620.html"; +const kFormFile = "tor_bug16620_form.html"; const kBaseURL1 = "http://example.com"; +const kBaseURL1_https = "https://example.com"; const kBaseURL2 = "http://example.net"; +const kSendReferrerPref = "network.http.sendRefererHeader"; +const kSendReferrerNever = 0; +const kSendReferrerForUserAction = 1; +const kSendReferrerAlways = 2; let gTests = [ - // Test #1: Same domain: + // Test #1: Same domain; never send referrer. { startURL: kBaseURL1, destURL: kBaseURL1, + referrerPref: kSendReferrerNever, + expectIsolation: true }, + + // Test #2: Same domain; send referrer upon user action. + { startURL: kBaseURL1, destURL: kBaseURL1, + referrerPref: kSendReferrerForUserAction, expectIsolation: false }, - // Test #2: Different top-level domains: + // Test #3: Same domain; always send referrer. + { startURL: kBaseURL1, destURL: kBaseURL1, + referrerPref: kSendReferrerAlways, + expectIsolation: false }, + + // Test #4: Different top-level domains; never send referrer. + { startURL: kBaseURL1, destURL: kBaseURL2, + referrerPref: kSendReferrerNever, + expectIsolation: true }, + + // Test #5: Different top-level domains; send referrer upon user action. { startURL: kBaseURL1, destURL: kBaseURL2, + referrerPref: kSendReferrerForUserAction, expectIsolation: false }, - // Test #3: Same domain, rel="noreferrer" on link: + // Test #6: Different top-level domains; always send referrer. + { startURL: kBaseURL1, destURL: kBaseURL2, + referrerPref: kSendReferrerAlways, + expectIsolation: false }, + + // Test #7: https -> http transition. + { startURL: kBaseURL1_https, destURL: kBaseURL1, + referrerPref: kSendReferrerForUserAction, + expectIsolation: true }, + + // Test #8: Same domain, rel="noreferrer" on link. { startURL: kBaseURL1, destURL: kBaseURL1, noReferrerOnLink: true, + referrerPref: kSendReferrerAlways, expectIsolation: true }, - // Test #4: Same domain, "no-referrer" meta tag in document: + // Test #9: Same domain, "no-referrer" meta tag in document. { startURL: kBaseURL1, destURL: kBaseURL1, noReferrerInMetaTag: true, + referrerPref: kSendReferrerAlways, expectIsolation: true }, - // Test #5: Like test 4, but reset window.name during unload: + // Test #10: Like test #9, but reset window.name during unload. // (similar to http://www.thomasfrank.se/sessvarsTestPage1.html) { startURL: kBaseURL1, destURL: kBaseURL1, noReferrerInMetaTag: true, resetInUnload: true, + referrerPref: kSendReferrerAlways, expectIsolation: true }, - // Test #6: Data URL as destination (no referrer): + // Test #11: Data URL as destination (no referrer). { startURL: kBaseURL1, + referrerPref: kSendReferrerAlways, expectIsolation: true }, + + // Test #12: Ensure that window.name is preserved when a dynamically loaded + // iframe is used to perform a form post (regression test for Tor bug 18168). + { startURL: kBaseURL1, + isFormTest: true, + referrerPref: kSendReferrerAlways, + expectIsolation: false }, ]; let gCurTest = 0; @@ -65,9 +109,19 @@ function startNextTest() { SimpleTest.finish(); } else { let curTest = gTests[gCurTest - 1]; - let url = curTest.startURL + kTestPath + kFile + "?firstDocLoaded"; + if ("referrerPref" in curTest) + SpecialPowers.setIntPref(kSendReferrerPref, curTest.referrerPref); + else + SpecialPowers.setIntPref(kSendReferrerPref, kSendReferrerForUserAction); gCurWinName = generateRandomName(); - gChildWin = window.open(url, gCurWinName); + let url = curTest.startURL + kTestPath; + if (curTest.isFormTest === true) { + url += kFormFile + "?" + gCurWinName; + gChildWin = window.open(url, undefined); + } else { + url += kLinkFile + "?firstDocLoaded"; + gChildWin = window.open(url, gCurWinName); + } } } @@ -78,16 +132,22 @@ window.addEventListener("message", function(aEvent) { // console.log("parent received message:" + JSON.stringify(aEvent.data)); + let proceedToNextTest = false; let curTest = gTests[gCurTest - 1]; let state = aEvent.data.state; let winName = aEvent.data.winName; if ("firstDocLoaded" == state) { - ok(winName === gCurWinName, "Test #" + gCurTest + + // Process response from step one of the link-based tests. + let step1Passed = (winName === gCurWinName); + if (!step1Passed) { + ok(step1Passed, "Test #" + gCurTest + " - first document's name matches window.open parameter"); + proceedToNextTest = true; + } // Send an "openURL" message to the loaded document. let url2 = (curTest.destURL) - ? curTest.destURL + kTestPath + kFile + "?secondDocLoaded" + ? curTest.destURL + kTestPath + kLinkFile + "?secondDocLoaded" : gDataURL; let noReferrerOnLink = (curTest.noReferrerOnLink === true); let noReferrerInMetaTag = (curTest.noReferrerInMetaTag === true); @@ -98,6 +158,7 @@ window.addEventListener("message", function(aEvent) { resetInUnload: resetInUnload }, aEvent.origin); } else if ("secondDocLoaded" == state) { + // Process response from step two of the link-based tests. if (curTest.expectIsolation) { ok(winName === "", "Test #" + gCurTest + " - second document: name was cleared"); @@ -105,25 +166,47 @@ window.addEventListener("message", function(aEvent) { ok(winName === gCurWinName, "Test #" + gCurTest + " - second document: name was preserved"); } + proceedToNextTest = true; + } else if ("formPostDone" == state) { + // Process response from the form post tests. + if (curTest.expectIsolation) { + ok(winName === "", + "Test #" + gCurTest + " - iframe form post: name was cleared"); + } else { + ok(winName === gCurWinName, + "Test #" + gCurTest + " - iframe form post: name was preserved"); + } + proceedToNextTest = true; + + } + if (proceedToNextTest) { gChildWin.close(); startNextTest(); } }, false); -SimpleTest.waitForExplicitFinish(); - -// Read file contents, construct a data URL (used by some tests), and -// then start the first test. -let url = kTestPath + kFile; -let xhr = new XMLHttpRequest(); -xhr.open("GET", url); -xhr.onload = function() { - gDataURL = "data:text/html;charset=utf-8," - + encodeURIComponent(this.responseText); - startNextTest(); -} -xhr.send(); + SimpleTest.waitForExplicitFinish(); + + if (SpecialPowers.getBoolPref("security.nocertdb")) { + // Mochitests don't simulate https correctly with "security.nocertdb" + // enabled. See https://bugs.torproject.org/18087 + ok(false, "Please disable the pref `security.nocertdb` before running this test."); + SimpleTest.finish(); + } else { + + // Read file contents, construct a data URL (used by some tests), and + // then start the first test. + let url = kTestPath + kLinkFile; + let xhr = new XMLHttpRequest(); + xhr.open("GET", url); + xhr.onload = function() { + gDataURL = "data:text/html;charset=utf-8," + + encodeURIComponent(this.responseText); + startNextTest(); + } + xhr.send(); + } </script> </body> </html> diff --git a/docshell/test/tor_bug16620_form.html b/docshell/test/tor_bug16620_form.html new file mode 100644 index 0000000..3b6e6c7 --- /dev/null +++ b/docshell/test/tor_bug16620_form.html @@ -0,0 +1,51 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta charset="UTF-8"> + <title>Supporting Form-based Doc for Tor Bug 16620 Tests</title> +</head> +<body> + +<script type="application/javascript;version=1.7"> +document.addEventListener("DOMContentLoaded", function () { + addPostTarget(); +}, false); + + +function addPostTarget() +{ + let frameName = location.search.substr(1); + let form = document.getElementById("postform"); + let iframe = document.createElement("iframe"); + iframe.style.border = "1px solid red"; + iframe.src = "about:blank"; + form.target = iframe.name = iframe.id = frameName; + document.body.appendChild(iframe); + + let didSubmit = false; + iframe.onload = function() { + if (!didSubmit) { + didSubmit = true; + let submitButton = document.getElementById("submitButton"); + submitButton.click(); + } else { + // Form submission complete. Report iframe's name to test driver. + opener.postMessage({ state: "formPostDone", winName: iframe.name }, "*"); + } + }; +} + +</script> +<form name="postform" id="postform" + action="data:text/plain;charset=utf-8,Hello%20world" + method="POST" enctype="multipart/form-data"> + <input type="hidden" name="field1" value="value1"><br> + <input id="submitButton" type="submit" value="Post It"> +</body> +</html>

1 0

[tor-browser-bundle/hardened-builds] Bug 18172: Bundle Noto Emoji Font in Linux TBB
by gk＠torproject.org 02 Feb '16

02 Feb '16

commit ee6fd02653fc0e396bee5daa034bd00be890ccb5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jan 28 15:16:21 2016 -0800 Bug 18172: Bundle Noto Emoji Font in Linux TBB (Also removing unneeded NOTOCJKFONT_VER statements.) --- gitian/descriptors/linux/gitian-bundle.yml | 2 ++ gitian/fetch-inputs.sh | 4 ++-- gitian/verify-tags.sh | 2 +- gitian/versions | 4 +++- gitian/versions.alpha | 4 +++- gitian/versions.beta | 4 +++- gitian/versions.nightly | 4 +++- 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 48c68eb..7629b4f 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -49,6 +49,7 @@ files: - "tbb-docs.zip" - "NotoSansCJKsc-Regular.otf" - "STIXv1.1.1-latex.zip" +- "NotoEmoji-Regular.ttf" script: | INSTDIR="$HOME/install" source versions @@ -146,6 +147,7 @@ script: | cp NotoSansCJKsc-Regular.otf ${TB_STAGE_DIR}/Browser/fonts/ unzip -o STIXv1.1.1-latex.zip -d STIX cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" ${TB_STAGE_DIR}/Browser/fonts/ + cp NotoEmoji-Regular.ttf ${TB_STAGE_DIR}/Browser/fonts/ # unzip relativelink-src.zip cp RelativeLink/* ${TB_STAGE_DIR}/Browser/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 206023b..c6a401d 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -155,7 +155,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO NOTOCJKFONT STIXMATHFONT +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -167,7 +167,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 82a810a..77d71b0 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -141,7 +141,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 8e35391..cbb9a41 100755 --- a/gitian/versions +++ b/gitian/versions @@ -58,7 +58,6 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 -NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -86,6 +85,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip +NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1 @@ -109,6 +109,7 @@ GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 +NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -135,3 +136,4 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… +NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd89c5ce800/fonts/${NOTOEMOJIFONT_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f1ef483..3f2df43 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -59,7 +59,6 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 -NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -86,6 +85,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip +NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -108,6 +108,7 @@ GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 +NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -133,3 +134,4 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… +NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd89c5ce800/fonts/${NOTOEMOJIFONT_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 43c5fde..243eb40 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -51,7 +51,6 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 -NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -79,6 +78,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip +NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -101,6 +101,7 @@ PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 +NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -127,3 +128,4 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… +NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd89c5ce800/fonts/${NOTOEMOJIFONT_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 44e4ddb..66ad9d1 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -62,7 +62,6 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 -NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -89,6 +88,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip +NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -111,6 +111,7 @@ GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 +NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -136,3 +137,4 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… +NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd89c5ce800/fonts/${NOTOEMOJIFONT_PACKAGE}

1 0

[tor-browser-bundle/maint-5.5] Bug #18172: Bundle Noto Emoji Font in Linux TBB
by gk＠torproject.org 02 Feb '16

02 Feb '16

commit 7aa3abf90371fb82518edf5d54e862e91744c97b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jan 28 15:16:21 2016 -0800 Bug #18172: Bundle Noto Emoji Font in Linux TBB (Also removing unneeded NOTOCJKFONT_VER statements.) --- gitian/descriptors/linux/gitian-bundle.yml | 2 ++ gitian/fetch-inputs.sh | 4 ++-- gitian/verify-tags.sh | 2 +- gitian/versions | 4 +++- gitian/versions.alpha | 4 +++- gitian/versions.beta | 4 +++- gitian/versions.nightly | 4 +++- 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 15f6359..fd1ae91 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -56,6 +56,7 @@ files: - "tbb-docs.zip" - "NotoSansCJKsc-Regular.otf" - "STIXv1.1.1-latex.zip" +- "NotoEmoji-Regular.ttf" script: | INSTDIR="$HOME/install" source versions @@ -153,6 +154,7 @@ script: | cp NotoSansCJKsc-Regular.otf ${TB_STAGE_DIR}/Browser/fonts/ unzip -o STIXv1.1.1-latex.zip -d STIX cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" ${TB_STAGE_DIR}/Browser/fonts/ + cp NotoEmoji-Regular.ttf ${TB_STAGE_DIR}/Browser/fonts/ # unzip relativelink-src.zip cp RelativeLink/* ${TB_STAGE_DIR}/Browser/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 206023b..c6a401d 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -155,7 +155,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO NOTOCJKFONT STIXMATHFONT +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -167,7 +167,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 82a810a..77d71b0 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -141,7 +141,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 7ff094e..47b981b 100755 --- a/gitian/versions +++ b/gitian/versions @@ -55,7 +55,6 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 -NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -82,6 +81,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip +NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -104,6 +104,7 @@ GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 +NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -129,3 +130,4 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… +NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd89c5ce800/fonts/${NOTOEMOJIFONT_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 95ca078..e34097c 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -55,7 +55,6 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 -NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -82,6 +81,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip +NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -104,6 +104,7 @@ GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 +NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -129,3 +130,4 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… +NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd89c5ce800/fonts/${NOTOEMOJIFONT_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 43c5fde..243eb40 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -51,7 +51,6 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 -NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -79,6 +78,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip +NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -101,6 +101,7 @@ PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 +NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -127,3 +128,4 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… +NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd89c5ce800/fonts/${NOTOEMOJIFONT_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index b1c7387..2876e36 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -62,7 +62,6 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 -NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -89,6 +88,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip +NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -111,6 +111,7 @@ GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 +NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -136,3 +137,4 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… +NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd89c5ce800/fonts/${NOTOEMOJIFONT_PACKAGE}

1 0

[tor-browser-bundle/master] Bug #18172: Bundle Noto Emoji Font in Linux TBB
by gk＠torproject.org 02 Feb '16

02 Feb '16

commit c885551e69ca5043d0af0de6940e250968e6f7e5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Jan 28 15:16:21 2016 -0800 Bug #18172: Bundle Noto Emoji Font in Linux TBB (Also removing unneeded NOTOCJKFONT_VER statements.) --- gitian/descriptors/linux/gitian-bundle.yml | 2 ++ gitian/fetch-inputs.sh | 4 ++-- gitian/verify-tags.sh | 2 +- gitian/versions | 4 +++- gitian/versions.alpha | 4 +++- gitian/versions.beta | 4 +++- gitian/versions.nightly | 4 +++- 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index e44635e..29a36f8 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -53,6 +53,7 @@ files: - "tbb-docs.zip" - "NotoSansCJKsc-Regular.otf" - "STIXv1.1.1-latex.zip" +- "NotoEmoji-Regular.ttf" script: | INSTDIR="$HOME/install" source versions @@ -143,6 +144,7 @@ script: | cp NotoSansCJKsc-Regular.otf ${TB_STAGE_DIR}/Browser/fonts/ unzip -o STIXv1.1.1-latex.zip -d STIX cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" ${TB_STAGE_DIR}/Browser/fonts/ + cp NotoEmoji-Regular.ttf ${TB_STAGE_DIR}/Browser/fonts/ # unzip relativelink-src.zip cp RelativeLink/* ${TB_STAGE_DIR}/Browser/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9d6f2f3..23410c0 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -154,7 +154,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO NOTOCJKFONT STIXMATHFONT +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -166,7 +166,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index fc62344..8202df6 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -140,7 +140,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC NOTOCJKFONT STIXMATHFONT NOTOEMOJIFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index bd484bb..63cebca 100755 --- a/gitian/versions +++ b/gitian/versions @@ -54,7 +54,6 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 GO_VER=1.4.2 -NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -79,6 +78,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip +NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -101,6 +101,7 @@ GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 +NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -124,3 +125,4 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… +NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd89c5ce800/fonts/${NOTOEMOJIFONT_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d234e33..91854b8 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -54,7 +54,6 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 GO_VER=1.4.2 -NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -79,6 +78,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip +NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -101,6 +101,7 @@ GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 +NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -124,3 +125,4 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… +NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd89c5ce800/fonts/${NOTOEMOJIFONT_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 1bde7e5..14c08c5 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -50,7 +50,6 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 GO_VER=1.4.2 -NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -76,6 +75,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip +NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -98,6 +98,7 @@ PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 +NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -122,3 +123,4 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… +NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd89c5ce800/fonts/${NOTOEMOJIFONT_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4429066..85c103d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -61,7 +61,6 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 GO_VER=1.4.2 -NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -86,6 +85,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip +NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 @@ -108,6 +108,7 @@ GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad NOTOCJKFONT_HASH=1652500938055a232cfbfa321de6ebaadfc5635dd9f75e369bc991d14a6512dd STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 +NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -131,3 +132,4 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… +NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd05d6f382138a3d3adcd89c5ce800/fonts/${NOTOEMOJIFONT_PACKAGE}

1 0

[tor/master] Revise changelog sections likely to be mangled by formatter script
by nickm＠torproject.org 02 Feb '16

02 Feb '16

commit acb55d61c07d18f26dc15ffd338e59850a7258fb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 1 23:28:39 2016 -0500 Revise changelog sections likely to be mangled by formatter script --- ChangeLog | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index d76d134..4003872 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,21 +18,9 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? o Major features (directory mirrors): - Include an opt-in trial list of Default Fallback Directories in - add_default_fallback_dir_servers(). - "Tor has included a feature to fetch the initial consensus from nodes - other than the authorities for a while now. We just haven't shipped a - list of alternate locations for clients to go to yet. - Reasons why we might want to ship tor with a list of additional places - where clients can find the consensus is that it makes authority - reachability and BW less important. - We want them to have been around and using their current key, address, - and port for a while now (120 days), and have been running, a guard, - and a v2 directory mirror for most of that time." - We exclude BadExits and tor versions that aren't recommended. - We include an IPv6 address for each FallbackDir (see ticket 8374). - (Tor might not use IPv6 fallbacks until ticket the code for ticket6027 is merged.) - The unit test ensures that we successfully load all included - default fallback directories. + add_default_fallback_dir_servers(). Doing this should improve + client reliability and initial bootstrap performance, and reduce + load on the directory authorities. Closes ticket 15775. Patch by "teor". OnionOO script by "weasel", "teor", "gsathya", and "karsten". @@ -111,11 +99,11 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? 672 bytes per circuit. Closes ticket 17796. o Minor features (directory system): - Previously only relays who explicitly opened a directory port (DirPort) - accepted directory requests from clients. Now all relays, with and without - a DirPort, who do not disable the DirCache option accept and serve - directory requests sent (tunnelled) through their ORPort. - Closes ticket 12538. + - Previously only relays who explicitly opened a directory port (DirPort) + accepted directory requests from clients. Now all relays, with and without + a DirPort, who do not disable the DirCache option accept and serve + directory requests sent (tunnelled) through their ORPort. + Closes ticket 12538. o Minor features (exit policies, controllers): - Add controller getinfo exit-policy/reject-private/[default,relay] @@ -367,11 +355,11 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? unit tests. Bugfix on 0.2.2.4-alpha. Patch by "teor". o Code simplification and refactoring: - - Extract the more complicated parts of circuit_mark_for_close into - a new function run periodically before connections are freed. - This change removes more than half of the functions currently - in the "blob". - Closes ticket 17218. + - Extract the more complicated parts of circuit_mark_for_close into + a new function run periodically before connections are freed. + This change removes more than half of the functions currently + in the "blob". + Closes ticket 17218. - Clean up a little duplicated code in crypto_expand_key_material_TAP. Closes ticket 17587; patch from "pfrankw". - Decouple the list of streams needing to be attached to circuits

1 0

[tor/master] Rewrap the changelog for 0281alpha
by nickm＠torproject.org 02 Feb '16

02 Feb '16

commit d3e5cd3096ca43f8997e7e1984ad7802f375dea2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 1 23:29:06 2016 -0500 Rewrap the changelog for 0281alpha --- ChangeLog | 435 ++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 211 insertions(+), 224 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4003872..12012aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,31 +5,58 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? - Schedule multiple in-progress consensus downloads during client bootstrap. Use the first one that starts downloading, close the rest. This reduces failures when authorities are slow or down. - Together with the code for feature 15775, it reduces failures due to fallback churn. - Implements ticket 4483 (reduce failures when authorities are down). - Patch by "teor". - Implements IPv4 portions of proposal 210 by "mikeperry" and - "teor". + Together with the code for feature 15775, it reduces failures due + to fallback churn. Implements ticket 4483 (reduce failures when + authorities are down). Patch by "teor". Implements IPv4 portions + of proposal 210 by "mikeperry" and "teor". o Major features (controller): - - New "GETINFO hs/service/desc/id/" command to retrieve a hidden service - descriptor from a service's local hidden service descriptor cache. - Closes ticket 14846. + - New "GETINFO hs/service/desc/id/" command to retrieve a hidden + service descriptor from a service's local hidden service + descriptor cache. Closes ticket 14846. o Major features (directory mirrors): - Include an opt-in trial list of Default Fallback Directories in - add_default_fallback_dir_servers(). Doing this should improve + add_default_fallback_dir_servers(). Doing this should improve client reliability and initial bootstrap performance, and reduce - load on the directory authorities. - Closes ticket 15775. Patch by "teor". - OnionOO script by "weasel", "teor", "gsathya", and "karsten". + load on the directory authorities. Closes ticket 15775. Patch by + "teor". OnionOO script by "weasel", "teor", "gsathya", + and "karsten". o Major features (relay): - - When Tor is started as root on Linux and told to switch user ID, it - can now retain the capabilitity to bind to low ports. By default, - Tor will do this only when it's switching user ID and some low - ports have been configured. You can change this behavior with - the new option KeepBindCapabilities. Closes ticket 8195. + - When Tor is started as root on Linux and told to switch user ID, + it can now retain the capabilitity to bind to low ports. By + default, Tor will do this only when it's switching user ID and + some low ports have been configured. You can change this behavior + with the new option KeepBindCapabilities. Closes ticket 8195. + + o Minor features (security): + - Adjust Tor's use of OpenSSL's RNG APIs so that they absolutely, + positively are not allowed to fail. Previously we depended on + internals about OpenSSL behavior. Closes ticket 17686. + - Never use the system entropy output directly for anything besides + seeding the PRNG. When we want to generate important keys, instead + of using system entropy directly, hash it with the PRNG stream. + This may help resist certain attacks based on broken OS entropy + implementations. Closes part of ticket 17694. + - Set unused entires in a smartlist to NULL. This helped catch + a (harmless) bug, and shouldn't affect performance too much. + Implements ticket 17026. + - Use SecureMemoryWipe() function to securely clean memory on + Windows. Implements feature 17986. + - Use explicit_bzero or memset_s when present. Previously, we'd use + OpenSSL's OPENSSL_cleanse() function. Closes ticket 7419; patches + from <logan(a)hackers.mu> and <selven(a)hackers.mu>. + + o Minor features (security, clock): + - Warn when the system clock is set back in time (when the state + file was last written in the future). Tor doesn't know that + consensuses have expired if the clock is in the past. Patch by + "teor". Implements ticket 17188. + + o Minor features (security, cryptography): + - Use modern system calls to generate strong entropy on platforms + that provide them. Closes ticket 13696. o Minor feature (crypto): - Add SHA512 support to crypto.c. Closes ticket 17663; patch from @@ -38,8 +65,8 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? o Minor feature (directory downloads): - Wait for busy authorities and fallbacks to become non-busy when bootstrapping. (A similar change was made in 6c443e987d for - directory servers chosen from the consensus.) - Closes ticket 17864; patch by "teor". + directory servers chosen from the consensus.) Closes ticket 17864; + patch by "teor". o Minor feature (fallback directories): - Add UseDefaultFallbackDirs, which enables any hard-coded fallback @@ -47,75 +74,71 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? Implements ticket 17576. Patch by "teor". o Minor feature (IPv6): - - Add a flag ipv6=address:orport to the DirAuthority and FallbackDir torrc - options. Add hard-coded ipv6 addresses for directory authorities with - ipv6 lines in their descriptors. - Closes ticket 17327; patch from Nick Mathewson / "teor". + - Add a flag ipv6=address:orport to the DirAuthority and FallbackDir + torrc options. Add hard-coded ipv6 addresses for directory + authorities with ipv6 lines in their descriptors. Closes ticket + 17327; patch from Nick Mathewson / "teor". - Add address policy assume_action support for IPv6 addresses. - Limit IPv6 mask bits to 128. - - Warn when comparing against an AF_UNSPEC address in a policy, - it's almost always a bug. - Closes ticket 17863; patch by "teor". + - Warn when comparing against an AF_UNSPEC address in a policy, it's + almost always a bug. Closes ticket 17863; patch by "teor". o Minor feature (logging): - When logging to syslog, allow a tag to be added to the syslog identity ("Tor"), i.e. the string prepended to every log message. - The tag can be configured by setting SyslogIdentityTag and defaults - to none. Setting it to "foo" will cause logs to be tagged as - "Tor-foo". Closes ticket 17194. + The tag can be configured by setting SyslogIdentityTag and + defaults to none. Setting it to "foo" will cause logs to be tagged + as "Tor-foo". Closes ticket 17194. o Minor feature (refactoring): - Move logging of redundant policy entries in - policies_parse_exit_policy_internal into its own function. - Closes ticket 17608; patch from "juce". + policies_parse_exit_policy_internal into its own function. Closes + ticket 17608; patch from "juce". o Minor features (accounting): - - Added two modes to AccountingRule in torrc for - limiting just input or just output. - Closes ticket 15989; patch from "unixninja92". + - Added two modes to AccountingRule in torrc for limiting just input + or just output. Closes ticket 15989; patch from "unixninja92". o Minor features (authorities): - - Update the V3 identity key for dannenberg: it was changed on - 18 November 2015. - Closes task 17906. Patch by "teor". + - Update the V3 identity key for dannenberg: it was changed on 18 + November 2015. Closes task 17906. Patch by "teor". o Minor features (build): - - Since our build process now uses 'make distcheck', we no longer force - "make dist" to depend on "make check". Closes ticket 17893; + - Since our build process now uses 'make distcheck', we no longer + force "make dist" to depend on "make check". Closes ticket 17893; patch from "cypherpunks." o Minor features (compilation): - - Repair some compilation issues with some recent (unreleased, alpha) - vesions of OpenSSL 1.1. Closes ticket 17549. + - Repair some compilation issues with some recent (unreleased, + alpha) vesions of OpenSSL 1.1. Closes ticket 17549. o Minor features (controller): - - Adds FallbackDir entries to 'GETINFO config/defaults'. Closes tickets - 16774 and 17817. Patch by George Tankersley. + - Adds FallbackDir entries to 'GETINFO config/defaults'. Closes + tickets 16774 and 17817. Patch by George Tankersley. o Minor features (crypto): - - When allocating a digest state object, allocate no more space than we - actually need. Previously, we were allocating as much space as the - state for the largest algorithm would need. This change saves up to - 672 bytes per circuit. Closes ticket 17796. + - When allocating a digest state object, allocate no more space than + we actually need. Previously, we were allocating as much space as + the state for the largest algorithm would need. This change saves + up to 672 bytes per circuit. Closes ticket 17796. o Minor features (directory system): - - Previously only relays who explicitly opened a directory port (DirPort) - accepted directory requests from clients. Now all relays, with and without - a DirPort, who do not disable the DirCache option accept and serve - directory requests sent (tunnelled) through their ORPort. - Closes ticket 12538. + - Previously only relays who explicitly opened a directory port + (DirPort) accepted directory requests from clients. Now all + relays, with and without a DirPort, who do not disable the + DirCache option accept and serve directory requests sent + (tunnelled) through their ORPort. Closes ticket 12538. o Minor features (exit policies, controllers): - Add controller getinfo exit-policy/reject-private/[default,relay] for the reject rules added by ExitPolicyRejectPrivate. This makes it easier for stem to display exit policies. - - Add unit tests for getinfo exit-policy/*. - Finishes implementation for ticket 17183. Patch by "teor". + - Add unit tests for getinfo exit-policy/*. Finishes implementation + for ticket 17183. Patch by "teor". o Minor features (fallback directories): - - Add a set of default fallback directories for the 0.2.8 alpha releases. - Closes ticket 17158. - Patch by "teor". + - Add a set of default fallback directories for the 0.2.8 alpha + releases. Closes ticket 17158. Patch by "teor". o Minor features (geoip): - Update geoip and geoip6 to the January 5 2016 Maxmind GeoLite2 @@ -123,7 +146,7 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? o Minor features (IPv6 support): - Allow users to configure directory authorities and fallback - directory servers with IPv6 addresses and ORPorts. Resolves + directory servers with IPv6 addresses and ORPorts. Resolves ticket 6027. o Minor features (portability): @@ -134,93 +157,73 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? - Add a family argument to get_interface_addresses_raw() and subfunctions to make network interface address interogation more efficient. Now Tor can specifically ask for IPv4, IPv6 or both - types of interfaces from the operating system. Resolves ticket 17950. - - When get_interface_address6_list(.,AF_UNSPEC,.) is called and fails - to enumerate interface addresses using the platform-specific API, - have it rely on the UDP socket fallback technique to try and find - out what IP addresses (both IPv4 and IPv6) our machine has. Resolves - ticket 17951. + types of interfaces from the operating system. Resolves + ticket 17950. + - When get_interface_address6_list(.,AF_UNSPEC,.) is called and + fails to enumerate interface addresses using the platform-specific + API, have it rely on the UDP socket fallback technique to try and + find out what IP addresses (both IPv4 and IPv6) our machine has. + Resolves ticket 17951. o Minor features (replaycache): - - The replay cache now uses SHA256 instead of SHA1. - Implements feature 8961. - Patch by "teor", issue reported by "rransom". - - o Minor features (security): - - Adjust Tor's use of OpenSSL's RNG APIs so that they absolutely, - positively are not allowed to fail. Previously we depended on - internals about OpenSSL behavior. Closes ticket 17686. - - Never use the system entropy output directly for anything besides - seeding the PRNG. When we want to generate important keys, instead - of using system entropy directly, hash it with the PRNG stream. - This may help resist certain attacks based on broken OS entropy - implementations. Closes part of ticket 17694. - - Set unused entires in a smartlist to NULL. This helped catch a - (harmless) bug, and shouldn't affect performance too much. - Implements ticket 17026. - - Use SecureMemoryWipe() function to securely clean memory on - Windows. Implements feature 17986. - - Use explicit_bzero or memset_s when present. Previously, we'd use - OpenSSL's OPENSSL_cleanse() function. - Closes ticket 7419; patches from <logan(a)hackers.mu> and <selven(a)hackers.mu>. - - o Minor features (security, clock): - - Warn when the system clock is set back in time (when the - state file was last written in the future). Tor doesn't know - that consensuses have expired if the clock is in the past. - Patch by "teor". Implements ticket 17188. - - o Minor features (security, cryptography): - - Use modern system calls to generate strong entropy on platforms that - provide them. Closes ticket 13696. + - The replay cache now uses SHA256 instead of SHA1. Implements + feature 8961. Patch by "teor", issue reported by "rransom". o Minor features (testing): - - Log more information when the backtrace tests fail. - Closes ticket 17892. Patch from "cypherpunks." + - Log more information when the backtrace tests fail. Closes ticket + 17892. Patch from "cypherpunks." o Minor features (unit tests, random number generation): - Add unit tests that check for common RNG failure modes, such as returning all zeroes, identical values, or incrementing values - (OpenSSL's rand_predictable feature). - Patch by "teor". + (OpenSSL's rand_predictable feature). Patch by "teor". o Minor features (unix permissions): - - Defer creation of Unix sockets until after setuid. This avoids needing - CAP_CHOWN and CAP_FOWNER when using systemd's CapabilityBoundingSet, or - chown and fowner when using SELinux. + - Defer creation of Unix sockets until after setuid. This avoids + needing CAP_CHOWN and CAP_FOWNER when using systemd's + CapabilityBoundingSet, or chown and fowner when using SELinux. Implements part of ticket 17562. Patch from Jamie Nguyen. - If any directory created by Tor is marked as group readable, the - filesystem group is allowed to be either the default GID or the root - user. Allowing root to read the DataDirectory prevents the need for - CAP_READ_SEARCH when using systemd's CapabilityBoundingSet, or - dac_read_search when using SELinux. + filesystem group is allowed to be either the default GID or the + root user. Allowing root to read the DataDirectory prevents the + need for CAP_READ_SEARCH when using systemd's + CapabilityBoundingSet, or dac_read_search when using SELinux. Implements part of ticket 17562. Patch from Jamie Nguyen. - Introduce DataDirectoryGroupReadable boolean. If set to 1, the - DataDirectory will be made readable by the default GID. - Implements part of ticket 17562. Patch from Jamie Nguyen. + DataDirectory will be made readable by the default GID. Implements + part of ticket 17562. Patch from Jamie Nguyen. - o Minor bugfix (crypto): - - Check the return value of HMAC and assert on failure. - Fixes bug 17658; bugfix on 0.2.3.6-alpha. + o Minor bugfixes (security): + - Make memwipe() do nothing when passed a NULL pointer or zero size. + Check size argument to memwipe() for underflow. Fixes bug 18089; + bugfix on 0.2.3.25 and 0.2.4.6-alpha. Reported by "gk", patch + by "teor". + + o Minor bugfixes (security, exit policies): + - ExitPolicyRejectPrivate rejects more private addresses by default. + Specifically, it rejects the relay's outbound bind addresses (if + configured), and the relay's configured port addresses (such as + ORPort and DirPort). Fixes bug 17027; bugfix on 0.2.0.11-alpha. Patch by "teor". + o Minor bugfix (crypto): + - Check the return value of HMAC and assert on failure. Fixes bug + 17658; bugfix on 0.2.3.6-alpha. Patch by "teor". + o Minor bugfix (fallback directories): - Mark fallbacks as "too busy" when they return a 503 response, - rather than just marking authorities. - Fixes bug 17572; bugfix on 5c51b3f1f0d4 released in 0.2.4.7-alpha. - Patch by "teor". + rather than just marking authorities. Fixes bug 17572; bugfix on + 5c51b3f1f0d4 released in 0.2.4.7-alpha. Patch by "teor". o Minor bugfix (IPv6 compatibility, unit tests): - - Make tor_ersatz_socketpair work on IPv6-only systems. - Fixes bug 17638; bugfix on 0.0.2pre8. - Patch by "teor". + - Make tor_ersatz_socketpair work on IPv6-only systems. Fixes bug + 17638; bugfix on 0.0.2pre8. Patch by "teor". o Minor bugfix (relays, hidden services): - Refuse connection requests to private OR addresses unless - ExtendAllowPrivateAddresses is set. Previously, tor would - connect, then refuse to send any cells to a private address. - Fixes bugs 17674 and 8976; bugfix on 0.2.3.21-rc. - Patch by "teor". + ExtendAllowPrivateAddresses is set. Previously, tor would connect, + then refuse to send any cells to a private address. Fixes bugs + 17674 and 8976; bugfix on 0.2.3.21-rc. Patch by "teor". o Minor bugfix (SipHash-2-4 performance): - Improve performance when hashing non-multiple of 8 sized buffers, @@ -229,187 +232,171 @@ Changes in version 0.2.8.1-alpha - 2016-02-0? o Minor bugfix (testing): - The test for log_heartbeat was incorrectly failing in timezones - with non-integer offsets. Instead of comparing the end of the - time string against a constant, compare it to the output of - format_local_iso_time when given the correct input. - Fixes bug 18039; bugfix on 0.2.5.4-alpha. + with non-integer offsets. Instead of comparing the end of the time + string against a constant, compare it to the output of + format_local_iso_time when given the correct input. Fixes bug + 18039; bugfix on 0.2.5.4-alpha. o Minor bugfix (unit tests): - Make unit tests pass on IPv6-only systems, and systems without - localhost addresses (like some FreeBSD jails). - Fixes bug 17632; bugfix on 0.2.7.3-rc. - Patch by "teor". + localhost addresses (like some FreeBSD jails). Fixes bug 17632; + bugfix on 0.2.7.3-rc. Patch by "teor". o Minor bugfixes (accounting): - - The max bandwidth when using AccountRule sum - is now correctly logged. Fixes bug 18024; bugfix on 0.2.6.1-alpha. - Patch from "unixninja92". + - The max bandwidth when using AccountRule sum is now correctly + logged. Fixes bug 18024; bugfix on 0.2.6.1-alpha. Patch + from "unixninja92". o Minor bugfixes (build): - - Mark all object files that include micro-revision.i as depending on - it, so as to make our build more reliable with parallel builds. + - Mark all object files that include micro-revision.i as depending + on it, so as to make our build more reliable with parallel builds. Fixes bug 17826; bugfix on 0.2.5.1-alpha. o Minor bugfixes (client, correctness): - When closing an entry connection, generate a warning if we should - have sent an end cell for it but we haven't. Fixes bug 17876; + have sent an end cell for it but we haven't. Fixes bug 17876; bugfix on 0.2.3.2-alpha. o Minor bugfixes (code correctness): - Assert that allocated memory held by the reputation code is freed - according to its internal counters. Fixes bug 17753; bugfix on - tor-0.1.1.1-alpha. + according to its internal counters. Fixes bug 17753; bugfix + on tor-0.1.1.1-alpha. o Minor bugfixes (compilation): - - Don't try to use the pthrad_condattr_setclock() function unless - it actually exists. Fixes compilation on NetBSD-6.x. Fixes bug - 17819; bugfix on 0.2.6.3-alpha. - - Fix backtrace compilation on FreeBSD. Fixes bug 17827; bugfix on - tor-0.2.5.2-alpha. - - Fix compilation of sandbox.c with musl-libc. - Fixes bug 17347; bugfix on 0.2.5.1-alpha. - Patch from 'jamestk'. + - Don't try to use the pthrad_condattr_setclock() function unless it + actually exists. Fixes compilation on NetBSD-6.x. Fixes bug 17819; + bugfix on 0.2.6.3-alpha. + - Fix backtrace compilation on FreeBSD. Fixes bug 17827; bugfix + on tor-0.2.5.2-alpha. + - Fix compilation of sandbox.c with musl-libc. Fixes bug 17347; + bugfix on 0.2.5.1-alpha. Patch from 'jamestk'. - Fix search for libevent libraries on OpenBSD (and similar systems which install libevent 1 and libevent 2 in parallel). Fixes bug - 16651; bugfix on 0.1.0.7-rc. - Patch from "rubiate". + 16651; bugfix on 0.1.0.7-rc. Patch from "rubiate". - Isolate environment variables meant for tests from the rest of the build system. Fixes bug 17818; bugfix on tor-0.2.7.3-rc. - Replace usage of 'INLINE' with 'inline'. Fixes bug 17804; bugfix on tor-0.0.2pre8. o Minor bugfixes (IPv6): - - Update the limits in max_dl_per_request for IPv6 address - length. Fixes bug 17573; bugfix on 0.2.1.5-alpha. + - Update the limits in max_dl_per_request for IPv6 address length. + Fixes bug 17573; bugfix on 0.2.1.5-alpha. o Minor bugfixes (linux seccomp2 sandbox): - - Fix a crash when using offline master ed25519 keys with the - Linux seccomp2 sandbox enabled. Fixes bug 17675; bugfix on - 0.2.7.3-alpha. + - Fix a crash when using offline master ed25519 keys with the Linux + seccomp2 sandbox enabled. Fixes bug 17675; bugfix on 0.2.7.3-alpha. o Minor bugfixes (logging): - - In log messages that include a function name, use __FUNCTION__ instead - of __PRETTY_FUNCTION__. In GCC, these are synonymous, but with clang - __PRETTY_FUNCTION__ has extra information we don't need. - Fixes bug 16563; bugfix on 0.0.2pre8. Fix by Tom van der Woerdt. - - Remove needless quotes from a log message about unparseable addresses. - Fixes bug 17843; bugfix on 0.2.3.3-alpha. + - In log messages that include a function name, use __FUNCTION__ + instead of __PRETTY_FUNCTION__. In GCC, these are synonymous, but + with clang __PRETTY_FUNCTION__ has extra information we don't + need. Fixes bug 16563; bugfix on 0.0.2pre8. Fix by Tom van + der Woerdt. + - Remove needless quotes from a log message about unparseable + addresses. Fixes bug 17843; bugfix on 0.2.3.3-alpha. o Minor bugfixes (makefile): - - Remove config.log only from make distclean, not from - make clean. Fixes bug 17924; bugfix on 0.2.4.1-alpha. + - Remove config.log only from make distclean, not from make clean. + Fixes bug 17924; bugfix on 0.2.4.1-alpha. o Minor bugfixes (portability): - - Remove an #endif from configure.ac so that we correctly detect - the presence of in6_addr.s6_addr32. Fixes bug 17923; bugfix on - 0.2.0.13-alpha. + - Remove an #endif from configure.ac so that we correctly detect the + presence of in6_addr.s6_addr32. Fixes bug 17923; bugfix + on 0.2.0.13-alpha. o Minor bugfixes (relays): - Check that both the ORPort and DirPort (if present) are reachable before publishing a relay descriptor. Otherwise, relays publish a descriptor with DirPort 0 when the DirPort reachability test takes - longer than the ORPort reachability test. - Fixes bug 18050; bugfix on 0.1.0.1-rc. - Reported by "starlight", patch by "teor". + longer than the ORPort reachability test. Fixes bug 18050; bugfix + on 0.1.0.1-rc. Reported by "starlight", patch by "teor". o Minor bugfixes (routersets, IPv6): - - routerset_parse now accepts IPv6 literal addresses. - Fixes bug 17060; bugfix on 0.2.1.3-alpha. Patch by "teor". + - routerset_parse now accepts IPv6 literal addresses. Fixes bug + 17060; bugfix on 0.2.1.3-alpha. Patch by "teor". o Minor bugfixes (safe logging): - - When logging a malformed hostname received through socks4, scrub it - if SafeLogging says we should. Fixes bug 17419; bugfix on 0.1.1.16-rc. - - o Minor bugfixes (security): - - Make memwipe() do nothing when passed a NULL pointer - or zero size. Check size argument to memwipe() for underflow. - Fixes bug 18089; bugfix on 0.2.3.25 and 0.2.4.6-alpha. - Reported by "gk", patch by "teor". - - o Minor bugfixes (security, exit policies): - - ExitPolicyRejectPrivate rejects more private addresses by default. - Specifically, it rejects - the relay's outbound bind addresses (if configured), and - the relay's configured port addresses (such as ORPort and DirPort). - Fixes bug 17027; bugfix on 0.2.0.11-alpha. Patch by "teor". + - When logging a malformed hostname received through socks4, scrub + it if SafeLogging says we should. Fixes bug 17419; bugfix + on 0.1.1.16-rc. o Minor bugfixes (statistics code): - Consistently check for overflow in round_*_to_next_multiple_of functions, and add unit tests with additional and maximal values. Fixes part of bug 13192; bugfix on 0.2.2.1-alpha. - - Handle edge cases in the laplace functions: avoid division by zero, - avoid taking the log of zero, and silence clang type conversion - warnings using round and trunc. Add unit tests for edge cases with - maximal values. Fixes part of bug 13192; bugfix on 0.2.6.2-alpha. + - Handle edge cases in the laplace functions: avoid division by + zero, avoid taking the log of zero, and silence clang type + conversion warnings using round and trunc. Add unit tests for edge + cases with maximal values. Fixes part of bug 13192; bugfix + on 0.2.6.2-alpha. o Minor bugfixes (tests): - - Fix a memory leak in the ntor test. Fixes bug 17778; bugfix on - 0.2.4.8-alpha. + - Fix a memory leak in the ntor test. Fixes bug 17778; bugfix + on 0.2.4.8-alpha. o Minor bugfixes (TLS context): - Assert when the TLS contexts fail to initialize. Fixes bug 17683; bugfix on 0.0.6. o Minor bugfixes (unit tests): - - Check the full results of SHA256 and SHA512 digests in the - unit tests. Bugfix on 0.2.2.4-alpha. Patch by "teor". + - Check the full results of SHA256 and SHA512 digests in the unit + tests. Bugfix on 0.2.2.4-alpha. Patch by "teor". o Code simplification and refactoring: - Extract the more complicated parts of circuit_mark_for_close into - a new function run periodically before connections are freed. - This change removes more than half of the functions currently - in the "blob". - Closes ticket 17218. - - Clean up a little duplicated code in crypto_expand_key_material_TAP. - Closes ticket 17587; patch from "pfrankw". + a new function run periodically before connections are freed. This + change removes more than half of the functions currently in the + "blob". Closes ticket 17218. + - Clean up a little duplicated code in + crypto_expand_key_material_TAP. Closes ticket 17587; patch + from "pfrankw". - Decouple the list of streams needing to be attached to circuits from the overall connection list. This change makes it possible to attach streams quickly while both simplifying Tor's callgraph and - avoiding O(N) scans of the entire connection list. Closes ticket - 17590. + avoiding O(N) scans of the entire connection list. Closes + ticket 17590. - When a direct directory request fails immediately on launch, instead of relaunching that request from inside the code that - launches it, instead mark the connection for teardown. This - change simplifies Tor's callback and prevents the directory- - request launching code from invoking itself recursively. - Closes ticket 17589. + launches it, instead mark the connection for teardown. This change + simplifies Tor's callback and prevents the directory- request + launching code from invoking itself recursively. Closes + ticket 17589. o Documentation: - - Add a description of the correct use of the '--keygen' command-line - option. Closes ticket 17583; based on text by 's7r'. + - Add a description of the correct use of the '--keygen' command- + line option. Closes ticket 17583; based on text by 's7r'. - Document the minimum HeartbeatPeriod value. Closes ticket 15638. - Explain actual minima for BandwidthRate. Closes ticket 16382. - - Fix a minor formatting typo in the manpage. Closes ticket - 17791. + - Fix a minor formatting typo in the manpage. Closes ticket 17791. - Mention torspec URL in the manpage and point the reader to it - whenever we mention a document that belongs in torspce. - Fixes issue 17392. + whenever we mention a document that belongs in torspce. Fixes + issue 17392. o Removed features: - Remove client-side support for connecting to Tor servers running - versions of Tor before 0.2.3.6-alpha. These servers didn't - support the v3 TLS handshake protocol, and are no longer allowed - on the Tor network. Implements the client side of ticket - 11150. Based on patches by Tom van der Woerdt. + versions of Tor before 0.2.3.6-alpha. These servers didn't support + the v3 TLS handshake protocol, and are no longer allowed on the + Tor network. Implements the client side of ticket 11150. Based on + patches by Tom van der Woerdt. - Remove code for OpenSSL dynamic locks; OpenSSL doesn't use them. Closes ticket 17926. o Testing: - - Always test both ed25519 backends, so that we can be sure that - our batch-open replacement code works. Part of ticket 16794. + - Always test both ed25519 backends, so that we can be sure that our + batch-open replacement code works. Part of ticket 16794. - Cover dns_resolve_impl() in dns.c with unit tests. Implements a portion of ticket 16831. - - More unit tests for compat_libevent.c. Closes ticket 17075. - Patch from Ola Bini. - - More unit tests for procmon.c. Closes ticket 17078. - Patch from Ola Bini. - - More unit tests for tortls.c. Closes ticket 17082. - Patch from Ola Bini. - - More unit tests for util_format.c. Closes ticket 17084. - Patch from Ola Bini. - - New tests for directory.c functions. Closes ticket 17003. Patch + - More unit tests for compat_libevent.c. Closes ticket 17075. Patch + from Ola Bini. + - More unit tests for procmon.c. Closes ticket 17078. Patch from + Ola Bini. + - More unit tests for tortls.c. Closes ticket 17082. Patch from + Ola Bini. + - More unit tests for util_format.c. Closes ticket 17084. Patch from + Ola Bini. + - New tests for directory.c functions. Closes ticket 17003. Patch from Ola Bini. - - New tests for options_validate. Closes ticket 17076. Patch from + - New tests for options_validate. Closes ticket 17076. Patch from Ola Bini. - Unit tests for directory_handle_command_get. Closes ticket 17004. Patch from Reinaldo de Souza Jr.

1 0

[chutney/master] Rewrite Python detection in Chutney shell script
by nickm＠torproject.org 02 Feb '16

02 Feb '16

commit 89a255017412447f915ab5f9ddbdb55fc1000786 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Jan 29 17:36:00 2016 +0100 Rewrite Python detection in Chutney shell script Fixes Chutney on systems which have python2 in their PATH but not python. Portability of the script has improved by avoiding `command` and instead walking through PATH. This code is based on the program detection in Autoconf. Usability has improved by displaying a message when no compatible Python version has been found which advises the user to check their Python installation and PATH. When a compatible Python version has been found, the script displays the Python version before initializing Chutney. Fixes ticket 17631. --- chutney | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 12 deletions(-) diff --git a/chutney b/chutney index cbbc673..2076185 100755 --- a/chutney +++ b/chutney @@ -1,12 +1,50 @@ -#!/bin/sh - -export PYTHONPATH="`dirname $0`/lib:${PYTHONPATH}" -# Use python2, python, python3 in that order -[ -n "$PYTHON" ] || { - command -v python2 >/dev/null 2>&1 && PYTHON=python2 || \ - command -v python >/dev/null 2>&1 && PYTHON=python # || \ -# Not yet supported -# command -v python3 >/dev/null 2>&1 && PYTHON=python3 -} -# Use python2 if the checks that use "command" fail -${PYTHON:=python2} -m chutney.TorNet "$@" +#!/usr/bin/env sh + +set -o errexit +set -o nounset + +export PYTHONPATH="$(dirname "${0}")/lib:${PYTHONPATH-}" + +binaries="python2 python" + +if ! test "${PYTHON+y}" +then + saved_IFS="${IFS}" + for binary in ${binaries} + do + IFS=":" + for directory in ${PATH} + do + case "${directory}" in + "") directory="./" + ;; + */) + ;; + *) directory="${directory}/" + ;; + esac + abs_path="${directory}${binary}" + if test -f "${abs_path}" && test -x "${abs_path}" + then + PYTHON="${abs_path}" + break + fi + done + + if test "${PYTHON+y}" + then + break + fi + done + IFS="${saved_IFS}" +fi + +if ! test "${PYTHON+y}" +then + printf "No compatible Python version found.\n" >&2 + printf "Is Python installed and in your PATH?\n" >&2 + exit 1 +fi + +printf "Using %s\n" "$("${PYTHON}" --version 2>&1)" +"${PYTHON}" -m chutney.TorNet "${@}"

1 0

[snowflake/master] add Dependencies section / updates to README
by serene＠torproject.org 01 Feb '16

01 Feb '16

commit a915758275c85261adbfa4717a665d867db9adb5 Author: Serene Han <keroserene+git(a)gmail.com> Date: Mon Feb 1 14:12:40 2016 -0800 add Dependencies section / updates to README --- README.md | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 7228264..e716041 100644 --- a/README.md +++ b/README.md @@ -4,34 +4,40 @@ A Pluggable Transport using WebRTC + ### Status -- Successful automatic bootstraps with a WebRTC transport, - using HTTP signaling (with optional domain fronting) speaking to - a multitude of volunteer "snowflakes". -- Needs a lot more work though. +Successfully & automatically bootstraps with a WebRTC transport, using HTTP +signaling (with optional domain fronting) speaking to a multitude of volunteer +"snowflakes". Still lots of work to do. ### Usage - - ``` cd client/ +go get go build tor -f torrc ``` +This should start the client plugin, bootstrapping to 100% using WebRTC. + +#### Dependencies -And it will start the client plugin with the following `torrc` -options: +- [go-webrtc](https://github.com/keroserene/go-webrtc). +- Go 1.5+ + +#### More Info + +The client uses the following `torrc` options: ``` ClientTransportPlugin snowflake exec ./client \ --url https://snowflake-reg.appspot.com/ \ --front www.google.com ``` -It will speak to the Broker, get matched with a "snowflake" browser proxy, +Which allows it to speak to the Broker, +get matched with a "snowflake" browser proxy, and negotiate a WebRTC PeerConnection. -After that, it should bootstrap to 100%. To see logs, do `tail -F snowflake.log` in a second terminal. @@ -46,7 +52,8 @@ ClientTransportPlugin snowflake exec ./client --meek Also, it is possible to connect directly to the go-webrtc server plugin (skipping all the browser snowflake / broker stuff - see appendix) -### Building a Snowflake Proxy + +#### Building a Snowflake This will only work if there are any browser snowflakes running at all. To run your own, first make sure coffeescript is installed. @@ -115,3 +122,6 @@ Then, in the browser proxy: Shortly after, the tor client should bootstrap to 100%. More documentation on the way. + +Also available at: +[torproject.org/pluggable-transports/snowflake](https://gitweb.torproject.org/pluggable-transports/snowflake.git/)

1 0