January 2023 - tor-commits - lists.torproject.org

[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

[Git][tpo/applications/tor-browser][tor-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 tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 6ebcf4f4 by cypherpunks1 at 2023-01-19T15:17:57+00:00 Bug 41568: Disable LaterRun - - - - - 1 changed file: - browser/components/BrowserContentHandler.jsm Changes: ===================================== browser/components/BrowserContentHandler.jsm ===================================== @@ -703,8 +703,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/6ebcf4f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6ebcf4f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor] branch main updated: Add a test vector for crypto_mac_sha3
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 5629a391c2 Add a test vector for crypto_mac_sha3 new 49f10c5130 Merge branch 'tor-gitlab/mr/683' 5629a391c2 is described below commit 5629a391c25db8611ec43065ebbdce492b30b669 Author: Nick Mathewson <nickm(a)torproject.org> AuthorDate: Thu Jan 19 09:06:47 2023 -0500 Add a test vector for crypto_mac_sha3 --- src/test/test_crypto.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 87e309f25a..fd5a14b503 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1043,6 +1043,7 @@ test_crypto_mac_sha3(void *arg) { const char msg[] = "i am in a library somewhere using my computer"; const char key[] = "i'm from the past talking to the future."; + char *mem_op_hex_tmp = NULL; uint8_t hmac_test[DIGEST256_LEN]; char hmac_manual[DIGEST256_LEN]; @@ -1077,7 +1078,12 @@ test_crypto_mac_sha3(void *arg) /* Now compare the two results */ tt_mem_op(hmac_test, OP_EQ, hmac_manual, DIGEST256_LEN); - done: ; + /* Check against a known correct value (computed from python) */ + test_memeq_hex(hmac_test, + "753fba6d87d49497238a512a3772dd29" + "1e55f7d1cd332c9fb5c967c7a10a13ca"); + done: + tor_free(mem_op_hex_tmp); } /** Run unit tests for our public key crypto functions */ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40353: Re-enable rlbox
by Pier Angelo Vendrame (＠pierov) 19 Jan '23

19 Jan '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: d940f9db by Pier Angelo Vendrame at 2023-01-19T15:18:08+01:00 Bug 40353: Re-enable rlbox Updated the creation of the WASI sysroot, to be more similar to what Mozilla does in shell scripts included in Firefox source code. This includes the same hacks, like re-using the LLVM we already build. We were still using lucetc, which is not needed anymore. Therefore, this commit removes it. - - - - - 17 changed files: - Makefile - projects/clang/build - projects/firefox/build - projects/firefox/config - projects/firefox/list_toolchain_updates_checks - projects/geckoview/build - projects/geckoview/config - − projects/lucetc/Remove-march-native-from-COMMON_CFLAGS.patch - − projects/lucetc/build - − projects/lucetc/config - + projects/wasi-config/build - + projects/wasi-config/config - + projects/wasi-libc/build - + projects/wasi-libc/config - projects/wasi-sysroot/build - projects/wasi-sysroot/config - rbm.conf Changes: ===================================== Makefile ===================================== @@ -274,9 +274,6 @@ cargo_vendor-cbindgen-android: submodule-update cargo_vendor-cbindgen: submodule-update $(rbm) build cbindgen --step cargo_vendor --target nightly --target torbrowser-linux-x86_64 -cargo_vendor-lucetc: submodule-update - $(rbm) build lucetc --step cargo_vendor --target nightly --target torbrowser-linux-x86_64 - cargo_vendor-uniffi-rs: submodule-update $(rbm) build uniffi-rs --step cargo_vendor --target nightly --target torbrowser-linux-x86_64 ===================================== projects/clang/build ===================================== @@ -24,7 +24,7 @@ cd build cmake ../llvm -GNinja \ -DCMAKE_INSTALL_PREFIX=$distdir \ -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64[% IF c("var/rlbox") -%];WebAssembly[% END %]" \ + -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64;WebAssembly" \ -DLLVM_ENABLE_PROJECTS="clang;lld" \ -DLLVM_ENABLE_ZLIB=ON \ -DLLVM_INSTALL_UTILS=ON \ ===================================== projects/firefox/build ===================================== @@ -49,10 +49,7 @@ export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bi rtdir=/var/tmp/dist/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi [% END -%] mkdir -p $rtdir - cp /var/tmp/dist/wasi-sysroot/lib/clang/11.0.0/lib/wasi/libclang_rt.builtins-wasm32.a $rtdir - tar -C /var/tmp/dist -xf [% c('input_files_by_name/lucetc') %] - export PATH="/var/tmp/dist/lucetc/bin:$PATH" - export WASM_SANDBOXED_LIBRARIES=graphite,ogg + cp /var/tmp/dist/wasi-sysroot/lib/clang/*/lib/wasi/libclang_rt.builtins-wasm32.a $rtdir export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot/share/wasi-sysroot [% END -%] ===================================== projects/firefox/config ===================================== @@ -158,9 +158,6 @@ input_files: - project: wasi-sysroot name: wasi-sysroot enable: '[% c("var/rlbox") %]' - - project: lucetc - name: lucetc - enable: '[% c("var/rlbox") %]' - project: node name: node - project: nasm ===================================== projects/firefox/list_toolchain_updates_checks ===================================== @@ -213,15 +213,5 @@ needed=$(perl -MYAML::XS -e "$p") current='[% pc("wasi-sysroot", "git_hash") %]' check_update_needed wasi-sdk "$needed" "$current" - -# lucetc -read -d '' p << 'EOF' || true -my $d = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); -print $d->{'lucetc-source'}{fetch}{revision}; -EOF -needed=$(perl -MYAML::XS -e "$p") -current='[% pc("lucetc", "git_hash") %]' -check_update_needed lucetc "$needed" "$current" - # End RLBox [% END -%] ===================================== projects/geckoview/build ===================================== @@ -26,6 +26,18 @@ cp -r /var/tmp/dist/compiler-rt/* /var/tmp/dist/clang/ tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/node/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:$PATH" +[% IF c("var/rlbox") -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %] + # XXX: We need the libclang_rt.builtins-wasm32.a in our clang lib directory. + # Copy it over. + # https://searchfox.org/mozilla-central/source/build/build-clang/build-clang.…, + # include it directly in our clang + rtdir=/var/tmp/dist/clang/lib/clang/[% pc("clang", "version") %]/lib/wasi + mkdir -p $rtdir + cp /var/tmp/dist/wasi-sysroot/lib/clang/*/lib/wasi/libclang_rt.builtins-wasm32.a $rtdir + export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot/share/wasi-sysroot +[% END -%] + tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c("version") %] ===================================== projects/geckoview/config ===================================== @@ -173,6 +173,9 @@ input_files: name: clang - project: 'compiler-rt' name: 'compiler-rt' + - project: wasi-sysroot + name: wasi-sysroot + enable: '[% c("var/rlbox") %]' - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' ===================================== projects/lucetc/Remove-march-native-from-COMMON_CFLAGS.patch deleted ===================================== @@ -1,24 +0,0 @@ -From ce82762aef3f8cdbdd340f39f95d2491f69a7da0 Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Mon, 29 Mar 2021 13:42:48 +0200 -Subject: [PATCH] Remove -march=native from COMMON_CFLAGS - -The -march=native flag is causing an error on some hardware. It can also -make the build non-reproducible when not building on the same hardware. ---- - lucet-builtins/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lucet-builtins/Makefile b/lucet-builtins/Makefile -index 6ddbcfd..de7e540 100644 ---- a/lucet-builtins/Makefile -+++ b/lucet-builtins/Makefile -@@ -7,7 +7,7 @@ LIBBUILTINS_OBJS:=$(addprefix build/, \ - strcmp.o \ - strlen.o ) - --COMMON_CFLAGS:= --std=gnu99 -Ofast -Wall -Werror -march=native -fPIC \ -+COMMON_CFLAGS:= --std=gnu99 -Ofast -Wall -Werror -fPIC \ - -I../lucet-runtime/include - - default: build/libbuiltins.so ===================================== projects/lucetc/build deleted ===================================== @@ -1,57 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -# XXX: Do we need the GCC part here if we set CC to clang anyway? -[% IF c("var/linux") %] - [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), - hardened_gcc => 0 }) %] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] - export PATH="/var/tmp/dist/binutils/bin:$PATH" -[% END -%] -distdir=/var/tmp/dist -builddir=/var/tmp/build/[% project %] - -mkdir -p $distdir -tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %] -export PATH="/var/tmp/dist/cmake/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/rust/bin:$PATH" -export CC=$distdir/clang/bin/clang -export CFLAGS="-L$distdir/clang/lib" -export CXX=$distdir/clang/bin/clang++ -export CXXFLAGS=$CFLAGS -export AR=$distdir/clang/bin/llvm-ar -export RUSTFLAGS="-C linker=$CXX -C link-arg=$CXXFLAGS" -export LUCET_PREFIX=$distdir/[% project %] -# XXX: Why do we need that when Mozilla doesn't? See: taskcluster/scripts/misc/build-lucetc.sh -export WASI_SYSROOT=$distdir/wasi-sysroot - -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz - -# Now prepare the offline build -# Move the directory for hardcoding the path in .cargo/config -mv /var/tmp/build/[% project %]-[% c('version') %] $builddir -tar -C $builddir -xf [% c('input_files_by_name/lucetc-vendor') %] -cd $builddir -# .cargo exists already, let's just add to it -cat >> .cargo/config << 'EOF' - -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "/var/tmp/build/lucetc/vendor" -EOF - -patch -p1 < $rootdir/Remove-march-native-from-COMMON_CFLAGS.patch - -make -j[% c("num_procs") %] build -# XXX: Should not be needed, just the lucetc binary, see: taskcluster/scripts/misc/build-lucetc.sh -make install - -cd $distdir -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] ===================================== projects/lucetc/config deleted ===================================== @@ -1,43 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: '[% c("abbrev") %]' -git_hash: d582d76bf0d17984501f3933688bf7a1eb5cf208 -git_url: https://github.com/PLSysSec/lucet_sandbox_compiler/ -git_submodule: 1 - -container: - use_container: 1 - -input_files: - - project: container-image - - name: binutils - project: binutils - enable: '[% c("var/linux") %]' - # Our clang still needs GCC parts (libstdc++ for instance) so we include that - # one here even though compilation gets done solely by clang. - - project: '[% c("var/compiler") %]' - name: '[% c("var/compiler") %]' - enable: '[% c("var/linux") %]' - - name: cmake - project: cmake - - name: clang - project: clang - - name: rust - project: rust - - name: wasi-sysroot - project: wasi-sysroot - # Use `make cargo_vendor-lucetc` to re-generate the vendor tarball - - name: lucetc-vendor - URL: 'https://people.torproject.org/~boklm/mirrors/sources/lucetc-vendor-[% c("version") %].tar.bz2' - sha256sum: 6b044ed76bc8870040174c8fbfa49c3a791b3aba7d32dd00cad541025eb16077 - - filename: Remove-march-native-from-COMMON_CFLAGS.patch - -steps: - cargo_vendor: - filename: '[% project %]-vendor-[% c("version") %].tar.bz2' - input_files: - - project: container-image - pkg_type: build - - project: rust - name: rust - pkg_type: build ===================================== projects/wasi-config/build ===================================== @@ -0,0 +1,4 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +mkdir -p /var/tmp/dist +mv $rootdir/[% project %]-[% c('version') %].tar.gz [% dest_dir %]/[% c("filename") %] ===================================== projects/wasi-config/config ===================================== @@ -0,0 +1,5 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://git.savannah.gnu.org/git/config.git +git_hash: c179db1b6f2ae484bfca1e9f8bae273e3319fa7d +filename: '[% project %]-[% c("version") %].tar.gz' ===================================== projects/wasi-libc/build ===================================== @@ -0,0 +1,4 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +mkdir -p /var/tmp/dist +mv $rootdir/[% project %]-[% c('version') %].tar.gz [% dest_dir %]/[% c("filename") %] ===================================== projects/wasi-libc/config ===================================== @@ -0,0 +1,5 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/WebAssembly/wasi-libc.git +git_hash: 9886d3d6200fcc3726329966860fc058707406cd +filename: '[% c("project") %]-[% c("version") %].tar.gz' ===================================== projects/wasi-sysroot/build ===================================== @@ -1,35 +1,81 @@ #!/bin/bash [% c("var/set_default_env") -%] -[% IF c("var/linux") %] - [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), - hardened_gcc => 0 }) %] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] - export PATH="/var/tmp/dist/binutils/bin:$PATH" -[% END -%] -distdir=/var/tmp/dist -builddir=/var/tmp/build/[% project %] +distdir=/var/tmp/dist/[% project %] +builddir=/var/tmp/build/[% project %]-[% c("abbrev") %] mkdir -p $distdir tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] -export PATH=/var/tmp/dist/binutils/bin:/var/tmp/dist/cmake/bin:/var/tmp/dist/ninja:$PATH +export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$PATH" + +[% IF c("var/linux") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] +[% END -%] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz -mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +cd /var/tmp/build +tar -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd $builddir -# We have no .git in our tar ball but the script version.sh used by -# the Makefile depends on that. We replace the script. + +pushd src +rmdir config llvm-project wasi-libc +tar -xf $rootdir/[% c('input_files_by_name/wasi-config') %] +mv wasi-config-* config +tar -xf $rootdir/[% c('input_files_by_name/clang-source') %] +mv clang-source llvm-project +export LLVM_HOME=$(pwd)/llvm-project +tar -xf $rootdir/[% c('input_files_by_name/wasi-libc') %] +mv wasi-libc-* wasi-libc +popd + +# What follows has been copied from Firefox's +# taskcluster/scripts/misc/build-sysroot-wasi.sh and adapted to +# tor-browser-build. + +mkdir -p build/install/wasi +# The wasi-sdk build system wants to build clang itself. We trick it into +# thinking it did, and put our own clang where it would have built its own. +tar -C build -xf $rootdir/[% c('input_files_by_name/clang') %] +mv build/clang build/llvm +touch build/llvm.BUILT + +# The wasi-sdk build system wants a clang and an ar binary in +# build/install/$PREFIX/bin +ln -s $(pwd)/build/llvm/bin build/install/wasi/bin +ln -s llvm-ar build/install/wasi/bin/ar + +# tor-browser-build: we have no .git in our tarball but the script version.sh +# used by the Makefile depends on that. We replace the script. cat > 'version.sh' << EOF #!/bin/sh echo '[% c("abbrev") %]' EOF -# XXX: We don't want to use the clang 9.0 wasi-sdk would use, see: -# https://bugzilla.mozilla.org/show_bug.cgi?id=1605708 -make -j[% c("num_procs") %] PREFIX=$distdir/[% project %] DESTDIR=/ +# Build wasi-libc, libc++ and libc++abi. +make \ + LLVM_PROJ_DIR=$LLVM_HOME \ + PREFIX=/wasi \ + build/wasi-libc.BUILT \ + build/compiler-rt.BUILT \ + NINJA_FLAGS='-j[% c("num_procs") %]' + +# Does Mozilla maybe do this when compiling Clang? +rtdir="build/llvm/lib/clang/$(ls build/llvm/lib/clang)/lib/wasi" +mkdir -p "$rtdir" +cp build/compiler-rt/lib/wasi/libclang_rt.builtins-wasm32.a "$rtdir/" + +make \ + LLVM_PROJ_DIR=$LLVM_HOME \ + PREFIX=/wasi \ + build/libcxx.BUILT \ + NINJA_FLAGS='-j[% c("num_procs") %]' + +mv build/install/wasi/share $distdir/ +mv build/install/wasi/lib $distdir/ -cd $distdir +cd /var/tmp/dist [% c('tar', { tar_src => [ project ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), ===================================== projects/wasi-sysroot/config ===================================== @@ -1,22 +1,35 @@ # vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' version: '[% c("abbrev") %]' -git_hash: b36c433738f0c29160a5ac1c1cee1b1b884bf4a0 -git_url: https://github.com/CraneStation/wasi-sdk -git_submodule: 1 +# Notice: we are not enabling submodules because we use the same hacks as +# Mozilla and re-use the LLVM we already build. +# So, be sure to update also wasi-libc and wasi-config when you update this +# git hash! +git_hash: 37ae6af88201884c8b98a65adcd6d8cd1284f95e +git_url: https://github.com/WebAssembly/wasi-sdk.git +git_submodule: 0 container: use_container: 1 input_files: - project: container-image - - name: binutils - project: binutils - enable: '[% c("var/linux") %]' - - project: '[% c("var/compiler") %]' - name: '[% c("var/compiler") %]' + # We do not use GCC, but we need its libsdc++ to run Clang + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' enable: '[% c("var/linux") %]' + - name: clang + project: clang + - project: llvm-project + name: clang-source - name: cmake project: cmake - name: ninja project: ninja + - name: python + project: python + enable: '[% c("var/linux") %]' + - name: wasi-config + project: wasi-config + - name: wasi-libc + project: wasi-libc ===================================== rbm.conf ===================================== @@ -168,6 +168,8 @@ var: - zh-rCN - zh-rTW + rlbox: 1 + sign_build: '[% ENV.RBM_SIGN_BUILD %]' sign_build_gpg_opts: '[% ENV.RBM_GPG_OPTS %]' @@ -401,8 +403,6 @@ targets: osname: linux-x86_64 linux-cross: 0 arch_debian: amd64 - # We only support RLBox on the nightly channel and x86_64 for now - rlbox: 0 linux-i686: arch: i686 var: @@ -569,7 +569,6 @@ targets: FLAGS: "-target [% c('var/build_target') %] -B $cctoolsdir -isysroot $sysrootdir [% IF c('var/macos-aarch64') %]-mcpu=apple-m1[% END %]" LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" locale_ja: ja-JP-mac - rlbox: 0 deps: - build-essential - faketime View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor] branch main updated: doc: Add tpo website update to ReleasingTor.md
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 0221c88f10 doc: Add tpo website update to ReleasingTor.md 0221c88f10 is described below commit 0221c88f10d0a251cef642c25685f3bad217e0fe Author: David Goulet <dgoulet(a)torproject.org> AuthorDate: Thu Jan 19 08:43:59 2023 -0500 doc: Add tpo website update to ReleasingTor.md Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/HACKING/ReleasingTor.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 8367bf6c51..af3805f38e 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -139,6 +139,12 @@ do the following: the Forum. Append the ChangeLog there. We do this until we can automate such post from the forum directly. + 5. Update torproject.org website by submitting a MR to + https://gitlab.torproject.org/tpo/web/tpo + + The `databags/versions.ini` file is the one to change with the newly + released version(s). + ### New Stable 1. Create the `maint-x.y.z` and `release-x.y.z` branches at the version -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0