- tor-commits - lists.torproject.org

[tor/main] Merge remote-tracking branch 'tor-gitlab/mr/497' into main
by ahf＠torproject.org 15 Dec '21

15 Dec '21

commit 95b82c4feede91e18ec24dafeb382208186a9791 Merge: 39848ca166 86819229af Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Dec 15 12:38:30 2021 +0000 Merge remote-tracking branch 'tor-gitlab/mr/497' into main changes/bug40472 | 6 ++++++ src/feature/dircommon/consdiff.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/main] Correct typo in scripts/README file
by ahf＠torproject.org 15 Dec '21

15 Dec '21

commit 39848ca1669b25135d484aa23cfbb0a796dc0e63 Author: skaluzka <skaluzka(a)protonmail.com> Date: Tue Dec 14 23:14:02 2021 +0100 Correct typo in scripts/README file Signed-off-by: skaluzka <skaluzka(a)protonmail.com> --- scripts/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/README b/scripts/README index 7de0d003e4..4cb49370f5 100644 --- a/scripts/README +++ b/scripts/README @@ -12,7 +12,7 @@ never used. maint/checkOptionDocs.pl -- Make sure that Tor options are documented in the manpage, and that the manpage only documents real Tor options. -maint/checkSpaces.pl -- Style checker for the Tor source code. Mainly checks +maint/checkSpace.pl -- Style checker for the Tor source code. Mainly checks whitespace. maint/findMergedChanges.pl -- Find a set of changes/* files that have been

1 0

[translation/support-portal] new translations in support-portal
by translation＠torproject.org 15 Dec '21

15 Dec '21

commit e09e463944fe930f0f4261617cd6db58c886e767 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 15 09:18:04 2021 +0000 new translations in support-portal --- contents+ru.po | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contents+ru.po b/contents+ru.po index 02bc6c5bd7..8393fa22d7 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -3103,11 +3103,16 @@ msgid "" "possible to associate non anonymous and anonymous traffic at a given exit " "node, so be careful about what applications you run concurrently over Tor." msgstr "" +"Более того, можно связать анонимный трафик из выходного узла c тем же " +"трафиком на сайт, на котором выполнен вход. Поэтому что Tor использует одно " +"TCP-соединение одновременно для нескольких приложений. Поэтому будьте " +"внимательны, какие приложения вы запускаете через Tor." #: https//support.torproject.org/about/attacks-on-onion-routing/ #: (content/about/attacks-on-onion-routing/contents+en.lrquestion.description) msgid "Perhaps even run separate Tor clients for these applications." msgstr "" +"Как одно из решений: запускайте разные клиенты Tor для разных приложений." #: https//support.torproject.org/about/backdoor/ #: (content/about/backdoor/contents+en.lrquestion.title) @@ -3288,7 +3293,7 @@ msgstr "" #: https//support.torproject.org/about/change-paths/ #: (content/about/change-paths/contents+en.lrquestion.title) msgid "How often does Tor change its paths?" -msgstr "" +msgstr "Как часто Tor меняет используемые узлы?" #: https//support.torproject.org/about/change-paths/ #: (content/about/change-paths/contents+en.lrquestion.description) @@ -3296,11 +3301,13 @@ msgid "" "Tor will reuse the same circuit for new TCP streams for 10 minutes, as long " "as the circuit is working fine." msgstr "" +"Tor меняет узлы каждые 10 минут, если это соединение работает без сбоев." #: https//support.torproject.org/about/change-paths/ #: (content/about/change-paths/contents+en.lrquestion.description) msgid "(If the circuit fails, Tor will switch to a new circuit immediately.)" msgstr "" +"(если эти узлы перестают работать, Tor сразу же подключается к другим узлам)" #: https//support.torproject.org/about/change-paths/ #: (content/about/change-paths/contents+en.lrquestion.description)

1 0

[snowflake/main] Update version of DTLS library
by cohosh＠torproject.org 14 Dec '21

14 Dec '21

commit 738bd464eac631dd296ebf932f0a98f9bb9868e3 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Dec 10 10:29:47 2021 -0500 Update version of DTLS library Make sure we use a version of the DTLS library that contains the following fingerprinting fixes: Only send supported_groups extension in ClientHello Do not include IP addresses as SNI values These changes have been merged upstream into pion/dtls. --- go.mod | 7 ++++--- go.sum | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1efb5a5..5538110 100644 --- a/go.mod +++ b/go.mod @@ -17,8 +17,9 @@ require ( github.com/xtaci/kcp-go/v5 v5.6.1 github.com/xtaci/smux v1.5.15 gitlab.torproject.org/tpo/anti-censorship/geoip v0.0.0-20210928150955-7ce4b3d98d01 - golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670 - golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 - golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e // indirect + golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 + golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c google.golang.org/protobuf v1.23.0 ) + +replace github.com/pion/dtls/v2 => github.com/pion/dtls/v2 v2.0.12 diff --git a/go.sum b/go.sum index c229b37..ecf91a3 100644 --- a/go.sum +++ b/go.sum @@ -226,6 +226,8 @@ github.com/pion/datachannel v1.4.21/go.mod h1:oiNyP4gHx2DIwRzX/MFyH0Rz/Gz05OgBla github.com/pion/dtls/v2 v2.0.4/go.mod h1:qAkFscX0ZHoI1E07RfYPoRw3manThveu+mlTDdOxoGI= github.com/pion/dtls/v2 v2.0.8 h1:reGe8rNIMfO/UAeFLqO61tl64t154Qfkr4U3Gzu1tsg= github.com/pion/dtls/v2 v2.0.8/go.mod h1:QuDII+8FVvk9Dp5t5vYIMTo7hh7uBkra+8QIm7QGm10= +github.com/pion/dtls/v2 v2.0.12 h1:QMSvNht7FM/XDXij3Ic90SCbl5yL7kppeI4ghfF4in8= +github.com/pion/dtls/v2 v2.0.12/go.mod h1:5Pe3QJI0Ajsx+uCfxREeewGFlKYBzLrXe9ku7Y0oRXM= github.com/pion/ice/v2 v2.0.15 h1:KZrwa2ciL9od8+TUVJiYTNsCW9J5lktBjGwW1MacEnQ= github.com/pion/ice/v2 v2.0.15/go.mod h1:ZIiVGevpgAxF/cXiIVmuIUtCb3Xs4gCzCbXB6+nFkSI= github.com/pion/interceptor v0.0.10 h1:dXFyFWRJFwmzQqyn0U8dUAbOJu+JJnMVAqxmvTu30B4= @@ -260,6 +262,8 @@ github.com/pion/turn/v2 v2.0.5 h1:iwMHqDfPEDEOFzwWKT56eFmh6DYC6o/+xnLAEzgISbA= github.com/pion/turn/v2 v2.0.5/go.mod h1:APg43CFyt/14Uy7heYUOGWdkem/Wu4PhCO/bjyrTqMw= github.com/pion/udp v0.1.0 h1:uGxQsNyrqG3GLINv36Ff60covYmfrLoxzwnCsIYspXI= github.com/pion/udp v0.1.0/go.mod h1:BPELIjbwE9PRbd/zxI/KYBnbo7B6+oA6YuEaNE8lths= +github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= +github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= github.com/pion/webrtc/v3 v3.0.15 h1:g8MMJohjQoj0+pTrU329tWM6dvCieNTgnjtqv1kmEdY= github.com/pion/webrtc/v3 v3.0.15/go.mod h1:uUt2nRSsCnK/nfzTAfOmaeLan26ZJ0aP9iwjc/gcC2Y= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -376,6 +380,8 @@ golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670 h1:gzMM0EjIYiRmJI3+jBdFuoynZlpxa2JQZsolKu09BXo= golang.org/x/crypto v0.0.0-20210317152858-513c2a44f670/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 h1:/pEO3GD/ABYAjuakUS6xSEmmlyVS4kxBNkeA9tLJiTI= +golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -415,6 +421,9 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 h1:b0LrWgu8+q7z4J+0Y3Umo5q1dL7NXBkKBWkaVkAq17E= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c h1:WtYZ93XtWSO5KlOMgPZu7hXY9WhMZpprvlm5VwvAl8c= +golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -457,12 +466,17 @@ golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e h1:XNp2Flc/1eWQGk5BLzqTAN7fQIwIbfyVTuVxXxZh73M= golang.org/x/sys v0.0.0-20210317225723-c4fcb01b228e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

1 0

[snowflake/main] Update go versions in CI tests
by cohosh＠torproject.org 14 Dec '21

14 Dec '21

commit 9c11e479d0d6fdcad47c9f3d55179dd907422a3a Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Dec 10 10:43:31 2021 -0500 Update go versions in CI tests Debian packages Go 1.15 and 1.17, and we use 1.16 in Tor Browser. --- .gitlab-ci.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0824267..5ec32fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -139,15 +139,22 @@ android: - go get golang.org/x/mobile/bind - gomobile bind -v -target=android $REPRODUCIBLE_FLAGS . -go-1.13: - image: golang:1.13-stretch +go-1.15: + image: golang:1.15-stretch <<: *golang-docker-debian-template <<: *test-template script: - *go-test -go-1.14: - image: golang:1.14-stretch +go-1.16: + image: golang:1.16-stretch + <<: *golang-docker-debian-template + <<: *test-template + script: + - *go-test + +go-1.17: + image: golang:1.17-stretch <<: *golang-docker-debian-template <<: *test-template script:

1 0

[tor-browser-build/master] Bug 40395: Update node to 12.22.1
by gk＠torproject.org 14 Dec '21

14 Dec '21

commit a0d781d425cd8ff06e6bc10e0320cec06438c6df Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 10 14:37:42 2021 +0100 Bug 40395: Update node to 12.22.1 --- projects/node/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/node/config b/projects/node/config index 041e5d9..300e59c 100644 --- a/projects/node/config +++ b/projects/node/config @@ -2,8 +2,8 @@ version: '[% c("var/node_version") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: - node_version: 10.23.1 - node_hash: 88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa + node_version: 12.22.1 + node_hash: dd650df7773a6ed3e390320ba51ef33cba6499f0e9397709ea3d1debdcbcb989 container: use_container: 1

1 0

[tor-browser-build/master] Bug 40395: Update how we check node version in list_toolchain_updates_checks
by gk＠torproject.org 14 Dec '21

14 Dec '21

commit f1f4381aaceb2c2c59097bd305ad0307a3dd84f7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 10 12:42:01 2021 +0100 Bug 40395: Update how we check node version in list_toolchain_updates_checks --- projects/firefox/list_toolchain_updates_checks | 28 ++++++++++++++++++++---- projects/geckoview/list_toolchain_updates_checks | 28 ++++++++++++++++++++---- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/projects/firefox/list_toolchain_updates_checks b/projects/firefox/list_toolchain_updates_checks index a308468..26ee3a0 100644 --- a/projects/firefox/list_toolchain_updates_checks +++ b/projects/firefox/list_toolchain_updates_checks @@ -89,12 +89,32 @@ check_update_needed clang "$needed" "$current" # node read -d '' p << 'EOF' || true -if (m/^\\s*NODE_MIN_VERSION\\s*=\\s*StrictVersion\$"([^"]+)"\$/) { - print $1; - exit; +sub l { + ref $_[0] eq 'ARRAY' ? $_[0] : [ $_[0] ]; } + +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/node.yml'); +my $node_toolchain; +T: foreach my $t (keys %$d) { + foreach my $alias (@{l($d->{$t}{run}{'toolchain-alias'})}) { + if ($alias eq 'linux64-node') { + foreach my $fetch (@{$d->{$t}{fetches}{fetch}}) { + if ($fetch =~ m/^nodejs-.*/) { + $node_toolchain = $fetch; + last T; + } + } + } + } +} + +exit 1 unless $node_toolchain; + +my $fetch = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +my ($version) = $fetch->{$node_toolchain}{fetch}{url} =~ m|^https://nodejs.org/dist/v([^/]+)/|; +print "$version\\n"; EOF -needed=$(cat python/mozbuild/mozbuild/nodeutil.py | perl -ne "$p") +needed=$(perl -MYAML::XS -e "$p") current='[% pc("node", "version") %]' check_update_needed node "$needed" "$current" diff --git a/projects/geckoview/list_toolchain_updates_checks b/projects/geckoview/list_toolchain_updates_checks index f31fa51..fef9756 100644 --- a/projects/geckoview/list_toolchain_updates_checks +++ b/projects/geckoview/list_toolchain_updates_checks @@ -180,12 +180,32 @@ check_update_needed clang "$needed" "$current" # node read -d '' p << 'EOF' || true -if (m/^\\s*NODE_MIN_VERSION\\s*=\\s*StrictVersion\$"([^"]+)"\$/) { - print $1; - exit; +sub l { + ref $_[0] eq 'ARRAY' ? $_[0] : [ $_[0] ]; } + +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/node.yml'); +my $node_toolchain; +T: foreach my $t (keys %$d) { + foreach my $alias (@{l($d->{$t}{run}{'toolchain-alias'})}) { + if ($alias eq 'linux64-node') { + foreach my $fetch (@{$d->{$t}{fetches}{fetch}}) { + if ($fetch =~ m/^nodejs-.*/) { + $node_toolchain = $fetch; + last T; + } + } + } + } +} + +exit 1 unless $node_toolchain; + +my $fetch = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +my ($version) = $fetch->{$node_toolchain}{fetch}{url} =~ m|^https://nodejs.org/dist/v([^/]+)/|; +print "$version\\n"; EOF -needed=$(cat python/mozbuild/mozbuild/nodeutil.py | perl -ne "$p") +needed=$(perl -MYAML::XS -e "$p") current='[% pc("node", "version") %]' check_update_needed node "$needed" "$current"

