June 2023 - tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-13.0-1] fixup! Bug 32308: use direct browser sizing for letterboxing.
by ma1 (＠ma1) 12 Jun '23

12 Jun '23

ma1 pushed to branch tor-browser-102.12.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: a6db7b91 by hackademix at 2023-06-12T10:35:40+02:00 fixup! Bug 32308: use direct browser sizing for letterboxing. - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.jsm Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -51,7 +51,7 @@ function forEachWindow(callback) { async function windowResizeHandler(aEvent) { - if (RFPHelper.letterboxingEnabled) { + if (RFPHelper.letterboxingEnabled || !RFPHelper.rfpEnabled) { return; } if (Services.prefs.getIntPref(kPrefResizeWarnings) <= 0) { @@ -250,7 +250,9 @@ class _RFPHelper { } _handleResistFingerprintingChanged() { - if (Services.prefs.getBoolPref(kPrefResistFingerprinting)) { + if ( + (this.rfpEnabled = Services.prefs.getBoolPref(kPrefResistFingerprinting)) + ) { this._addRFPObservers(); Services.ww.registerNotification(this); forEachWindow(win => this._attachWindow(win)); @@ -397,7 +399,9 @@ class _RFPHelper { kPrefLetterboxing, false ); - forEachWindow(win => this._updateSizeForTabsInWindow(win)); + if (this.rfpEnabled) { + forEachWindow(win => this._updateSizeForTabsInWindow(win)); + } } // The function to parse the dimension set from the pref value. The pref value View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a6db7b9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a6db7b9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.12.0esr-12.5-1] fixup! Bug 32308: use direct browser sizing for letterboxing.
by ma1 (＠ma1) 12 Jun '23

12 Jun '23

ma1 pushed to branch base-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: c8ea1c20 by hackademix at 2023-06-12T10:30:29+02:00 fixup! Bug 32308: use direct browser sizing for letterboxing. - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.jsm Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -51,7 +51,7 @@ function forEachWindow(callback) { async function windowResizeHandler(aEvent) { - if (RFPHelper.letterboxingEnabled) { + if (RFPHelper.letterboxingEnabled || !RFPHelper.rfpEnabled) { return; } if (Services.prefs.getIntPref(kPrefResizeWarnings) <= 0) { @@ -250,7 +250,9 @@ class _RFPHelper { } _handleResistFingerprintingChanged() { - if (Services.prefs.getBoolPref(kPrefResistFingerprinting)) { + if ( + (this.rfpEnabled = Services.prefs.getBoolPref(kPrefResistFingerprinting)) + ) { this._addRFPObservers(); Services.ww.registerNotification(this); forEachWindow(win => this._attachWindow(win)); @@ -397,7 +399,9 @@ class _RFPHelper { kPrefLetterboxing, false ); - forEachWindow(win => this._updateSizeForTabsInWindow(win)); + if (this.rfpEnabled) { + forEachWindow(win => this._updateSizeForTabsInWindow(win)); + } } // The function to parse the dimension set from the pref value. The pref value View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c8ea1c2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c8ea1c2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-12.5-1] fixup! Bug 32308: use direct browser sizing for letterboxing.
by ma1 (＠ma1) 12 Jun '23

12 Jun '23

ma1 pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 1fac685b by hackademix at 2023-06-12T09:22:03+02:00 fixup! Bug 32308: use direct browser sizing for letterboxing. - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.jsm Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -51,7 +51,7 @@ function forEachWindow(callback) { async function windowResizeHandler(aEvent) { - if (RFPHelper.letterboxingEnabled) { + if (RFPHelper.letterboxingEnabled || !RFPHelper.rfpEnabled) { return; } if (Services.prefs.getIntPref(kPrefResizeWarnings) <= 0) { @@ -250,7 +250,9 @@ class _RFPHelper { } _handleResistFingerprintingChanged() { - if (Services.prefs.getBoolPref(kPrefResistFingerprinting)) { + if ( + (this.rfpEnabled = Services.prefs.getBoolPref(kPrefResistFingerprinting)) + ) { this._addRFPObservers(); Services.ww.registerNotification(this); forEachWindow(win => this._attachWindow(win)); @@ -397,7 +399,9 @@ class _RFPHelper { kPrefLetterboxing, false ); - forEachWindow(win => this._updateSizeForTabsInWindow(win)); + if (this.rfpEnabled) { + forEachWindow(win => this._updateSizeForTabsInWindow(win)); + } } // The function to parse the dimension set from the pref value. The pref value View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1fac685… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1fac685… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-12.5-1] fixup! TB3: Tor Browser's official .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 10 Jun '23

10 Jun '23

Pier Angelo Vendrame pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 1ebff487 by Dan Ballard at 2023-06-10T12:26:20+00:00 fixup! TB3: Tor Browser's official .mozconfigs. Bug 41828: Remove --with-tor-browser-version from tor-browser-android mozconfig - - - - - 1 changed file: - browser/config/mozconfigs/tor-browser-android Changes: ===================================== browser/config/mozconfigs/tor-browser-android ===================================== @@ -1,7 +1,3 @@ . $topsrcdir/browser/config/mozconfigs/base-browser-android mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" - -if test ! -z "$LOCAL_DEV_BUILD"; then - ac_add_options --with-tor-browser-version=dev-build -fi View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1ebff48… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1ebff48… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-12.5a7-build1
by richard (＠richard) 09 Jun '23

09 Jun '23

richard pushed new tag tbb-12.5a7-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40865: Tor Browser 12.5a7
by richard (＠richard) 09 Jun '23

09 Jun '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 0ce5dccf by Richard Pospesel at 2023-06-08T17:29:52+00:00 Bug 40865: Tor Browser 12.5a7 - - - - - 8 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/allowed_addons.json - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/openssl/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,62 @@ +Tor Browser 12.5a7 - June 08 2023 + * All Platforms + * Updated Translations + * Updated NoScript to 11.4.22 + * Updated OpenSSL to 1.1.1u + * Bug 41795: Rebase Tor Browser and Base Browser alpha to 102.12esr [tor-browser] + * Bug 41818: Remove YEC 2022 strings [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 102.12esr + * Bug 33298: HTTP onion sites do not give a popup warning when submitting form data to non-onion HTTP sites [tor-browser] + * Bug 40552: New texts for the add a bridge manually modal [tor-browser] + * Bug 41608: Improve the UX of the location bar's connection status [tor-browser] + * Bug 41618: Update the iconography used in the status strip in connection settings [tor-browser] + * Bug 41623: Update connection assist's iconography [tor-browser] + * Bug 41718: Add the external filetype warning to about:downloads [tor-browser] + * Bug 41726: Animate the torconnect icon to transition between connected states [tor-browser] + * Bug 41734: Add a `Connected` flag to indicate which built-in bridge option Tor Browser is currently using [tor-browser] + * Bug 41749: Replace the onion-glyph with dedicated icon for onion services [tor-browser] + * Bug 41785: Network monitor in developer tools shows HTTP onion resources as insecure [tor-browser] + * Bug 41792: Drag and Drop protection prevents dragging downloads [tor-browser] + * Bug 41800: Add the external filetype warning to Library / Manage Bookmarks [tor-browser] + * Bug 41801: Fix handleProcessReady in TorSettings.init [tor-browser] + * Bug 41802: Conjure bridge cards are mislabeled as vanilla bridges in alpha [tor-browser] + * Bug 41809: Wrong icon in the bridge QR code [tor-browser] + * Bug 41810: Add "Connect" buttons to Request Bridge and Provide Bridge modals [tor-browser] + * Bug 41815: wrong connect icons [tor-browser] + * Bug 41816: The top navigation in about:torconnect isn't updated correctly [tor-browser] + * Android + * Updated GeckoView to 102.12esr + * Build System + * All Platforms + * Bug 40777: Create a Go bootstrap project [tor-browser-build] + * Bug 40850: Tor Browser nightly fails to build obfs4 [tor-browser-build] + * Bug 40866: Remove `Using ansible to set up a nightly build machine` from README [tor-browser-build] + * Bug 40869: obfs4 is renamed to lyrebird [tor-browser-build] + * Bug 40870: Remove url without browser name from tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo [tor-browser-build] + * Bug 40871: Update keyring/boklm.gpg for new subkeys [tor-browser-build] + * Windows + macOS + Linux + * Bug 40864: Make a script to update the manual artifact [tor-browser-build] + * macOS + * Bug 40847: Build filesystem influences the DMG creation [tor-browser-build] + * Bug 40858: Create script to assist testers self sign Mac builds to allow running on Arm processors [tor-browser-build] + * Android + * Bug 40874: Add commit information also to GV [tor-browser-build] + +Tor Browser 12.0.7 - May 31 2023 + * All Platforms + * Updated Translations + * Updated NoScript to 11.4.22 + * Updated OpenSSL to 1.1.1u + * Bug 41764: TTP-02-004 OOS: No user-activation required to download files (Low) [tor-browser] + * Bug 41794: Rebase Tor Browser and Base Browser stable to 102.12esr [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 102.12esr + * Bug 41777: Internally shippped manual does not adapt to RTL languages (it always align to the left) [tor-browser] + * Android + * Updated GeckoView to 102.12esr + * Bug 41805: Backport Android-specific security fixes from Firefox 114 to ESR 102.12-based Tor Browser [tor-browser] + Tor Browser 12.5a6 - May 22 2023 * All Platforms * Updated Translations ===================================== projects/browser/allowed_addons.json ===================================== @@ -17,7 +17,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 988302, + "average_daily_users": 974265, "categories": { "android": [ "experimental", @@ -221,10 +221,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5608, - "bayesian_average": 4.559632030468385, - "count": 5005, - "text_count": 1581 + "average": 4.5603, + "bayesian_average": 4.559134490716616, + "count": 5024, + "text_count": 1583 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -321,7 +321,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 24550 + "weekly_downloads": 23662 }, "notes": null }, @@ -337,7 +337,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 258950, + "average_daily_users": 254515, "categories": { "android": [ "security-privacy" @@ -553,10 +553,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8136, - "bayesian_average": 4.808937485557134, - "count": 1336, - "text_count": 237 + "average": 4.8143, + "bayesian_average": 4.80964333371513, + "count": 1341, + "text_count": 238 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -641,7 +641,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 3514 + "weekly_downloads": 3353 }, "notes": null }, @@ -657,7 +657,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1133122, + "average_daily_users": 1107157, "categories": { "android": [ "security-privacy" @@ -1180,10 +1180,10 @@ "category": "recommended" }, "ratings": { - "average": 4.802, - "bayesian_average": 4.79921587479466, - "count": 2232, - "text_count": 426 + "average": 4.8015, + "bayesian_average": 4.798717494585019, + "count": 2237, + "text_count": 428 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1207,7 +1207,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 18346 + "weekly_downloads": 16875 }, "notes": null }, @@ -1223,7 +1223,7 @@ "picture_url": null } ], - "average_daily_users": 6410036, + "average_daily_users": 6308349, "categories": { "android": [ "security-privacy" @@ -1388,7 +1388,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-05-21T19:05:37Z", + "last_updated": "2023-06-05T13:00:36Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1533,10 +1533,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7807, - "bayesian_average": 4.780299334467883, - "count": 15437, - "text_count": 4014 + "average": 4.7814, + "bayesian_average": 4.78100041890513, + "count": 15510, + "text_count": 4029 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1598,7 +1598,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 131360 + "weekly_downloads": 129841 }, "notes": null }, @@ -1614,7 +1614,7 @@ "picture_url": null } ], - "average_daily_users": 168477, + "average_daily_users": 168486, "categories": { "android": [ "photos-media" @@ -1713,10 +1713,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4875, - "bayesian_average": 4.482377575890338, - "count": 1118, - "text_count": 418 + "average": 4.4857, + "bayesian_average": 4.480580193554738, + "count": 1120, + "text_count": 420 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1738,7 +1738,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 387 + "weekly_downloads": 364 }, "notes": null }, @@ -1754,7 +1754,7 @@ "picture_url": null } ], - "average_daily_users": 88341, + "average_daily_users": 87680, "categories": { "android": [ "experimental", @@ -1892,7 +1892,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 1535 + "weekly_downloads": 1851 }, "notes": null }, @@ -1908,7 +1908,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 262509, + "average_daily_users": 259528, "categories": { "android": [ "photos-media", @@ -2127,10 +2127,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6537, - "bayesian_average": 4.648959055095389, - "count": 1262, - "text_count": 242 + "average": 4.6515, + "bayesian_average": 4.646797768590084, + "count": 1274, + "text_count": 245 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2151,7 +2151,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 3984 + "weekly_downloads": 3778 }, "notes": null }, @@ -2174,7 +2174,7 @@ "picture_url": null } ], - "average_daily_users": 111302, + "average_daily_users": 111546, "categories": { "android": [ "other" @@ -2457,9 +2457,9 @@ "category": "recommended" }, "ratings": { - "average": 4.4439, - "bayesian_average": 4.439229613376027, - "count": 1212, + "average": 4.442, + "bayesian_average": 4.437335162834797, + "count": 1215, "text_count": 322 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", @@ -2480,7 +2480,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 32 + "weekly_downloads": 24 }, "notes": null }, @@ -2496,7 +2496,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 314158, + "average_daily_users": 306985, "categories": { "android": [ "performance", @@ -2686,10 +2686,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4074, - "bayesian_average": 4.404687188031893, - "count": 2067, - "text_count": 803 + "average": 4.4057, + "bayesian_average": 4.402993200065393, + "count": 2073, + "text_count": 804 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2733,7 +2733,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 7591 + "weekly_downloads": 7512 }, "notes": null }, @@ -2749,7 +2749,7 @@ "picture_url": null } ], - "average_daily_users": 151904, + "average_daily_users": 150648, "categories": { "android": [ "performance", @@ -2864,9 +2864,9 @@ "category": "recommended" }, "ratings": { - "average": 3.9026, - "bayesian_average": 3.898323122758472, - "count": 1129, + "average": 3.9003, + "bayesian_average": 3.8960318617843828, + "count": 1133, "text_count": 401 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", @@ -2886,7 +2886,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 1860 + "weekly_downloads": 1940 }, "notes": null } ===================================== projects/firefox/config ===================================== @@ -11,11 +11,11 @@ container: use_container: 1 var: - firefox_platform_version: 102.11.0 + firefox_platform_version: 102.12.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '12.5' browser_branch: '[% c("var/browser_series") %]-1' - browser_build: 3 + browser_build: 2 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -11,9 +11,9 @@ container: use_container: 1 var: - geckoview_version: 102.11.0esr + geckoview_version: 102.12.0esr browser_branch: 12.5-1 - browser_build: 3 + browser_build: 2 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' ===================================== projects/go/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.20.4 +version: 1.20.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -119,7 +119,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 9f34ace128764b7a3a4b238b805856cc1b2184304df9e5690825b0710f4202d6 + sha256sum: 9a15c133ba2cfafe79652f4815b62e7cfc267f68df1b9454c6ab2a3ca8b96a88 - project: go-bootstrap name: go-bootstrap target_replace: ===================================== projects/openssl/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1t +version: 1.1.1u filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -34,4 +34,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b + sha256sum: e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6 ===================================== projects/translation/config ===================================== @@ -6,19 +6,19 @@ version: '[% c("abbrev") %]' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: f1f1204c2421db64ae3d30be31a4d7819b9a3e42 + git_hash: 0a429fd14e8ebe9edcdbaac933c86b4bac8fcb19 targets: nightly: git_hash: 'base-browser' base-browser-fluent: base-browser-fluent: '[% INCLUDE build %]' - git_hash: 3167fc379caac406941ae4fce429c302fd1a6d5d + git_hash: c68657f80050975474903f170250e2888c2a1fea targets: nightly: git_hash: 'basebrowser-newidentityftl' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 7089eb9ac06e0f6de99c386a09821c8799849206 + git_hash: 0cd2ac8d14ce4acd8c9781376a9fdcb9c8323b91 targets: nightly: git_hash: 'tor-browser' @@ -26,7 +26,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 65def475aa000981ac3c1b6db203e8e707f72e16 + git_hash: 1b094bdfaa444d31f06fe7c0261de89ae67083cc targets: nightly: git_hash: 'fenix-torbrowserstringsxml' ===================================== rbm.conf ===================================== @@ -94,11 +94,12 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '12.5a6' + torbrowser_version: '12.5a7' torbrowser_build: 'build1' torbrowser_incremental_from: - 12.5a4 - 12.5a5 + - 12.5a6 updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] alpha: new version, 12.5a7
by boklm (＠boklm) 09 Jun '23

09 Jun '23

boklm pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 975298b5 by Nicolas Vigier at 2023-06-09T12:43:54+02:00 alpha: new version, 12.5a7 - - - - - 30 changed files: - update_3/alpha/.htaccess - − update_3/alpha/12.5a4-12.5a6-linux32-ALL.xml - − update_3/alpha/12.5a4-12.5a6-linux64-ALL.xml - − update_3/alpha/12.5a4-12.5a6-macos-ALL.xml - − update_3/alpha/12.5a4-12.5a6-win32-ALL.xml - − update_3/alpha/12.5a4-12.5a6-win64-ALL.xml - + update_3/alpha/12.5a4-12.5a7-linux32-ALL.xml - + update_3/alpha/12.5a4-12.5a7-linux64-ALL.xml - + update_3/alpha/12.5a4-12.5a7-macos-ALL.xml - + update_3/alpha/12.5a4-12.5a7-win32-ALL.xml - + update_3/alpha/12.5a4-12.5a7-win64-ALL.xml - − update_3/alpha/12.5a5-12.5a6-linux32-ALL.xml - − update_3/alpha/12.5a5-12.5a6-linux64-ALL.xml - − update_3/alpha/12.5a5-12.5a6-macos-ALL.xml - − update_3/alpha/12.5a5-12.5a6-win32-ALL.xml - − update_3/alpha/12.5a5-12.5a6-win64-ALL.xml - + update_3/alpha/12.5a5-12.5a7-linux32-ALL.xml - + update_3/alpha/12.5a5-12.5a7-linux64-ALL.xml - + update_3/alpha/12.5a5-12.5a7-macos-ALL.xml - + update_3/alpha/12.5a5-12.5a7-win32-ALL.xml - + update_3/alpha/12.5a5-12.5a7-win64-ALL.xml - + update_3/alpha/12.5a6-12.5a7-linux32-ALL.xml - + update_3/alpha/12.5a6-12.5a7-linux64-ALL.xml - + update_3/alpha/12.5a6-12.5a7-macos-ALL.xml - + update_3/alpha/12.5a6-12.5a7-win32-ALL.xml - + update_3/alpha/12.5a6-12.5a7-win64-ALL.xml - − update_3/alpha/12.5a6-linux32-ALL.xml - − update_3/alpha/12.5a6-linux64-ALL.xml - − update_3/alpha/12.5a6-macos-ALL.xml - − update_3/alpha/12.5a6-win32-ALL.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_115_0b3_RELEASE
by Pier Angelo Vendrame (＠pierov) 09 Jun '23

09 Jun '23

Pier Angelo Vendrame pushed new tag FIREFOX_115_0b3_RELEASE at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-13.0-1] fixup! Bug 40925: Implemented the Security Level component
by Pier Angelo Vendrame (＠pierov) 09 Jun '23

09 Jun '23

Pier Angelo Vendrame pushed to branch tor-browser-102.12.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 5db35e85 by cypherpunks1 at 2023-06-08T23:51:40-08:00 fixup! Bug 40925: Implemented the Security Level component Bug 26277: Skip the redirection page when searching with DuckDuckGo on the safest security level - - - - - 1 changed file: - toolkit/components/search/SearchEngine.jsm Changes: ===================================== toolkit/components/search/SearchEngine.jsm ===================================== @@ -30,6 +30,12 @@ XPCOMUtils.defineLazyGetter(this, "logConsole", () => { }); }); +XPCOMUtils.defineLazyScriptGetter( + this, + "SecurityLevelPrefs", + "chrome://browser/content/securitylevel/securityLevel.js" +); + const USER_DEFINED = "searchTerms"; // Supported OpenSearch parameters @@ -429,7 +435,17 @@ class EngineURL { } getSubmission(searchTerms, engine, purpose) { - var url = ParamSubstitution(this.template, searchTerms, engine); + let urlTemplate = this.template; + if ( + engine && + (engine._extensionID === "ddg(a)search.mozilla.org" || + engine._extensionID === "ddg-onion(a)search.mozilla.org") && + this.type === SearchUtils.URL_TYPE.SEARCH && + SecurityLevelPrefs?.securityLevel === "safest" + ) { + urlTemplate += "html"; + } + var url = ParamSubstitution(urlTemplate, searchTerms, engine); // Default to searchbar if the purpose is not provided var requestPurpose = purpose || "searchbar"; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5db35e8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5db35e8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] 2 commits: Bug 40875: Re-enable Windows code signing in do-all-signing
by boklm (＠boklm) 09 Jun '23

09 Jun '23

boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 5966b10a by Nicolas Vigier at 2023-06-08T12:45:18+02:00 Bug 40875: Re-enable Windows code signing in do-all-signing - - - - - 2cdecd5b by Nicolas Vigier at 2023-06-08T12:45:33+02:00 Bug 40877: Update osslsigncode to more recent version - - - - - 6 changed files: - − projects/osslsigncode/0001-Make-code-work-with-OpenSSL-1.1.patch - projects/osslsigncode/build - projects/osslsigncode/config - − projects/osslsigncode/timestamping.patch - tools/signing/authenticode-timestamping.sh - tools/signing/do-all-signing Changes: ===================================== projects/osslsigncode/0001-Make-code-work-with-OpenSSL-1.1.patch deleted ===================================== @@ -1,324 +0,0 @@ -From 86931f9d7c3d73b97010e598a5ad41ea4fab2b63 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger(a)gmx.de> -Date: Sun, 12 Mar 2017 23:00:12 +0100 -Subject: [PATCH] Make code work with OpenSSL 1.1. - -Changes in consist of: -- Use EVP_MD_CTX_new/free API instead of on-stack allocation -- Remove some M_ prefixes like for ASN1_IA5STRING_new -- Remove pagehash functionality because it is useless to me and - fixing it would be a pain. Would require declaring a few - ASN_SEQUENCES and use that to get the required i2d functions - from what I could find out. -- Remove OBJ_create calls that seem to serve no purpose, - now crash because NULL pointers are no longer handled - (who changes API that way?!) and even if that was fixed - lead to errors when these objects are later created - again/"for real" by OBJ_txt2nid or OBJ_txt2obj (I think, - did not investigate further). - -diff --git a/osslsigncode.c b/osslsigncode.c -index 2978c02..3797458 100644 ---- a/osslsigncode.c -+++ b/osslsigncode.c -@@ -450,16 +450,16 @@ static SpcSpOpusInfo* createOpus(const char *desc, const char *url) - if (desc) { - info->programName = SpcString_new(); - info->programName->type = 1; -- info->programName->value.ascii = M_ASN1_IA5STRING_new(); -- ASN1_STRING_set((ASN1_STRING *)info->programName->value.ascii, -+ info->programName->value.ascii = ASN1_IA5STRING_new(); -+ ASN1_STRING_set(info->programName->value.ascii, - (const unsigned char*)desc, strlen(desc)); - } - - if (url) { - info->moreInfo = SpcLink_new(); - info->moreInfo->type = 0; -- info->moreInfo->value.url = M_ASN1_IA5STRING_new(); -- ASN1_STRING_set((ASN1_STRING *)info->moreInfo->value.url, -+ info->moreInfo->value.url = ASN1_IA5STRING_new(); -+ ASN1_STRING_set(info->moreInfo->value.url, - (const unsigned char*)url, strlen(url)); - } - -@@ -609,19 +609,20 @@ static int add_timestamp(PKCS7 *sig, char *url, char *proxy, int rfc3161, const - - if (rfc3161) { - unsigned char mdbuf[EVP_MAX_MD_SIZE]; -- EVP_MD_CTX mdctx; -+ EVP_MD_CTX *mdctx = EVP_MD_CTX_new(); - -- EVP_MD_CTX_init(&mdctx); -- EVP_DigestInit(&mdctx, md); -- EVP_DigestUpdate(&mdctx, si->enc_digest->data, si->enc_digest->length); -- EVP_DigestFinal(&mdctx, mdbuf, NULL); -+ EVP_DigestInit(mdctx, md); -+ EVP_DigestUpdate(mdctx, si->enc_digest->data, si->enc_digest->length); -+ EVP_DigestFinal(mdctx, mdbuf, NULL); -+ EVP_MD_CTX_free(mdctx); -+ mdctx = NULL; - - TimeStampReq *req = TimeStampReq_new(); - ASN1_INTEGER_set(req->version, 1); - req->messageImprint->digestAlgorithm->algorithm = OBJ_nid2obj(EVP_MD_nid(md)); - req->messageImprint->digestAlgorithm->parameters = ASN1_TYPE_new(); - req->messageImprint->digestAlgorithm->parameters->type = V_ASN1_NULL; -- M_ASN1_OCTET_STRING_set(req->messageImprint->digest, mdbuf, EVP_MD_size(md)); -+ ASN1_OCTET_STRING_set(req->messageImprint->digest, mdbuf, EVP_MD_size(md)); - req->certReq = (void*)0x1; - - len = i2d_TimeStampReq(req, NULL); -@@ -921,83 +922,8 @@ static const unsigned char classid_page_hash[] = { - 0xAE, 0x05, 0xA2, 0x17, 0xDA, 0x8E, 0x60, 0xD6 - }; - --static unsigned char *calc_page_hash(char *indata, unsigned int peheader, int pe32plus, -- unsigned int sigpos, int phtype, unsigned int *phlen); -- --DECLARE_STACK_OF(ASN1_OCTET_STRING) --#ifndef sk_ASN1_OCTET_STRING_new_null --#define sk_ASN1_OCTET_STRING_new_null() SKM_sk_new_null(ASN1_OCTET_STRING) --#define sk_ASN1_OCTET_STRING_free(st) SKM_sk_free(ASN1_OCTET_STRING, (st)) --#define sk_ASN1_OCTET_STRING_push(st, val) SKM_sk_push(ASN1_OCTET_STRING, (st), (val)) --#define i2d_ASN1_SET_OF_ASN1_OCTET_STRING(st, pp, i2d_func, ex_tag, ex_class, is_set) \ -- SKM_ASN1_SET_OF_i2d(ASN1_OCTET_STRING, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) --#endif -- --DECLARE_STACK_OF(SpcAttributeTypeAndOptionalValue) --#ifndef sk_SpcAttributeTypeAndOptionalValue_new_null --#define sk_SpcAttributeTypeAndOptionalValue_new_null() SKM_sk_new_null(SpcAttributeTypeAndOptionalValue) --#define sk_SpcAttributeTypeAndOptionalValue_free(st) SKM_sk_free(SpcAttributeTypeAndOptionalValue, (st)) --#define sk_SpcAttributeTypeAndOptionalValue_push(st, val) SKM_sk_push(SpcAttributeTypeAndOptionalValue, (st), (val)) --#define i2d_SpcAttributeTypeAndOptionalValue(st, pp, i2d_func, ex_tag, ex_class, is_set) \ -- SKM_ASN1_SET_OF_i2d(SpcAttributeTypeAndOptionalValue, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set)) --#endif -- --static SpcLink *get_page_hash_link(int phtype, char *indata, unsigned int peheader, int pe32plus, unsigned int sigpos) --{ -- unsigned int phlen; -- unsigned char *ph = calc_page_hash(indata, peheader, pe32plus, sigpos, phtype, &phlen); -- if (!ph) { -- fprintf(stderr, "Failed to calculate page hash\n"); -- exit(-1); -- } -- -- ASN1_OCTET_STRING *ostr = M_ASN1_OCTET_STRING_new(); -- M_ASN1_OCTET_STRING_set(ostr, ph, phlen); -- free(ph); -- -- STACK_OF(ASN1_OCTET_STRING) *oset = sk_ASN1_OCTET_STRING_new_null(); -- sk_ASN1_OCTET_STRING_push(oset, ostr); -- unsigned char *p, *tmp; -- unsigned int l; -- l = i2d_ASN1_SET_OF_ASN1_OCTET_STRING(oset, NULL, i2d_ASN1_OCTET_STRING, -- V_ASN1_SET, V_ASN1_UNIVERSAL, IS_SET); -- tmp = p = OPENSSL_malloc(l); -- i2d_ASN1_SET_OF_ASN1_OCTET_STRING(oset, &tmp, i2d_ASN1_OCTET_STRING, -- V_ASN1_SET, V_ASN1_UNIVERSAL, IS_SET); -- ASN1_OCTET_STRING_free(ostr); -- sk_ASN1_OCTET_STRING_free(oset); -- -- SpcAttributeTypeAndOptionalValue *aval = SpcAttributeTypeAndOptionalValue_new(); -- aval->type = OBJ_txt2obj((phtype == NID_sha1) ? SPC_PE_IMAGE_PAGE_HASHES_V1 : SPC_PE_IMAGE_PAGE_HASHES_V2, 1); -- aval->value = ASN1_TYPE_new(); -- aval->value->type = V_ASN1_SET; -- aval->value->value.set = ASN1_STRING_new(); -- ASN1_STRING_set(aval->value->value.set, p, l); -- OPENSSL_free(p); -- -- STACK_OF(SpcAttributeTypeAndOptionalValue) *aset = sk_SpcAttributeTypeAndOptionalValue_new_null(); -- sk_SpcAttributeTypeAndOptionalValue_push(aset, aval); -- l = i2d_SpcAttributeTypeAndOptionalValue(aset, NULL, i2d_SpcAttributeTypeAndOptionalValue, -- V_ASN1_SET, V_ASN1_UNIVERSAL, IS_SET); -- tmp = p = OPENSSL_malloc(l); -- l = i2d_SpcAttributeTypeAndOptionalValue(aset, &tmp, i2d_SpcAttributeTypeAndOptionalValue, -- V_ASN1_SET, V_ASN1_UNIVERSAL, IS_SET); -- sk_SpcAttributeTypeAndOptionalValue_free(aset); -- SpcAttributeTypeAndOptionalValue_free(aval); -- -- SpcSerializedObject *so = SpcSerializedObject_new(); -- M_ASN1_OCTET_STRING_set(so->classId, classid_page_hash, sizeof(classid_page_hash)); -- M_ASN1_OCTET_STRING_set(so->serializedData, p, l); -- OPENSSL_free(p); -- -- SpcLink *link = SpcLink_new(); -- link->type = 1; -- link->value.moniker = so; -- return link; --} -- - static void get_indirect_data_blob(u_char **blob, int *len, const EVP_MD *md, file_type_t type, -- int pagehash, char *indata, unsigned int peheader, int pe32plus, -+ char *indata, unsigned int peheader, int pe32plus, - unsigned int sigpos) - { - static const unsigned char msistr[] = { -@@ -1024,14 +950,7 @@ static void get_indirect_data_blob(u_char **blob, int *len, const EVP_MD *md, fi - } else if (type == FILE_TYPE_PE) { - SpcPeImageData *pid = SpcPeImageData_new(); - ASN1_BIT_STRING_set(pid->flags, (unsigned char*)"0", 0); -- if (pagehash) { -- int phtype = NID_sha1; -- if (EVP_MD_size(md) > EVP_MD_size(EVP_sha1())) -- phtype = NID_sha256; -- pid->file = get_page_hash_link(phtype, indata, peheader, pe32plus, sigpos); -- } else { -- pid->file = get_obsolete_link(); -- } -+ pid->file = get_obsolete_link(); - l = i2d_SpcPeImageData(pid, NULL); - p = OPENSSL_malloc(l); - i2d_SpcPeImageData(pid, &p); -@@ -1046,7 +965,7 @@ static void get_indirect_data_blob(u_char **blob, int *len, const EVP_MD *md, fi - ASN1_INTEGER_set(si->d, 0); - ASN1_INTEGER_set(si->e, 0); - ASN1_INTEGER_set(si->f, 0); -- M_ASN1_OCTET_STRING_set(si->string, msistr, sizeof(msistr)); -+ ASN1_OCTET_STRING_set(si->string, msistr, sizeof(msistr)); - l = i2d_SpcSipInfo(si, NULL); - p = OPENSSL_malloc(l); - i2d_SpcSipInfo(si, &p); -@@ -1068,7 +987,7 @@ static void get_indirect_data_blob(u_char **blob, int *len, const EVP_MD *md, fi - hashlen = EVP_MD_size(md); - hash = OPENSSL_malloc(hashlen); - memset(hash, 0, hashlen); -- M_ASN1_OCTET_STRING_set(idc->messageDigest->digest, hash, hashlen); -+ ASN1_OCTET_STRING_set(idc->messageDigest->digest, hash, hashlen); - OPENSSL_free(hash); - - *len = i2d_SpcIndirectDataContent(idc, NULL); -@@ -1923,19 +1842,18 @@ static void calc_pe_digest(BIO *bio, const EVP_MD *md, unsigned char *mdbuf, - unsigned int peheader, int pe32plus, unsigned int fileend) - { - static unsigned char bfb[16*1024*1024]; -- EVP_MD_CTX mdctx; -+ EVP_MD_CTX *mdctx = EVP_MD_CTX_new(); - -- EVP_MD_CTX_init(&mdctx); -- EVP_DigestInit(&mdctx, md); -+ EVP_DigestInit(mdctx, md); - - memset(mdbuf, 0, EVP_MAX_MD_SIZE); - - (void)BIO_seek(bio, 0); - BIO_read(bio, bfb, peheader + 88); -- EVP_DigestUpdate(&mdctx, bfb, peheader + 88); -+ EVP_DigestUpdate(mdctx, bfb, peheader + 88); - BIO_read(bio, bfb, 4); - BIO_read(bio, bfb, 60+pe32plus*16); -- EVP_DigestUpdate(&mdctx, bfb, 60+pe32plus*16); -+ EVP_DigestUpdate(mdctx, bfb, 60+pe32plus*16); - BIO_read(bio, bfb, 8); - - unsigned int n = peheader + 88 + 4 + 60+pe32plus*16 + 8; -@@ -1946,11 +1864,12 @@ static void calc_pe_digest(BIO *bio, const EVP_MD *md, unsigned char *mdbuf, - int l = BIO_read(bio, bfb, want); - if (l <= 0) - break; -- EVP_DigestUpdate(&mdctx, bfb, l); -+ EVP_DigestUpdate(mdctx, bfb, l); - n += l; - } - -- EVP_DigestFinal(&mdctx, mdbuf, NULL); -+ EVP_DigestFinal(mdctx, mdbuf, NULL); -+ EVP_MD_CTX_free(mdctx); - } - - -@@ -2019,16 +1938,15 @@ static unsigned char *calc_page_hash(char *indata, unsigned int peheader, int pe - int phlen = pphlen * (3 + nsections + sigpos / pagesize); - unsigned char *res = malloc(phlen); - unsigned char *zeroes = calloc(pagesize, 1); -- EVP_MD_CTX mdctx; -- -- EVP_MD_CTX_init(&mdctx); -- EVP_DigestInit(&mdctx, md); -- EVP_DigestUpdate(&mdctx, indata, peheader + 88); -- EVP_DigestUpdate(&mdctx, indata + peheader + 92, 60 + pe32plus*16); -- EVP_DigestUpdate(&mdctx, indata + peheader + 160 + pe32plus*16, hdrsize - (peheader + 160 + pe32plus*16)); -- EVP_DigestUpdate(&mdctx, zeroes, pagesize - hdrsize); -+ EVP_MD_CTX *mdctx = EVP_MD_CTX_new(); -+ -+ EVP_DigestInit(mdctx, md); -+ EVP_DigestUpdate(mdctx, indata, peheader + 88); -+ EVP_DigestUpdate(mdctx, indata + peheader + 92, 60 + pe32plus*16); -+ EVP_DigestUpdate(mdctx, indata + peheader + 160 + pe32plus*16, hdrsize - (peheader + 160 + pe32plus*16)); -+ EVP_DigestUpdate(mdctx, zeroes, pagesize - hdrsize); - memset(res, 0, 4); -- EVP_DigestFinal(&mdctx, res + 4, NULL); -+ EVP_DigestFinal(mdctx, res + 4, NULL); - - unsigned short sizeofopthdr = GET_UINT16_LE(indata + peheader + 20); - char *sections = indata + peheader + 24 + sizeofopthdr; -@@ -2040,18 +1958,20 @@ static unsigned char *calc_page_hash(char *indata, unsigned int peheader, int pe - unsigned int l; - for (l=0; l < rs; l+=pagesize, pi++) { - PUT_UINT32_LE(ro + l, res + pi*pphlen); -- EVP_DigestInit(&mdctx, md); -+ EVP_DigestInit(mdctx, md); - if (rs - l < pagesize) { -- EVP_DigestUpdate(&mdctx, indata + ro + l, rs - l); -- EVP_DigestUpdate(&mdctx, zeroes, pagesize - (rs - l)); -+ EVP_DigestUpdate(mdctx, indata + ro + l, rs - l); -+ EVP_DigestUpdate(mdctx, zeroes, pagesize - (rs - l)); - } else { -- EVP_DigestUpdate(&mdctx, indata + ro + l, pagesize); -+ EVP_DigestUpdate(mdctx, indata + ro + l, pagesize); - } -- EVP_DigestFinal(&mdctx, res + pi*pphlen + 4, NULL); -+ EVP_DigestFinal(mdctx, res + pi*pphlen + 4, NULL); - } - lastpos = ro + rs; - sections += 40; - } -+ EVP_MD_CTX_free(mdctx); -+ mdctx = NULL; - PUT_UINT32_LE(lastpos, res + pi*pphlen); - memset(res + pi*pphlen + 4, 0, EVP_MD_size(md)); - pi++; -@@ -2413,7 +2333,7 @@ int main(int argc, char **argv) - int nturl = 0, ntsurl = 0; - int addBlob = 0; - u_char *p = NULL; -- int ret = 0, i, len = 0, jp = -1, pe32plus = 0, comm = 0, pagehash = 0; -+ int ret = 0, i, len = 0, jp = -1, pe32plus = 0, comm = 0; - unsigned int tmp, peheader = 0, padlen = 0; - off_t filesize, fileend, sigfilesize, sigfileend, outdatasize; - file_type_t type; -@@ -2448,13 +2368,6 @@ int main(int argc, char **argv) - ERR_load_crypto_strings(); - OPENSSL_add_all_algorithms_conf(); - -- /* create some MS Authenticode OIDS we need later on */ -- if (!OBJ_create(SPC_STATEMENT_TYPE_OBJID, NULL, NULL) || -- !OBJ_create(SPC_MS_JAVA_SOMETHING, NULL, NULL) || -- !OBJ_create(SPC_SP_OPUS_INFO_OBJID, NULL, NULL) || -- !OBJ_create(SPC_NESTED_SIGNATURE_OBJID, NULL, NULL)) -- DO_EXIT_0("Failed to add objects\n"); -- - md = EVP_sha1(); - - if (argc > 1) { -@@ -2531,8 +2444,6 @@ int main(int argc, char **argv) - readpass = *(++argv); - } else if ((cmd == CMD_SIGN) && !strcmp(*argv, "-comm")) { - comm = 1; -- } else if ((cmd == CMD_SIGN) && !strcmp(*argv, "-ph")) { -- pagehash = 1; - } else if ((cmd == CMD_SIGN) && !strcmp(*argv, "-n")) { - if (--argc < 1) usage(argv0); - desc = *(++argv); -@@ -3243,7 +3154,7 @@ int main(int argc, char **argv) - p7x = NULL; - } - -- get_indirect_data_blob(&p, &len, md, type, pagehash, indata, peheader, pe32plus, fileend); -+ get_indirect_data_blob(&p, &len, md, type, indata, peheader, pe32plus, fileend); - len -= EVP_MD_size(md); - memcpy(buf, p, len); - OPENSSL_free(p); --- -2.34.1 - ===================================== projects/osslsigncode/build ===================================== @@ -4,11 +4,10 @@ distdir=$(pwd)/dist mkdir -p $distdir/[% project %] tar xf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] -patch -p1 < ../0001-Make-code-work-with-OpenSSL-1.1.patch -patch -p1 < ../timestamping.patch -./autogen.sh -./configure --prefix=/[% project %] +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=/[% project %] -S .. make make DESTDIR=$distdir install ===================================== projects/osslsigncode/config ===================================== @@ -1,20 +1,16 @@ # vim: filetype=yaml sw=2 version: '[% c("git_hash").substr(0, 12) %]' git_url: https://github.com/mtrojnar/osslsigncode -git_hash: e72a1937d1a13e87074e4584f012f13e03fc1d64 +git_hash: d6f94d71f731868a3df86c6e0b8094da0c1412ed filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 0 var: deps: - - autoconf - - libtool - - pkg-config + - cmake - libssl-dev - libcurl4-openssl-dev input_files: - - filename: 0001-Make-code-work-with-OpenSSL-1.1.patch - - filename: timestamping.patch - filename: '[% c("var/srcfile") %]' enable: '[% c("var/no-git") %]' ===================================== projects/osslsigncode/timestamping.patch deleted ===================================== @@ -1,56 +0,0 @@ -From 28b384e77fa0d4dd38751a0c72ab5976d2e38f75 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Fri, 5 Feb 2016 09:23:10 +0000 -Subject: [PATCH] Allow timestamping with the 'add' command - - -diff --git a/osslsigncode.c b/osslsigncode.c -index 32e37c8..2978c02 100644 ---- a/osslsigncode.c -+++ b/osslsigncode.c -@@ -2556,16 +2556,16 @@ int main(int argc, char **argv) - if (--argc < 1) usage(argv0); - url = *(++argv); - #ifdef ENABLE_CURL -- } else if ((cmd == CMD_SIGN) && !strcmp(*argv, "-t")) { -+ } else if ((cmd == CMD_SIGN || cmd == CMD_ADD) && !strcmp(*argv, "-t")) { - if (--argc < 1) usage(argv0); - turl[nturl++] = *(++argv); -- } else if ((cmd == CMD_SIGN) && !strcmp(*argv, "-ts")) { -+ } else if ((cmd == CMD_SIGN || cmd == CMD_ADD) && !strcmp(*argv, "-ts")) { - if (--argc < 1) usage(argv0); - tsurl[ntsurl++] = *(++argv); -- } else if ((cmd == CMD_SIGN) && !strcmp(*argv, "-p")) { -+ } else if ((cmd == CMD_SIGN || cmd == CMD_ADD) && !strcmp(*argv, "-p")) { - if (--argc < 1) usage(argv0); - proxy = *(++argv); -- } else if ((cmd == CMD_SIGN) && !strcmp(*argv, "-noverifypeer")) { -+ } else if ((cmd == CMD_SIGN || cmd == CMD_ADD) && !strcmp(*argv, "-noverifypeer")) { - noverifypeer = 1; - #endif - } else if ((cmd == CMD_SIGN || cmd == CMD_ADD) && !strcmp(*argv, "-addUnauthenticatedBlob")) { --- -2.7.0 - - -From 8159546dfa270da0e3512dcba983ce15029111d0 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Sat, 11 Apr 2020 05:50:36 +0000 -Subject: [PATCH] fixup! Allow timestamping with the 'add' command - - -diff --git a/osslsigncode.c b/osslsigncode.c -index 3797458..4f4b897 100644 ---- a/osslsigncode.c -+++ b/osslsigncode.c -@@ -2447,7 +2447,7 @@ int main(int argc, char **argv) - } else if ((cmd == CMD_SIGN) && !strcmp(*argv, "-n")) { - if (--argc < 1) usage(argv0); - desc = *(++argv); -- } else if ((cmd == CMD_SIGN) && !strcmp(*argv, "-h")) { -+ } else if ((cmd == CMD_SIGN || cmd == CMD_ADD) && !strcmp(*argv, "-h")) { - if (--argc < 1) usage(argv0); - ++argv; - if (!strcmp(*argv, "md5")) { --- -2.26.0 ===================================== tools/signing/authenticode-timestamping.sh ===================================== @@ -35,7 +35,7 @@ set -e script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" -osslsigncode_file="$script_dir/../../out/osslsigncode/osslsigncode-e72a1937d1a1-25066d.tar.gz" +osslsigncode_file="$script_dir/../../out/osslsigncode/osslsigncode-d6f94d71f731-3a61fb.tar.gz" test -f "$osslsigncode_file" || exit_error "$osslsigncode_file is missing." \ ===================================== tools/signing/do-all-signing ===================================== @@ -17,9 +17,9 @@ echo test -f "$steps_dir/linux-signer-signmars.done" || read -sp "Enter nssdb7 (mar signing) passphrase: " NSSPASS echo -#test -f "$steps_dir/linux-signer-authenticode-signing.done" || -# read -sp "Enter windows authenticode (yubihsm) passphrase: " YUBIPASS -#echo +test -f "$steps_dir/linux-signer-authenticode-signing.done" || + read -sp "Enter windows authenticode passphrase: " YUBIPASS +echo test -f "$steps_dir/linux-signer-gpg-sign.done" || read -sp "Enter gpg passphrase: " GPG_PASS echo @@ -193,10 +193,10 @@ do_step dmg2mar do_step sync-scripts-to-linux-signer do_step linux-signer-signmars do_step sync-after-signmars -#do_step linux-signer-authenticode-signing -#do_step sync-after-authenticode-signing -#do_step authenticode-timestamping -#do_step sync-after-authenticode-timestamping +do_step linux-signer-authenticode-signing +do_step sync-after-authenticode-signing +do_step authenticode-timestamping +do_step sync-after-authenticode-timestamping do_step hash_signed_bundles do_step sync-after-hash do_step linux-signer-gpg-sign View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0