- tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] 5 commits: dropme! Bug 13379: Sign our MAR files.
by Pier Angelo Vendrame (＠pierov) 20 Jan '23

20 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: a85b5b96 by Pier Angelo Vendrame at 2023-01-20T16:44:33+01:00 dropme! Bug 13379: Sign our MAR files. Part of 41584. This commit makes sure we're not messing stuff when rebasing. - - - - - 541d508c by Pier Angelo Vendrame at 2023-01-20T16:44:40+01:00 Revert "TB3: Tor Browser's official .mozconfigs." Part of 41584. This reverts commit b721a1e22730fd407aa10e5b3d519345856b18f5. - - - - - d967a1fd by Pier Angelo Vendrame at 2023-01-20T16:44:46+01:00 squash! Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - ec2caef7 by Mike Perry at 2023-01-20T16:44:46+01:00 TB3: Tor Browser's official .mozconfigs. Also: Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Add --enable-tor-browser-update build option Bug 40793: moved Tor configuration options from old-configure.in to moz.configure Bug 41584: Move some configuration options to base-browser level - - - - - 03866122 by Pier Angelo Vendrame at 2023-01-20T17:29:13+01:00 fixup! Bug 13379: Sign our MAR files. Part of 41584. This reverts commit 541d508cf5ff118d6438ee9f264a4e1f93cb7a6b - - - - - 6 changed files: - browser/moz.configure - mobile/android/torbrowser.configure → mobile/android/basebrowser.configure - mobile/android/confvars.sh - mobile/android/moz.configure - security/moz.build - security/nss/lib/ssl/Makefile Changes: ===================================== browser/moz.configure ===================================== @@ -5,10 +5,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. imply_option("MOZ_PLACES", True) +# tor-browser#32493 imply_option("MOZ_SERVICES_HEALTHREPORT", False) imply_option("MOZ_SERVICES_SYNC", True) imply_option("MOZ_DEDICATED_PROFILES", False) imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", False) +# tor-browser#33734 imply_option("MOZ_NORMANDY", False) with only_when(target_is_linux & compile_environment): ===================================== mobile/android/torbrowser.configure → mobile/android/basebrowser.configure ===================================== @@ -4,7 +4,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# Set Tor Browser default config +# Set Base Browser default config +# See tor-browser#25741 and tor-browser#41584. imply_option("MOZ_ANDROID_EXCLUDE_FONTS", False) @@ -14,7 +15,7 @@ imply_option("MOZ_ANDROID_EXCLUDE_FONTS", False) # imply_option("MOZ_CRASHREPORTER", False) # Disable uploading information about the browser configuration and -# performance to an external server +# performance to an external server. See tor-browser#32493. imply_option("MOZ_SERVICES_HEALTHREPORT", False) # Disable creating telemetry and data reports that are uploaded to an @@ -26,5 +27,7 @@ imply_option("MOZ_SERVICES_HEALTHREPORT", False) # imply_option("MOZ_TELEMETRY_REPORTING", False) # imply_option("MOZ_DATA_REPORTING", False) +# tor-browser#24796: This controls some permissions in GeckoView's +# AndroidManifest.xml imply_option("MOZ_ANDROID_NETWORK_STATE", False) imply_option("MOZ_ANDROID_LOCATION", False) ===================================== mobile/android/confvars.sh ===================================== @@ -16,8 +16,6 @@ MOZ_RAW=1 MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110} -### Tor Browser for Android ### - # Disable telemetry at compile-time unset MOZ_TELEMETRY_REPORTING ===================================== mobile/android/moz.configure ===================================== @@ -10,6 +10,7 @@ project_flag( default=True, ) +# tor-browser#29859 project_flag( "MOZ_ANDROID_HLS_SUPPORT", help="Enable HLS (HTTP Live Streaming) support (currently using the ExoPlayer library)", @@ -58,7 +59,7 @@ option( set_config("MOZ_ANDROID_GECKOVIEW_LITE", True, when="--enable-geckoview-lite") imply_option("MOZ_NORMANDY", False) -# Comment this so we can imply |False| in torbrowser.configure +# Comment this so we can imply |False| in basebrowser.configure # The Build system doesn't allow multiple imply_option() # calls with the same key. # imply_option("MOZ_SERVICES_HEALTHREPORT", True) @@ -80,7 +81,7 @@ def check_target(target): ) -include("torbrowser.configure") +include("basebrowser.configure") include("../../toolkit/moz.configure") include("../../build/moz.configure/android-sdk.configure") ===================================== security/moz.build ===================================== @@ -85,6 +85,7 @@ gyp_vars["nss_dist_obj_dir"] = "$PRODUCT_DIR/dist/bin" gyp_vars["disable_tests"] = 1 gyp_vars["disable_dbm"] = 1 gyp_vars["disable_libpkix"] = 1 +# tor-browser#18885, tor-browser#21849 gyp_vars["enable_sslkeylogfile"] = 0 # pkg-config won't reliably find zlib on our builders, so just force it. # System zlib is only used for modutil and signtool unless ===================================== security/nss/lib/ssl/Makefile ===================================== @@ -41,6 +41,7 @@ endif # Enable key logging by default in debug builds, but not opt builds. # Logging still needs to be enabled at runtime through env vars. +# tor-browser#18885, tor-browser#21849 NSS_ALLOW_SSLKEYLOGFILE ?= 0 ifeq (1,$(NSS_ALLOW_SSLKEYLOGFILE)) DEFINES += -DNSS_ALLOW_SSLKEYLOGFILE=1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6ebcf4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6ebcf4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] squash! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 20 Jan '23

