Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: efdc0f34 by Pier Angelo Vendrame at 2025-03-26T12:21:51+01:00 Bug 41407: Use Lyrebird for the Snowflake transport. - - - - - 912bbd1d by Pier Angelo Vendrame at 2025-03-26T12:21:52+01:00 Bug 41410: Use the Lyrebird name on Android. We were still using the libObfs4proxy.so name for compatibility with the legacy Tor integration. However, this was deleted some time ago, so we can switch to the Lyrebird name. - - - - - 8 changed files: - − projects/browser/Bundle-Data/Docs-TBB/Licenses/PluggableTransports/LICENSE.SNOWFLAKE - projects/browser/build - − projects/snowflake/README.md - − projects/snowflake/build - − projects/snowflake/config - projects/tor-expert-bundle/build - projects/tor-expert-bundle/config - projects/tor-expert-bundle/pt_config.json Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/Licenses/PluggableTransports/LICENSE.SNOWFLAKE deleted ===================================== @@ -1,32 +0,0 @@ - This file contains the license for "Snowflake" - a free software project which provides a WebRTC pluggable transport. - -================================================================================ -Copyright (c) 2016, Serene Han, Arlo Breault -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - - * Neither the names of the copyright owners nor the names of its -contributors may be used to endorse or promote products derived from this -software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -================================================================================ ===================================== projects/browser/build ===================================== @@ -108,9 +108,7 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b [% END -%] # Move READMEs from tor-expert-bundle to the doc dir - mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %] mkdir -p "$TBDIR/$DOCSPATH/conjure" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/conjure"[% END %] - mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md" mv_tbdir tor/pluggable_transports/README.CONJURE.md "$DOCSPATH/conjure/README.md" # Move the PTs to where TB expects them ===================================== projects/snowflake/README.md deleted ===================================== @@ -1,7 +0,0 @@ -This is the Snowflake pluggable transport. - -# Vendored dependencies - -Snowflake is written in Go, and we version the expected hash of the vendored -dependencies. Please refer to `doc/how-to-update-go-dependencies.txt` for -further information on how we manage dependencies of Go projects. ===================================== projects/snowflake/build deleted ===================================== @@ -1,31 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] -distdir=/var/tmp/dist/[% project %] -mkdir -p $distdir - -[% IF c("var/android") -%] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - # We need to explicitly set CGO_ENABLED with Go 1.13.x as the Android build - # breaks otherwise. - export CGO_ENABLED=1 -[% END -%] - -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] -cd /var/tmp/build/[% project %]-[% c('version') %] - -tar -xf $rootdir/[% c('input_files_by_name/go_vendor') %] - -cd client -go build -ldflags '-s[% IF c("var/android") %] -checklinkname=0[% END %]' -tags 'nopshufb,noasm,packetioSizeHardlimit,purego,safe,appengine,disableunsafe' -cp -a client[% IF c("var/windows") %].exe[% END %] $distdir/snowflake-client[% IF c("var/windows") %].exe[% END %] - -cd .. -cp -a README.md $distdir/README.SNOWFLAKE.md - -cd $distdir -[% c('tar', { - tar_src => [ '.' ], - tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'), - }) %] ===================================== projects/snowflake/config deleted ===================================== @@ -1,38 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '2.11.0' -git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowf... -git_hash: 'v[% c("version") %]' -gpg_keyring: anti-censorship.gpg -tag_gpg_id: 1 - -container: - use_container: 1 - -var: - go_vendor_sha256sum: 4c21a75c2fd0997a13fc5bb99991ff2c7149fb2342b857b06c70a18c4cb2ac89 - -targets: - nightly: - git_hash: main - version: '[% c("abbrev") %]' - tag_gpg_id: 0 - var: - go_vendor_sha256sum: '' - -steps: - build: - filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' - input_files: - - project: container-image - - name: go - project: go - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/android") %]' - - name: go_vendor - pkg_type: go_vendor - project: snowflake - norec: - sha256sum: '[% c("var/go_vendor_sha256sum") %]' - target_replace: - '^torbrowser-(?!testbuild).*': 'torbrowser-linux-x86_64' ===================================== projects/tor-expert-bundle/build ===================================== @@ -14,7 +14,6 @@ cd tor mkdir pluggable_transports && cd pluggable_transports tar -xkf $rootdir/[% c('input_files_by_name/lyrebird') %] -tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %] [% IF c('input_files_by_name/conjure') -%] tar -xkf $rootdir/[% c('input_files_by_name/conjure') %] [% END -%] @@ -35,8 +34,7 @@ cd $distdir mkdir -p aar/assets/common cp -a tor/libTor.so aar/jni/$abi/ - cp -a tor/pluggable_transports/lyrebird aar/jni/$abi/libObfs4proxy.so - cp -a tor/pluggable_transports/snowflake-client aar/jni/$abi/libSnowflake.so + cp -a tor/pluggable_transports/lyrebird aar/jni/$abi/libLyrebird.so [% IF c('input_files_by_name/conjure') -%] cp -a tor/pluggable_transports/conjure-client aar/jni/$abi/libConjure.so [% END -%] ===================================== projects/tor-expert-bundle/config ===================================== @@ -16,8 +16,6 @@ input_files: project: tor - name: lyrebird project: lyrebird - - name: snowflake - project: snowflake - name: conjure project: conjure enable: '[% !c("var/android-x86") && !c("var/android-x86_64") %]' ===================================== projects/tor-expert-bundle/pt_config.json ===================================== @@ -1,8 +1,7 @@ { "recommendedDefault" : "obfs4", "pluggableTransports" : { - "lyrebird" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit,webtunnel exec ${pt_path}lyrebird${pt_extension}", - "snowflake" : "ClientTransportPlugin snowflake exec ${pt_path}snowflake-client${pt_extension}", + "lyrebird" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit,snowflake,webtunnel exec ${pt_path}lyrebird${pt_extension}", "conjure" : "ClientTransportPlugin conjure exec ${pt_path}conjure-client${pt_extension} -registerURL https://registration.refraction.network/api" }, "bridges" : { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/a... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/a... You're receiving this email because of your account on gitlab.torproject.org.