- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] fixup! Bug 23247: Communicating security expectations for .onion
by ma1 (＠ma1) 13 Jul '23

13 Jul '23

ma1 pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 82c31751 by cypherpunks1 at 2023-07-12T16:18:15-08:00 fixup! Bug 23247: Communicating security expectations for .onion Bug 41399: Enable brotli encoding for http onions - - - - - 1 changed file: - netwerk/protocol/http/HttpBaseChannel.cpp Changes: ===================================== netwerk/protocol/http/HttpBaseChannel.cpp ===================================== @@ -340,6 +340,7 @@ void HttpBaseChannel::AddClassificationFlags(uint32_t aClassificationFlags, static bool isSecureOrTrustworthyURL(nsIURI* aURI) { return aURI->SchemeIs("https") || + nsMixedContentBlocker::IsPotentiallyTrustworthyOnion(aURI) || (StaticPrefs::network_http_encoding_trustworthy_is_https() && nsMixedContentBlocker::IsPotentiallyTrustworthyLoopbackURL(aURI)); } @@ -366,7 +367,6 @@ nsresult HttpBaseChannel::Init(nsIURI* aURI, uint32_t aCaps, // Construct connection info object nsAutoCString host; int32_t port = -1; - bool isHTTPS = isSecureOrTrustworthyURL(mURI); nsresult rv = mURI->GetAsciiHost(host); if (NS_FAILED(rv)) return rv; @@ -395,7 +395,7 @@ nsresult HttpBaseChannel::Init(nsIURI* aURI, uint32_t aCaps, if (NS_FAILED(rv)) return rv; rv = gHttpHandler->AddStandardRequestHeaders( - &mRequestHead, isHTTPS, aContentPolicyType, + &mRequestHead, isSecureOrTrustworthyURL(mURI), aContentPolicyType, nsContentUtils::ShouldResistFingerprinting(this)); if (NS_FAILED(rv)) return rv; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/82c3175… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/82c3175… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-spec][main] Bug 31161: Document Android signing key creation/usage
by boklm (＠boklm) 13 Jul '23

13 Jul '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-spec Commits: 2b940775 by Matthew Finkel at 2023-07-13T10:14:42+02:00 Bug 31161: Document Android signing key creation/usage - - - - - 2 changed files: - + processes/APKSigning - processes/KeyGeneration Changes: ===================================== processes/APKSigning ===================================== @@ -0,0 +1,29 @@ +Signing Tor Browser for Android on a Linux machine +================================================== + +Signing +------- + +1) Ensure pkcs11 configuration file is available + +# Create a file containing the Provider arguments +- cat > /tmp/pkcs11_java.cfg << EOF +name = OpenSC-PKCS11 +description = SunPKCS11 via OpenSC +library = /usr/lib/x86_64-linux-gnu/opensc-pkcs11.so +slotListIndex = 0 +EOF + +2) Test the configuration file with `keytool` and confirm it can access the smartcard +- keytool -providerClass sun.security.pkcs11.SunPKCS11 \ + -providerArg /tmp/pkcs11_java.cfg -keystore NONE \ + -storetype PKCS11 -list + + +3) Signing the exectuable(s): + +- path/to/apksigner sign --verbose --provider-class sun.security.pkcs11.SunPKCS11 \ + --provider-arg pkcs11_java.cfg --ks NONE --ks-type PKCS11 \ + --debuggable-apk-permitted=false \ + --out tor-browser-${VERSION}-android-${arch}-multi-qa.apk \ + tor-browser-${VERSION}-android-${arch}-multi-unsigned.apk ===================================== processes/KeyGeneration ===================================== @@ -100,3 +100,71 @@ certtool r CertificateSigningRequest.certSigningRequest security add-certificates ~/developerID_application.cer security find-identity + + +APK Signing Key +=============== + +These instructions are for a Nitrokey, as described in +https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/26536 + +Software needed: +---------------- + +1) Android SDK build tools + + - Latest (at time of writing): + - https://developer.android.com/studio?hl=i#downloads + - https://dl.google.com/android/repository/commandlinetools-linux-6609375_lat… + - 89f308315e041c93a37a79e0627c47f21d5c5edbe5e80ea8dc0aac8a649e0e92 + +Installation +------------ + +1) Requirements + +- for the signing: sudo apt-get install nitrokey-app opensc-pkcs11 opensc openjdk-8-jdk + - https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/26536#n… + +`nitrokey-app` should automatically detect the nitrokey if it is connected +Debian Stretch provides version 0.6.3-1. + + $ nitrokey-app + +Expect: "Application started successfully." + + +Key Generation +-------------- + +1) Generate 4096-bit RSA key pair + + $ openssl genrsa -out secretkey.pem -aes128 -rand /dev/urandom 4096 + +2) Create CSR + + $ openssl req -new -key secretkey.pem -out request.pem -subj "/CN=Tor Browser/O=The Tor Project/L=Seattle/ST=WA/C=US" + +3) Generate certificate (Google Play requires minimum expiratation date of 22 October 2033 + # If you plan to publish your apps on Google Play, the key you use to sign + # your app must have a validity period ending after 22 October 2033. Google + # Play enforces this requirement to ensure that users can seamlessly + # upgrade apps when new versions are available. + # https://developer.android.com/studio/publish/app-signing#considerations + + $ openssl x509 -req -days 5475 -in request.pem -signkey secretkey.pem -out certificate.pem -extfile openssl.cnf -extensions usr_cert + +4) Export secret key and certificate in PKCS12 + + $ openssl pkcs12 -export -out secret_and_certificate.p12 -in certificate.pem -inkey secretkey.pem -aes128 + +5) Extract RSA public key + + $ openssl rsa -in secretkey.pem -pubout -out publickey.pem + +Install private signing key on Nitrokey +--------------------------------------- + +- pkcs15-init --delete-objects privkey,pubkey,chain \ + --id 3 --store-private-key secret_and_certificate.p12 \ + --format pkcs12 --auth-id 3 --verify-pin View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/commit/2b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-spec/-/commit/2b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.0esrbase-13.0-1] Bug 41092: Add a RemoteSettings JSON dump for query-stripping
by ma1 (＠ma1) 12 Jul '23

12 Jul '23

ma1 pushed to branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 0a89389f by cypherpunks1 at 2023-07-13T00:40:56+02:00 Bug 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - 2 changed files: - services/settings/static-dumps/main/moz.build - + services/settings/static-dumps/main/query-stripping.json Changes: ===================================== services/settings/static-dumps/main/moz.build ===================================== @@ -5,6 +5,7 @@ FINAL_TARGET_FILES.defaults.settings.main += [ "doh-config.json", "doh-providers.json", + "query-stripping.json", ] if CONFIG["MOZ_BUILD_APP"] == "browser": ===================================== services/settings/static-dumps/main/query-stripping.json ===================================== @@ -0,0 +1,44 @@ +{ + "data": [ + { + "schema": 1678379807899, + "allowList": [], + "stripList": [ + "gclid", + "dclid", + "msclkid", + "_openstat", + "yclid", + "wickedid", + "twclid", + "_hsenc", + "__hssc", + "__hstc", + "__hsfp", + "hsctatracking", + "wbraid", + "gbraid", + "ysclid" + ], + "id": "85078bad-f31e-4d93-bb8a-81088b25d6dd", + "last_modified": 1678736907773 + }, + { + "schema": 1649695008608, + "allowList": [], + "stripList": [ + "mc_eid", + "oly_anon_id", + "oly_enc_id", + "__s", + "vero_id", + "_hsenc", + "mkt_tok", + "fbclid" + ], + "id": "76495cfc-fac9-4079-9b5f-9ff0784484de", + "last_modified": 1649762862679 + } + ], + "timestamp": 1678736907773 +} View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a89389… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a89389… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.0esrbase-13.0-1] Bug 33955: When copying an image only copy the image contents to the clipboard
by richard (＠richard) 12 Jul '23

12 Jul '23

richard pushed to branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 53c25feb by cypherpunks1 at 2023-07-12T22:21:16+00:00 Bug 33955: When copying an image only copy the image contents to the clipboard - - - - - 2 changed files: - browser/base/content/browser-context.inc - dom/base/nsCopySupport.cpp Changes: ===================================== browser/base/content/browser-context.inc ===================================== @@ -219,7 +219,7 @@ #ifdef CONTEXT_COPY_IMAGE_CONTENTS <menuitem id="context-copyimage-contents" data-l10n-id="main-context-menu-image-copy" - oncommand="goDoCommand('cmd_copyImage');"/> + oncommand="goDoCommand('cmd_copyImageContents');"/> #endif <menuitem id="context-copyimage" data-l10n-id="main-context-menu-image-copy-link" ===================================== dom/base/nsCopySupport.cpp ===================================== @@ -503,7 +503,7 @@ nsresult nsCopySupport::ImageCopy(nsIImageLoadingContent* aImageElement, trans->SetReferrerInfo(referrerInfo); } -#ifdef XP_WIN +#if defined(XP_WIN) && !defined(BASE_BROWSER_VERSION) rv = AppendImagePromise(trans, imgRequest, aImageElement); NS_ENSURE_SUCCESS(rv, rv); #endif View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/53c25fe… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/53c25fe… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] Bug 33955: When copying an image only copy the image contents to the clipboard
by richard (＠richard) 12 Jul '23

12 Jul '23

richard pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 1fde2e0f by cypherpunks1 at 2023-07-12T22:20:31+00:00 Bug 33955: When copying an image only copy the image contents to the clipboard - - - - - 2 changed files: - browser/base/content/browser-context.inc - dom/base/nsCopySupport.cpp Changes: ===================================== browser/base/content/browser-context.inc ===================================== @@ -219,7 +219,7 @@ #ifdef CONTEXT_COPY_IMAGE_CONTENTS <menuitem id="context-copyimage-contents" data-l10n-id="main-context-menu-image-copy" - oncommand="goDoCommand('cmd_copyImage');"/> + oncommand="goDoCommand('cmd_copyImageContents');"/> #endif <menuitem id="context-copyimage" data-l10n-id="main-context-menu-image-copy-link" ===================================== dom/base/nsCopySupport.cpp ===================================== @@ -503,7 +503,7 @@ nsresult nsCopySupport::ImageCopy(nsIImageLoadingContent* aImageElement, trans->SetReferrerInfo(referrerInfo); } -#ifdef XP_WIN +#if defined(XP_WIN) && !defined(BASE_BROWSER_VERSION) rv = AppendImagePromise(trans, imgRequest, aImageElement); NS_ENSURE_SUCCESS(rv, rv); #endif View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1fde2e0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1fde2e0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] 2 commits: fixup! Firefox preference overrides.
by ma1 (＠ma1) 12 Jul '23

12 Jul '23

ma1 pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 44eff978 by cypherpunks1 at 2023-07-12T14:35:28+00:00 fixup! Firefox preference overrides. Bug 41092: Enable URL query stripping to protect against cross-site tracking - - - - - 9740e17d by cypherpunks1 at 2023-07-12T14:35:28+00:00 Bug 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - 3 changed files: - browser/app/profile/001-base-profile.js - services/settings/static-dumps/main/moz.build - + services/settings/static-dumps/main/query-stripping.json Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -505,6 +505,11 @@ pref("corroborator.enabled", false); // stop using .textContent. pref("intl.multilingual.liveReload", false); +// Enable URL query stripping to protect against cross-site tracking (tor-browser#41092) +pref("privacy.query_stripping.enabled", true); +pref("privacy.query_stripping.enabled.pbmode", true); +pref("privacy.query_stripping.strip_on_share.enabled", true); + #ifdef XP_WIN // prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) // this pref changes the app's set AUMID to be dependent on the profile path, rather than ===================================== services/settings/static-dumps/main/moz.build ===================================== @@ -5,6 +5,7 @@ FINAL_TARGET_FILES.defaults.settings.main += [ "doh-config.json", "doh-providers.json", + "query-stripping.json", ] if CONFIG["MOZ_BUILD_APP"] == "browser": ===================================== services/settings/static-dumps/main/query-stripping.json ===================================== @@ -0,0 +1,44 @@ +{ + "data": [ + { + "schema": 1678379807899, + "allowList": [], + "stripList": [ + "gclid", + "dclid", + "msclkid", + "_openstat", + "yclid", + "wickedid", + "twclid", + "_hsenc", + "__hssc", + "__hstc", + "__hsfp", + "hsctatracking", + "wbraid", + "gbraid", + "ysclid" + ], + "id": "85078bad-f31e-4d93-bb8a-81088b25d6dd", + "last_modified": 1678736907773 + }, + { + "schema": 1649695008608, + "allowList": [], + "stripList": [ + "mc_eid", + "oly_anon_id", + "oly_enc_id", + "__s", + "vero_id", + "_hsenc", + "mkt_tok", + "fbclid" + ], + "id": "76495cfc-fac9-4079-9b5f-9ff0784484de", + "last_modified": 1649762862679 + } + ], + "timestamp": 1678736907773 +} View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5b4fa6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5b4fa6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.0esrbase-13.0-1] Bug 41791: Omit the source URL when copying page contents to the clipboard
by richard (＠richard) 12 Jul '23

12 Jul '23

richard pushed to branch base-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 6c9e419d by cypherpunks1 at 2023-07-12T14:29:21+00:00 Bug 41791: Omit the source URL when copying page contents to the clipboard - - - - - 2 changed files: - dom/base/nsCopySupport.cpp - widget/windows/nsDataObj.cpp Changes: ===================================== dom/base/nsCopySupport.cpp ===================================== @@ -284,6 +284,7 @@ static nsresult CreateTransferable( NS_ENSURE_SUCCESS(rv, rv); } +#if !defined(BASE_BROWSER_VERSION) // Try and get source URI of the items that are being dragged nsIURI* uri = aDocument.GetDocumentURI(); if (uri) { @@ -304,6 +305,7 @@ static nsresult CreateTransferable( NS_ENSURE_SUCCESS(rv, rv); } } +#endif } else { if (!aEncodedDocumentWithContext.mSerializationForTextUnicode.IsEmpty()) { // Add the unicode DataFlavor to the transferable ===================================== widget/windows/nsDataObj.cpp ===================================== @@ -520,11 +520,13 @@ nsDataObj::nsDataObj(nsIURI* uri) m_enumFE = new CEnumFormatEtc(); m_enumFE->AddRef(); +#if !defined(BASE_BROWSER_VERSION) if (uri) { // A URI was obtained, so pass this through to the DataObject // so it can create a SourceURL for CF_HTML flavour uri->GetSpec(mSourceURL); } +#endif } //----------------------------------------------------- // destruction @@ -1978,6 +1980,7 @@ nsresult nsDataObj ::BuildPlatformHTML(const char* inOurHTML, *outPlatformHTML = nullptr; nsDependentCString inHTMLString(inOurHTML); +#if !defined(BASE_BROWSER_VERSION) // Do we already have mSourceURL from a drag? if (mSourceURL.IsEmpty()) { nsAutoString url; @@ -1985,6 +1988,7 @@ nsresult nsDataObj ::BuildPlatformHTML(const char* inOurHTML, AppendUTF16toUTF8(url, mSourceURL); } +#endif constexpr auto kStartHTMLPrefix = "Version:0.9\r\nStartHTML:"_ns; constexpr auto kEndHTMLPrefix = "\r\nEndHTML:"_ns; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6c9e419… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6c9e419… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.0esrbase-13.0-1] Bug 41791: Omit the source URL when copying page contents to the clipboard
by richard (＠richard) 12 Jul '23

12 Jul '23

richard pushed to branch tor-browser-115.0esrbase-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 5b4fa6e2 by cypherpunks1 at 2023-07-12T14:27:48+00:00 Bug 41791: Omit the source URL when copying page contents to the clipboard - - - - - 2 changed files: - dom/base/nsCopySupport.cpp - widget/windows/nsDataObj.cpp Changes: ===================================== dom/base/nsCopySupport.cpp ===================================== @@ -284,6 +284,7 @@ static nsresult CreateTransferable( NS_ENSURE_SUCCESS(rv, rv); } +#if !defined(BASE_BROWSER_VERSION) // Try and get source URI of the items that are being dragged nsIURI* uri = aDocument.GetDocumentURI(); if (uri) { @@ -304,6 +305,7 @@ static nsresult CreateTransferable( NS_ENSURE_SUCCESS(rv, rv); } } +#endif } else { if (!aEncodedDocumentWithContext.mSerializationForTextUnicode.IsEmpty()) { // Add the unicode DataFlavor to the transferable ===================================== widget/windows/nsDataObj.cpp ===================================== @@ -520,11 +520,13 @@ nsDataObj::nsDataObj(nsIURI* uri) m_enumFE = new CEnumFormatEtc(); m_enumFE->AddRef(); +#if !defined(BASE_BROWSER_VERSION) if (uri) { // A URI was obtained, so pass this through to the DataObject // so it can create a SourceURL for CF_HTML flavour uri->GetSpec(mSourceURL); } +#endif } //----------------------------------------------------- // destruction @@ -1978,6 +1980,7 @@ nsresult nsDataObj ::BuildPlatformHTML(const char* inOurHTML, *outPlatformHTML = nullptr; nsDependentCString inHTMLString(inOurHTML); +#if !defined(BASE_BROWSER_VERSION) // Do we already have mSourceURL from a drag? if (mSourceURL.IsEmpty()) { nsAutoString url; @@ -1985,6 +1988,7 @@ nsresult nsDataObj ::BuildPlatformHTML(const char* inOurHTML, AppendUTF16toUTF8(url, mSourceURL); } +#endif constexpr auto kStartHTMLPrefix = "Version:0.9\r\nStartHTML:"_ns; constexpr auto kEndHTMLPrefix = "\r\nEndHTML:"_ns; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5b4fa6e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5b4fa6e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.5] Bug 40889: Add mullvad sha256sums URL to...
by richard (＠richard) 12 Jul '23

12 Jul '23

richard pushed to branch maint-12.5 at The Tor Project / Applications / tor-browser-build Commits: 8140af32 by Nicolas Vigier at 2023-07-12T13:56:25+00:00 Bug 40889: Add mullvad sha256sums URL to download-unsigned-sha256sums-gpg-signatures-from-people-tpo - - - - - 2 changed files: - + keyring/jb.gpg - tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo Changes: ===================================== keyring/jb.gpg ===================================== Binary files /dev/null and b/keyring/jb.gpg differ ===================================== tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo ===================================== @@ -3,16 +3,24 @@ set -e script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" -for builder in $tb_builders +for builder in $tb_builders jb do - for file in sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.incrementals.txt.asc + for file in sha256sums-unsigned-build.txt sha256sums-unsigned-build.incrementals.txt do tmpfile=$(mktemp) chmod 644 "$tmpfile" - for url in \ - "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ - "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ - "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" + if test "$builder" = 'jb'; then + file="$file.gpg" + urls=("https://cdn.devmole.eu/hashes//$SIGNING_PROJECTNAME/$tbb_version-build$tbb_…") + else + file="$file.asc" + urls=( \ + "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ + "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ + "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ + ) + fi + for url in "${urls[@]}" do if wget -q -O "$tmpfile" "$url"; then mv "$tmpfile" "$signed_version_dir/$file-$builder" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40889: Add mullvad sha256sums URL to...
by richard (＠richard) 12 Jul '23

12 Jul '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 3c23c8a8 by Nicolas Vigier at 2023-07-07T11:46:30+02:00 Bug 40889: Add mullvad sha256sums URL to download-unsigned-sha256sums-gpg-signatures-from-people-tpo - - - - - 2 changed files: - + keyring/jb.gpg - tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo Changes: ===================================== keyring/jb.gpg ===================================== Binary files /dev/null and b/keyring/jb.gpg differ ===================================== tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo ===================================== @@ -3,16 +3,24 @@ set -e script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" -for builder in $tb_builders +for builder in $tb_builders jb do - for file in sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.incrementals.txt.asc + for file in sha256sums-unsigned-build.txt sha256sums-unsigned-build.incrementals.txt do tmpfile=$(mktemp) chmod 644 "$tmpfile" - for url in \ - "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ - "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ - "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" + if test "$builder" = 'jb'; then + file="$file.gpg" + urls=("https://cdn.devmole.eu/hashes//$SIGNING_PROJECTNAME/$tbb_version-build$tbb_…") + else + file="$file.asc" + urls=( \ + "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ + "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ + "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ + ) + fi + for url in "${urls[@]}" do if wget -q -O "$tmpfile" "$url"; then mv "$tmpfile" "$signed_version_dir/$file-$builder" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0