1 0

[torspec/main] Clarify how we derive ed25519 for cross-certification.
by dgoulet＠torproject.org 14 Dec '21

14 Dec '21

commit 57d1e7d163910781b8b08dbbaa397c1d7c06abb7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 8 11:25:09 2021 -0500 Clarify how we derive ed25519 for cross-certification. The descriptor format uses a curve25519->ed25519 conversion algorithm to cross-certify descriptors with their ntor onion keys. This patch clarifies two aspects of the algorithm: 1. When deriving a private key, how to derive the part of the private key that _isn't_ a point on the curve. 2. That there are two algorithms here, one for private->private and one for public->public. --- dir-spec.txt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 543e341..0eb174a 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -4162,10 +4162,20 @@ C. Converting a curve25519 public key to an ed25519 public key [Recomputing the sign bit from the private key every time sounds rather strange and inefficient to me… —isis] - Alternatively, without access to the corresponding ed25519 private - key, one may use the Montgomery u-coordinate to recover the - Montgomery v-coordinate by computing the right-hand side of the - Montgomery curve equation: + Note that in addition to its coordinates, an expanded Ed25519 private key + also has a 32-byte random value, "prefix", used to compute internal `r` + values in the signature. For security, this prefix value should be + derived deterministically from the curve25519 key. The Tor + implementation derives it as SHA512(private_key | STR)[0..32], where + STR is the nul-terminated string: + + "Derive high part of ed25519 key from curve25519 key\0" + + + On the client side, where there is no access to the curve25519 private + keys, one may use the curve25519 public key's Montgomery u-coordinate to + recover the Montgomery v-coordinate by computing the right-hand side of + the Montgomery curve equation: bv^2 = u(u^2 + au +1)