20 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 5ad37bff by Pier Angelo Vendrame at 2023-01-20T16:41:46+01:00 squash! Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - 6 changed files: - browser/moz.configure - + mobile/android/basebrowser.configure - mobile/android/confvars.sh - mobile/android/moz.configure - security/moz.build - security/nss/lib/ssl/Makefile Changes: ===================================== browser/moz.configure ===================================== @@ -5,11 +5,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. imply_option("MOZ_PLACES", True) -imply_option("MOZ_SERVICES_HEALTHREPORT", True) +# tor-browser#32493 +imply_option("MOZ_SERVICES_HEALTHREPORT", False) imply_option("MOZ_SERVICES_SYNC", True) imply_option("MOZ_DEDICATED_PROFILES", True) imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True) -imply_option("MOZ_NORMANDY", True) +# tor-browser#33734 +imply_option("MOZ_NORMANDY", False) with only_when(target_is_linux & compile_environment): option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper") ===================================== mobile/android/basebrowser.configure ===================================== @@ -0,0 +1,33 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# Set Base Browser default config +# See tor-browser#25741 and tor-browser#41584. + +imply_option("MOZ_ANDROID_EXCLUDE_FONTS", False) + +# Disable uploading crash reports and dump files to an external server +# This is still configured in old-configure. Uncomment when this moves +# to the python config +# imply_option("MOZ_CRASHREPORTER", False) + +# Disable uploading information about the browser configuration and +# performance to an external server. See tor-browser#32493. +imply_option("MOZ_SERVICES_HEALTHREPORT", False) + +# Disable creating telemetry and data reports that are uploaded to an +# external server +# These aren't actually configure options. These are disabled in +# confvars.sh, but they look like configure options so we'll document +# them here, as well. +# XXX: no confvars.sh here +# imply_option("MOZ_TELEMETRY_REPORTING", False) +# imply_option("MOZ_DATA_REPORTING", False) + +# tor-browser#24796: This controls some permissions in GeckoView's +# AndroidManifest.xml +imply_option("MOZ_ANDROID_NETWORK_STATE", False) +imply_option("MOZ_ANDROID_LOCATION", False) ===================================== mobile/android/confvars.sh ===================================== @@ -15,3 +15,9 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official MOZ_RAW=1 MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110} + +# Disable telemetry at compile-time +unset MOZ_TELEMETRY_REPORTING + +# Disable data reporting at compile-time +unset MOZ_DATA_REPORTING ===================================== mobile/android/moz.configure ===================================== @@ -10,10 +10,11 @@ project_flag( default=True, ) +# tor-browser#29859 project_flag( "MOZ_ANDROID_HLS_SUPPORT", help="Enable HLS (HTTP Live Streaming) support (currently using the ExoPlayer library)", - default=True, + default=False, ) option( @@ -58,7 +59,10 @@ option( set_config("MOZ_ANDROID_GECKOVIEW_LITE", True, when="--enable-geckoview-lite") imply_option("MOZ_NORMANDY", False) -imply_option("MOZ_SERVICES_HEALTHREPORT", True) +# Comment this so we can imply |False| in basebrowser.configure +# The Build system doesn't allow multiple imply_option() +# calls with the same key. +# imply_option("MOZ_SERVICES_HEALTHREPORT", True) imply_option("MOZ_ANDROID_HISTORY", True) imply_option("--enable-small-chunk-size", True) @@ -77,6 +81,8 @@ def check_target(target): ) +include("basebrowser.configure") + include("../../toolkit/moz.configure") include("../../build/moz.configure/android-sdk.configure") include("../../build/moz.configure/java.configure") ===================================== security/moz.build ===================================== @@ -85,7 +85,8 @@ gyp_vars["nss_dist_obj_dir"] = "$PRODUCT_DIR/dist/bin" gyp_vars["disable_tests"] = 1 gyp_vars["disable_dbm"] = 1 gyp_vars["disable_libpkix"] = 1 -gyp_vars["enable_sslkeylogfile"] = 1 +# tor-browser#18885, tor-browser#21849 +gyp_vars["enable_sslkeylogfile"] = 0 # pkg-config won't reliably find zlib on our builders, so just force it. # System zlib is only used for modutil and signtool unless # SSL zlib is enabled, which we are disabling immediately below this. ===================================== security/nss/lib/ssl/Makefile ===================================== @@ -41,7 +41,8 @@ endif # Enable key logging by default in debug builds, but not opt builds. # Logging still needs to be enabled at runtime through env vars. -NSS_ALLOW_SSLKEYLOGFILE ?= $(if $(BUILD_OPT),0,1) +# tor-browser#18885, tor-browser#21849 +NSS_ALLOW_SSLKEYLOGFILE ?= 0 ifeq (1,$(NSS_ALLOW_SSLKEYLOGFILE)) DEFINES += -DNSS_ALLOW_SSLKEYLOGFILE=1 endif View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5ad37bf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5ad37bf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-android-service][main] Bug 41361: Add conjure support
by boklm (＠boklm) 20 Jan '23

20 Jan '23

boklm pushed to branch main at The Tor Project / Applications / tor-android-service Commits: 27924bc7 by Cecylia Bocovich at 2022-12-05T11:45:24-05:00 Bug 41361: Add conjure support - - - - - 1 changed file: - service/src/main/java/org/torproject/android/service/TorService.java Changes: ===================================== service/src/main/java/org/torproject/android/service/TorService.java ===================================== @@ -377,8 +377,10 @@ public final class TorService extends Service implements TorServiceConstants, Or if(!pluggableTransportObfs.canExecute()) pluggableTransportObfs.setExecutable(true); File pluggableTransportSnow = new File(nativeDir, "libSnowflake.so"); if(!pluggableTransportSnow.canExecute()) pluggableTransportSnow.setExecutable(true); + File pluggableTransportConjure = new File(nativeDir, "libConjure.so"); + if(!pluggableTransportConjure.canExecute()) pluggableTransportConjure.setExecutable(true); - builder.configurePluggableTransportsFromSettings(pluggableTransportObfs, pluggableTransportSnow); + builder.configurePluggableTransportsFromSettings(pluggableTransportObfs, pluggableTransportSnow, pluggableTransportConjure); mDataService.updateConfigBuilder(builder); onionProxyManager.getTorInstaller().updateTorConfigCustom (builder.asString()); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-android-service/-/commit… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-android-service/-/commit… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.0-1] fixup! Firefox preference overrides.
by Richard Pospesel (＠richard) 19 Jan '23

19 Jan '23