1 0

[torspec/main] Merge branch 'tor-gitlab/mr/55'
by dgoulet＠torproject.org 14 Dec '21

14 Dec '21

commit ab4a8d4433ba03de4189b438f8b3fb3ba3c8d985 Merge: 485abc9 57d1e7d Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Dec 14 12:58:40 2021 -0500 Merge branch 'tor-gitlab/mr/55' dir-spec.txt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)

1 0

[tor-browser/tor-browser-91.4.0esr-11.5-1] Bug 1745715 - Process app-bundled fonts before system fonts when initializing the font list, to ensure their families get the expected Base visibility level. r=emilio
by gk＠torproject.org 14 Dec '21

14 Dec '21

commit 6ebf4b5c74896f0d30c061d6c61e98586ff2ca79 Author: Jonathan Kew <jkew(a)mozilla.com> Date: Mon Dec 13 20:09:36 2021 +0000 Bug 1745715 - Process app-bundled fonts before system fonts when initializing the font list, to ensure their families get the expected Base visibility level. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D133667 --- gfx/thebes/gfxFcPlatformFontList.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gfx/thebes/gfxFcPlatformFontList.cpp b/gfx/thebes/gfxFcPlatformFontList.cpp index 41a305c537c4..3b6029bd4353 100644 --- a/gfx/thebes/gfxFcPlatformFontList.cpp +++ b/gfx/thebes/gfxFcPlatformFontList.cpp @@ -1524,17 +1524,21 @@ nsresult gfxFcPlatformFontList::InitFontListForPlatform() { } #endif - // iterate over available fonts - FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem); - AddFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false); - #ifdef MOZ_BUNDLED_FONTS + // https://bugzilla.mozilla.org/show_bug.cgi?id=1745715: + // It's important to do this *before* processing the standard system fonts, + // so that if a family is present in both font sets, we'll treat it as app- + // bundled and therefore always visible. if (StaticPrefs::gfx_bundled_fonts_activate_AtStartup() != 0) { FcFontSet* appFonts = FcConfigGetFonts(nullptr, FcSetApplication); AddFontSetFamilies(appFonts, policy.get(), /* aAppFonts = */ true); } #endif + // iterate over available fonts + FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem); + AddFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false); + return NS_OK; }

1 0