Richard Pospesel pushed to branch base-browser-102.7.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: caf2d28a by Dan Ballard at 2023-01-19T22:21:41+00:00 fixup! Firefox preference overrides. privacy-browser#17: disable do not track (cherry picked from commit f5d35ce628bac6b978420536321836294d9e3cf1) (cherry picked from commit 3d923dc21e52ca31705e26898330a5d5f659d999) - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -148,6 +148,7 @@ pref("browser.newtabpage.enabled", false); pref("browser.search.region", "US"); // The next two prefs disable GeoIP search lookups (#16254) pref("browser.search.geoip.url", ""); pref("browser.fixup.alternate.enabled", false); // Bug #16783: Prevent .onion fixups +pref("privacy.donottrackheader.enabled", false); // (privacy-browser#17) // Make sure there is no Tracking Protection active in Tor Browser, see: #17898. pref("privacy.trackingprotection.enabled", false); pref("privacy.trackingprotection.pbmode.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/caf2d28… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/caf2d28… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.0-1] fixup! Firefox preference overrides.
by Richard Pospesel (＠richard) 19 Jan '23

19 Jan '23

Richard Pospesel pushed to branch tor-browser-102.7.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 3d923dc2 by Dan Ballard at 2023-01-19T22:21:07+00:00 fixup! Firefox preference overrides. privacy-browser#17: disable do not track (cherry picked from commit f5d35ce628bac6b978420536321836294d9e3cf1) - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -148,6 +148,7 @@ pref("browser.newtabpage.enabled", false); pref("browser.search.region", "US"); // The next two prefs disable GeoIP search lookups (#16254) pref("browser.search.geoip.url", ""); pref("browser.fixup.alternate.enabled", false); // Bug #16783: Prevent .onion fixups +pref("privacy.donottrackheader.enabled", false); // (privacy-browser#17) // Make sure there is no Tracking Protection active in Tor Browser, see: #17898. pref("privacy.trackingprotection.enabled", false); pref("privacy.trackingprotection.pbmode.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3d923dc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3d923dc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor] branch main updated: compress_lzma: New enum values from liblzma 5.3.x
by gitolite role 19 Jan '23

19 Jan '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new 3d7e3af91e compress_lzma: New enum values from liblzma 5.3.x 3d7e3af91e is described below commit 3d7e3af91e9f0962a43d865132e6250423ee3918 Author: Micah Elizabeth Scott <beth(a)torproject.org> AuthorDate: Wed Jan 18 14:14:47 2023 -0800 compress_lzma: New enum values from liblzma 5.3.x Add new liblzma enums (LZMA_SEEK_NEEDED and LZMA_RET_INTERNAL*) conditional to the API version they arrived in. The first stable version of liblzma this affects is 5.4.0 Fixes #40741 Signed-off-by: Micah Elizabeth Scott <beth(a)torproject.org> --- changes/ticket40741 | 2 ++ src/lib/compress/compress_lzma.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/changes/ticket40741 b/changes/ticket40741 new file mode 100644 index 0000000000..2a9f72489d --- /dev/null +++ b/changes/ticket40741 @@ -0,0 +1,2 @@ + o Minor feature (lzma): + - Fix compiler warnings for liblzma >= 5.3.1. Closes ticket 40741. diff --git a/src/lib/compress/compress_lzma.c b/src/lib/compress/compress_lzma.c index 7e5c1a2883..6ae8fd8109 100644 --- a/src/lib/compress/compress_lzma.c +++ b/src/lib/compress/compress_lzma.c @@ -73,6 +73,23 @@ lzma_error_str(lzma_ret error) return "Unable to progress"; case LZMA_PROG_ERROR: return "Programming error"; +#if LZMA_VERSION >= 50030010 + case LZMA_SEEK_NEEDED: + // This can be returned by the .xz file_info decoder but with + // lzma_alone_decoder/encoder as we use, it should never be seen. + return "Seek needed"; +#endif +#if LZMA_VERSION >= 50030020 + case LZMA_RET_INTERNAL1: + case LZMA_RET_INTERNAL2: + case LZMA_RET_INTERNAL3: + case LZMA_RET_INTERNAL4: + case LZMA_RET_INTERNAL5: + case LZMA_RET_INTERNAL6: + case LZMA_RET_INTERNAL7: + case LZMA_RET_INTERNAL8: + FALLTHROUGH; +#endif default: return "Unknown LZMA error"; } @@ -306,6 +323,19 @@ tor_lzma_compress_process(tor_lzma_compress_state_t *state, case LZMA_OPTIONS_ERROR: case LZMA_DATA_ERROR: case LZMA_PROG_ERROR: +#if LZMA_VERSION >= 50030010 + case LZMA_SEEK_NEEDED: +#endif +#if LZMA_VERSION >= 50030020 + case LZMA_RET_INTERNAL1: + case LZMA_RET_INTERNAL2: + case LZMA_RET_INTERNAL3: + case LZMA_RET_INTERNAL4: + case LZMA_RET_INTERNAL5: + case LZMA_RET_INTERNAL6: + case LZMA_RET_INTERNAL7: + case LZMA_RET_INTERNAL8: +#endif default: log_warn(LD_GENERAL, "LZMA %s didn't finish: %s.", state->compress ? "compression" : "decompression", -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated: Add more test-vectors for key blinding.
by gitolite role 19 Jan '23

19 Jan '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new ee153db5a1 Add more test-vectors for key blinding. ee153db5a1 is described below commit ee153db5a17e2825077a255c4e3bb345f2351806 Author: Nick Mathewson <nickm(a)torproject.org> AuthorDate: Thu Jan 19 12:23:47 2023 -0500 Add more test-vectors for key blinding. These are verified-as-correct against the current C implementation; adding them here gives us something to copy into Arti. --- src/feature/hs/hs_common.c | 2 +- src/feature/hs/hs_common.h | 7 ++++++ src/test/test_hs_common.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c index e326581dd1..6547372161 100644 --- a/src/feature/hs/hs_common.c +++ b/src/feature/hs/hs_common.c @@ -432,7 +432,7 @@ get_second_cached_disaster_srv(void) * thus will be ignored for the param construction. * * The result is put in param_out. */ -static void +STATIC void build_blinded_key_param(const ed25519_public_key_t *pubkey, const uint8_t *secret, size_t secret_len, uint64_t period_num, uint64_t period_length, diff --git a/src/feature/hs/hs_common.h b/src/feature/hs/hs_common.h index a7a8f23a3c..48c112110c 100644 --- a/src/feature/hs/hs_common.h +++ b/src/feature/hs/hs_common.h @@ -256,7 +256,14 @@ link_specifier_t *link_specifier_dup(const link_specifier_t *src); #ifdef HS_COMMON_PRIVATE +struct ed25519_public_key_t; + STATIC void get_disaster_srv(uint64_t time_period_num, uint8_t *srv_out); +STATIC void build_blinded_key_param( + const struct ed25519_public_key_t *pubkey, + const uint8_t *secret, size_t secret_len, + uint64_t period_num, uint64_t period_length, + uint8_t *param_out); /** The period for which a hidden service directory cannot be queried for * the same descriptor ID again. */ diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 347a5b7174..e58945a8c3 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -1509,6 +1509,61 @@ test_reachability(void *arg) } } +static void +test_blinding_basics(void *arg) +{ + (void)arg; + char *mem_op_hex_tmp = NULL; + uint64_t time_period = 1234; + ed25519_keypair_t keypair; + const char pubkey_hex[] = + "833990B085C1A688C1D4C8B1F6B56AFAF5A2ECA674449E1D704F83765CCB7BC6"; + const char seckey_hex[] = + "D8C7FF0E31295B66540D789AF3E3DF992038A9592EEA01D8B7CBA06D6E66D159" + "4D6167696320576F7264733A20737065697373636F62616C742062697669756D"; + base16_decode((char*)keypair.pubkey.pubkey, sizeof(keypair.pubkey.pubkey), + pubkey_hex, strlen(pubkey_hex)); + base16_decode((char*)keypair.seckey.seckey, sizeof(keypair.seckey.seckey), + seckey_hex, strlen(seckey_hex)); + + uint64_t period_len = get_time_period_length(); + tt_u64_op(period_len, OP_EQ, 1440); + uint8_t params[32]; + build_blinded_key_param(&keypair.pubkey, NULL, 0, + time_period, 1440, + params); + test_memeq_hex(params, + "379E50DB31FEE6775ABD0AF6FB7C371E" + "060308F4F847DB09FE4CFE13AF602287"); + + ed25519_public_key_t blinded_public; + hs_build_blinded_pubkey(&keypair.pubkey, NULL, 0, time_period, + &blinded_public); + hs_subcredential_t subcred; + hs_get_subcredential(&keypair.pubkey, &blinded_public, &subcred); + + test_memeq_hex(blinded_public.pubkey, + "3A50BF210E8F9EE955AE0014F7A6917F" + "B65EBF098A86305ABB508D1A7291B6D5"); + test_memeq_hex(subcred.subcred, + "635D55907816E8D76398A675A50B1C2F" + "3E36B42A5CA77BA3A0441285161AE07D"); + + ed25519_keypair_t blinded_keypair; + hs_build_blinded_keypair(&keypair, NULL, 0, time_period, + &blinded_keypair); + tt_mem_op(blinded_public.pubkey, OP_EQ, blinded_keypair.pubkey.pubkey, + ED25519_PUBKEY_LEN); + test_memeq_hex(blinded_keypair.seckey.seckey, + "A958DC83AC885F6814C67035DE817A2C" + "604D5D2F715282079448F789B656350B" + "4540FE1F80AA3F7E91306B7BF7A8E367" + "293352B14A29FDCC8C19F3558075524B"); + + done: + tor_free(mem_op_hex_tmp); +} + /** Pick an HSDir for service with <b>onion_identity_pk</b> as a client. Put * its identity digest in <b>hsdir_digest_out</b>. */ static void @@ -1843,6 +1898,7 @@ test_client_service_hsdir_set_sync(void *arg) } struct testcase_t hs_common_tests[] = { + { "blinding_basics", test_blinding_basics, TT_FORK, NULL, NULL }, { "build_address", test_build_address, TT_FORK, NULL, NULL }, { "validate_address", test_validate_address, TT_FORK, -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated: Fix compiler warnings about unused variables
by gitolite role 19 Jan '23

19 Jan '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new d02d2a4338 Fix compiler warnings about unused variables d02d2a4338 is described below commit d02d2a4338bdade748b334ec01abac0cdaf76563 Author: David Goulet <dgoulet(a)torproject.org> AuthorDate: Thu Jan 19 09:38:21 2023 -0500 Fix compiler warnings about unused variables Fixes #40743 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/core/or/channel.c | 24 ++++++++++++++---------- src/core/or/connection_or.c | 10 ++-------- src/feature/nodelist/routerlist.c | 2 -- src/lib/evloop/compat_libevent.c | 2 -- src/test/bench.c | 1 + src/test/test_channel.c | 25 +++++++++++++++---------- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/core/or/channel.c b/src/core/or/channel.c index c46fa93e58..9d15d35ac9 100644 --- a/src/core/or/channel.c +++ b/src/core/or/channel.c @@ -817,22 +817,26 @@ channel_check_for_duplicates(void) log_notice(LD_OR, "Your relay has a very large number of connections to other relays. " "Is your outbound address the same as your relay address? " - "Found %d connections to %d relays. Found %d current canonical " - "connections, in %d of which we were a non-canonical peer. " + "Found %d connections to authorities, %d connections to %d relays. " + "Found %d current canonical connections, " + "in %d of which we were a non-canonical peer. " "%d relays had more than 1 connection, %d had more than 2, and " "%d had more than 4 connections.", - total_relay_connections, total_relays, total_canonical, - total_half_canonical, total_gt_one_connection, - total_gt_two_connections, total_gt_four_connections); + total_dirauth_connections, total_relay_connections, + total_relays, total_canonical, total_half_canonical, + total_gt_one_connection, total_gt_two_connections, + total_gt_four_connections); } else { log_info(LD_OR, "Performed connection pruning. " - "Found %d connections to %d relays. Found %d current canonical " - "connections, in %d of which we were a non-canonical peer. " + "Found %d connections to authorities, %d connections to %d relays. " + "Found %d current canonical connections, " + "in %d of which we were a non-canonical peer. " "%d relays had more than 1 connection, %d had more than 2, and " "%d had more than 4 connections.", - total_relay_connections, total_relays, total_canonical, - total_half_canonical, total_gt_one_connection, - total_gt_two_connections, total_gt_four_connections); + total_dirauth_connections, total_relay_connections, + total_relays, total_canonical, total_half_canonical, + total_gt_one_connection, total_gt_two_connections, + total_gt_four_connections); } } diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c index dd93628654..343c1a67ed 100644 --- a/src/core/or/connection_or.c +++ b/src/core/or/connection_or.c @@ -1080,7 +1080,7 @@ connection_or_group_set_badness_(smartlist_t *group, int force) * XXXX connections. */ or_connection_t *best = NULL; - int n_old = 0, n_inprogress = 0, n_canonical = 0, n_other = 0; + int n_canonical = 0; time_t now = time(NULL); /* Pass 1: expire everything that's old, and see what the status of @@ -1089,14 +1089,8 @@ connection_or_group_set_badness_(smartlist_t *group, int force) if (connection_or_single_set_badness_(now, or_conn, force)) continue; - if (connection_or_is_bad_for_new_circs(or_conn)) { - ++n_old; - } else if (or_conn->base_.state != OR_CONN_STATE_OPEN) { - ++n_inprogress; - } else if (or_conn->is_canonical) { + if (or_conn->is_canonical) { ++n_canonical; - } else { - ++n_other; } } SMARTLIST_FOREACH_END(or_conn); diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 9f0f845126..f3875670f0 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -243,7 +243,6 @@ router_rebuild_store(int flags, desc_store_t *store) int r = -1; off_t offset = 0; smartlist_t *signed_descriptors = NULL; - int nocache=0; size_t total_expected_len = 0; int had_any; int force = flags & RRS_FORCE; @@ -304,7 +303,6 @@ router_rebuild_store(int flags, desc_store_t *store) goto done; } if (sd->do_not_cache) { - ++nocache; continue; } c = tor_malloc(sizeof(sized_chunk_t)); diff --git a/src/lib/evloop/compat_libevent.c b/src/lib/evloop/compat_libevent.c index fd840f8085..c882d3478e 100644 --- a/src/lib/evloop/compat_libevent.c +++ b/src/lib/evloop/compat_libevent.c @@ -137,10 +137,8 @@ tor_libevent_initialize(tor_libevent_cfg_t *torcfg) (void)torcfg; { - int attempts = 0; struct event_config *cfg; - ++attempts; cfg = event_config_new(); tor_assert(cfg); diff --git a/src/test/bench.c b/src/test/bench.c index a76ea67eb8..a76e600cfa 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -380,6 +380,7 @@ bench_rand_len(int len) uint32_t t=0; for (i = 0; i < N; ++i) { t += tor_weak_random(&weak); + (void) t; } end = perftime(); printf("weak_rand(4): %f nsec.\n", NANOCOUNT(start,end,N)); diff --git a/src/test/test_channel.c b/src/test/test_channel.c index a74d69fefc..a6f403a25c 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -1264,8 +1264,9 @@ test_channel_duplicates(void *arg) /* Try a flat call with channel nor connections. */ channel_check_for_duplicates(); expect_log_msg_containing( - "Found 0 connections to 0 relays. Found 0 current canonical " - "connections, in 0 of which we were a non-canonical peer. " + "Found 0 connections to authorities, 0 connections to 0 relays. " + "Found 0 current canonical connections, " + "in 0 of which we were a non-canonical peer. " "0 relays had more than 1 connection, 0 had more than 2, and " "0 had more than 4 connections."); @@ -1285,8 +1286,9 @@ test_channel_duplicates(void *arg) /* No relay has been associated with this channel. */ channel_check_for_duplicates(); expect_log_msg_containing( - "Found 0 connections to 0 relays. Found 0 current canonical " - "connections, in 0 of which we were a non-canonical peer. " + "Found 0 connections to authorities, 0 connections to 0 relays. " + "Found 0 current canonical connections, " + "in 0 of which we were a non-canonical peer. " "0 relays had more than 1 connection, 0 had more than 2, and " "0 had more than 4 connections."); @@ -1299,24 +1301,27 @@ test_channel_duplicates(void *arg) chan->state = CHANNEL_STATE_CLOSING; channel_check_for_duplicates(); expect_log_msg_containing( - "Found 0 connections to 0 relays. Found 0 current canonical " - "connections, in 0 of which we were a non-canonical peer. " + "Found 0 connections to authorities, 0 connections to 0 relays. " + "Found 0 current canonical connections, " + "in 0 of which we were a non-canonical peer. " "0 relays had more than 1 connection, 0 had more than 2, and " "0 had more than 4 connections."); chan->state = CHANNEL_STATE_OPEN; channel_check_for_duplicates(); expect_log_msg_containing( - "Found 1 connections to 1 relays. Found 0 current canonical " - "connections, in 0 of which we were a non-canonical peer. " + "Found 0 connections to authorities, 1 connections to 1 relays. " + "Found 0 current canonical connections, " + "in 0 of which we were a non-canonical peer. " "0 relays had more than 1 connection, 0 had more than 2, and " "0 had more than 4 connections."); test_chan_should_be_canonical = 1; channel_check_for_duplicates(); expect_log_msg_containing( - "Found 1 connections to 1 relays. Found 1 current canonical " - "connections, in 1 of which we were a non-canonical peer. " + "Found 0 connections to authorities, 1 connections to 1 relays. " + "Found 1 current canonical connections, " + "in 1 of which we were a non-canonical peer. " "0 relays had more than 1 connection, 0 had more than 2, and " "0 had more than 4 connections."); teardown_capture_of_logs(); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] Bug 41568: Disable LaterRun
by Pier Angelo Vendrame (＠pierov) 19 Jan '23

19 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 35fa3a0c by cypherpunks1 at 2023-01-19T16:20:10+01:00 Bug 41568: Disable LaterRun - - - - - 1 changed file: - browser/components/BrowserContentHandler.jsm Changes: ===================================== browser/components/BrowserContentHandler.jsm ===================================== @@ -662,8 +662,8 @@ nsBrowserContentHandler.prototype = { additionalPage = Services.urlFormatter.formatURLPref( "startup.homepage_welcome_url.additional" ); - // Turn on 'later run' pages for new profiles. - LaterRun.enabled = true; + // Disable 'later run' pages for new profiles (tor-browser#41568) + LaterRun.enabled = false; break; case OVERRIDE_NEW_MSTONE: // Check whether we will restore a session. If we will, we assume View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/35fa3a0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/35fa3a0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[torspec] branch main updated (635270c -> f16803f)
by gitolite role 19 Jan '23

19 Jan '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository torspec. from 635270c Merge branch 'tor-gitlab/mr/103' new 5e9d6fc Introduce names for the principal relay keys new 4af1697 Introduce names for the principal rendezvous keys new e3dd512 Say that HS identity keys are not the same as relay identity keys new b631068 rend-spec: Clarify and slightly reword credential explanation new 3c68fd5 Give a formal name to shared_random_value new 1d5ba4f Uwe formal notation for credential and subcredential new 9091995 Use _ed rather than _ntor for ed25519 keys new 0dd6146 Make all HS key names contain _hs_ new 7bc2766 K_hs_intro_ntor: rename from K_hs_intro_enc new a4e3bdb Properly say KS_onion_ed is a keypair new fc42e97 Properly say KP_relayid rather than K_relayid new 3bdb237 Revert "Say that HS identity keys are not the same as relay identity keys" new e1ee12e Document that keypairs should not double up roles, with example new c1aa867 Rename KP_hs_intro_auth to KP_hs_intro_tid new 5f3e97c Provide names for HS client authentication keys new 025d469 Rename onion keys back to K*_onion_ntor new 9ebadaa tor-spec: Change PK/SK to KP/KS in definition section new dc4b593 tor-spec: Clarifiy KP/KS in definition section new f16803f tor-spec: Change KP to KP throughout The 19 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dir-spec.txt | 4 ++-- rend-spec-v3.txt | 41 +++++++++++++++++++++++++---------- srv-spec.txt | 5 +++-- tor-spec.txt | 65 +++++++++++++++++++++++++++++++++++--------------------- 4 files changed, 76 insertions(+), 39 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 19