]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoWhen possible, use RFC5869 HKDF implementation from OpenSSL
rl1987 [Tue, 12 Jun 2018 13:21:05 +0000 (16:21 +0300)] 
When possible, use RFC5869 HKDF implementation from OpenSSL

Also, stop supporting empty HKDF input key material

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 18 Jun 2018 21:09:03 +0000 (17:09 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoRemove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a
Nick Mathewson [Mon, 18 Jun 2018 21:03:52 +0000 (17:03 -0400)] 
Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a

This was already added to LIBTOR_A_SOURCES; it doesn't need to get
added again.

Fixes bug 26402. Bugfix on 0.3.4.1-alpha.

7 years agoRevert "Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a"
Nick Mathewson [Mon, 18 Jun 2018 21:06:18 +0000 (17:06 -0400)] 
Revert "Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a"

This reverts commit 70d91bd059869a0ecf24ceb66942ada4f66f03c9.

7 years agoRemove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a
Nick Mathewson [Mon, 18 Jun 2018 21:03:52 +0000 (17:03 -0400)] 
Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a

This was already added to LIBTOR_A_SOURCES; it doesn't need to get
added again.

Fixes bug 26402. Bugfix on 0.3.4.1-alpha.

7 years agoremove EOL@EOF advice
Nick Mathewson [Mon, 18 Jun 2018 20:18:44 +0000 (16:18 -0400)] 
remove EOL@EOF advice

7 years agoNew check-spaces rule: Our C files may not have duplicate names.
Nick Mathewson [Mon, 18 Jun 2018 20:17:11 +0000 (16:17 -0400)] 
New check-spaces rule: Our C files may not have duplicate names.

7 years agoFinally remove our EOL@EOF check.
Nick Mathewson [Mon, 18 Jun 2018 20:10:47 +0000 (16:10 -0400)] 
Finally remove our EOL@EOF check.

This check was added by mistake long ago.  It will be nice to see
these EOLs disappear from our code over time.

7 years agoRemove redundant typedefs from _st.h files
Nick Mathewson [Mon, 18 Jun 2018 20:04:47 +0000 (16:04 -0400)] 
Remove redundant typedefs from _st.h files

The typedefs are already in or.h

7 years agotest: Add missing headers in test_controller.c
David Goulet [Mon, 18 Jun 2018 19:06:24 +0000 (15:06 -0400)] 
test: Add missing headers in test_controller.c

After the big or.h refactoring, one single unit test file was missing two
headers for node_t and microdesc_t.

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge branch 'split_or_h'
Nick Mathewson [Mon, 18 Jun 2018 18:18:34 +0000 (14:18 -0400)] 
Merge branch 'split_or_h'

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 18 Jun 2018 17:10:47 +0000 (13:10 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'rust_rand_tests' into maint-0.3.4
Nick Mathewson [Mon, 18 Jun 2018 17:10:24 +0000 (13:10 -0400)] 
Merge branch 'rust_rand_tests' into maint-0.3.4

7 years agoChanges file for "make clippy"
Nick Mathewson [Mon, 18 Jun 2018 15:30:06 +0000 (11:30 -0400)] 
Changes file for "make clippy"

7 years agoMerge remote-tracking branch 'isis-github/bug22156'
Nick Mathewson [Mon, 18 Jun 2018 15:29:04 +0000 (11:29 -0400)] 
Merge remote-tracking branch 'isis-github/bug22156'

7 years agoMerge remote-tracking branch 'ffmancera-1/bug24658-dh_stream'
Nick Mathewson [Mon, 18 Jun 2018 00:39:13 +0000 (20:39 -0400)] 
Merge remote-tracking branch 'ffmancera-1/bug24658-dh_stream'

7 years agoMerge remote-tracking branch 'rl1987/bug25477'
Nick Mathewson [Mon, 18 Jun 2018 00:25:40 +0000 (20:25 -0400)] 
Merge remote-tracking branch 'rl1987/bug25477'

7 years agoMerge remote-tracking branch 'rl1987/feature8323_squashed2'
Nick Mathewson [Mon, 18 Jun 2018 00:20:15 +0000 (20:20 -0400)] 
Merge remote-tracking branch 'rl1987/feature8323_squashed2'

7 years agoMerge remote-tracking branch 'rl1987/bug26282'
Nick Mathewson [Sun, 17 Jun 2018 23:32:08 +0000 (19:32 -0400)] 
Merge remote-tracking branch 'rl1987/bug26282'

7 years agoMerge remote-tracking branch 'github/bug26152_035'
Nick Mathewson [Sun, 17 Jun 2018 23:28:59 +0000 (19:28 -0400)] 
Merge remote-tracking branch 'github/bug26152_035'

7 years agoMerge remote-tracking branch 'juga/editorconfig'
Nick Mathewson [Sun, 17 Jun 2018 23:24:58 +0000 (19:24 -0400)] 
Merge remote-tracking branch 'juga/editorconfig'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Sun, 17 Jun 2018 23:24:48 +0000 (19:24 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Sun, 17 Jun 2018 23:24:48 +0000 (19:24 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Sun, 17 Jun 2018 23:24:48 +0000 (19:24 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Sun, 17 Jun 2018 23:24:48 +0000 (19:24 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Sun, 17 Jun 2018 23:24:48 +0000 (19:24 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoAdd .editorconfig to follow coding standards style
juga0 [Sun, 3 Jun 2018 10:44:02 +0000 (10:44 +0000)] 
Add .editorconfig to follow coding standards style

7 years agoChanges to make the rust crypto::mod tests compile
Nick Mathewson [Sat, 16 Jun 2018 17:22:44 +0000 (13:22 -0400)] 
Changes to make the rust crypto::mod tests compile

The digest tests don't link yet, though.

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Sat, 16 Jun 2018 17:10:19 +0000 (13:10 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Sat, 16 Jun 2018 17:10:19 +0000 (13:10 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoFix a bug in my fix for #26258
Nick Mathewson [Sat, 16 Jun 2018 17:08:40 +0000 (13:08 -0400)] 
Fix a bug in my fix for #26258

The fix here is use a different bourne shell subsitution for
CARGO_ONLINE, so that an empty string counts as set.

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Sat, 16 Jun 2018 16:43:35 +0000 (12:43 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge remote-tracking branch 'isis/bug26267' into maint-0.3.4
Nick Mathewson [Sat, 16 Jun 2018 16:43:28 +0000 (12:43 -0400)] 
Merge remote-tracking branch 'isis/bug26267' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Sat, 16 Jun 2018 14:20:27 +0000 (10:20 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoChanges file for rust fatal warnings
Nick Mathewson [Sat, 16 Jun 2018 14:20:21 +0000 (10:20 -0400)] 
Changes file for rust fatal warnings

7 years agoMerge remote-tracking branch 'isis/bug26245' into maint-0.3.4
Nick Mathewson [Sat, 16 Jun 2018 14:19:26 +0000 (10:19 -0400)] 
Merge remote-tracking branch 'isis/bug26245' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Sat, 16 Jun 2018 14:15:39 +0000 (10:15 -0400)] 
Merge branch 'maint-0.3.4'

7 years agorust: Remove unused N_DIGEST_ALGORITHMS constant from crypto_digest.rs.
Isis Lovecruft [Fri, 15 Jun 2018 23:22:43 +0000 (23:22 +0000)] 
rust: Remove unused N_DIGEST_ALGORITHMS constant from crypto_digest.rs.

In the C code, this constant is only ever used in src/test/bench.c.

 * FIXES part of #26245: https://bugs.torproject.org/26245

7 years agorust: Add comment and pragma on "unused" smartlist_t type.
Isis Lovecruft [Fri, 15 Jun 2018 22:49:05 +0000 (22:49 +0000)] 
rust: Add comment and pragma on "unused" smartlist_t type.

 * FIXES part of #26245: https://bugs.torproject.org/26245

7 years agoMake Rust warnings conditionally fatal
Taylor Yu [Fri, 15 Jun 2018 22:27:19 +0000 (17:27 -0500)] 
Make Rust warnings conditionally fatal

Set rustc flags to treat warnings as fatal if configured with
--enable-warnings.

7 years agorust: Expose rand module from crypto crate.
Isis Lovecruft [Fri, 15 Jun 2018 21:44:22 +0000 (21:44 +0000)] 
rust: Expose rand module from crypto crate.

7 years agoBump master to 0.3.5.0-alpha-dev tor-0.3.5.0-alpha-dev
Nick Mathewson [Fri, 15 Jun 2018 21:19:49 +0000 (17:19 -0400)] 
Bump master to 0.3.5.0-alpha-dev

7 years agoSet default-features = false for rand_core
Taylor Yu [Fri, 15 Jun 2018 20:19:16 +0000 (15:19 -0500)] 
Set default-features = false for rand_core

Apparently rand and rand_core need to be built with the "std" feature
set consistently, or there will be a compile error in rngs/jitter.rs.

7 years agoAdd a changes file for splitting structures out of or.h
Nick Mathewson [Fri, 15 Jun 2018 19:48:03 +0000 (15:48 -0400)] 
Add a changes file for splitting structures out of or.h

7 years agoMove hsdir_index_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 19:41:27 +0000 (15:41 -0400)] 
Move hsdir_index_t into its own header.

7 years agoMove extend_info_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 19:37:05 +0000 (15:37 -0400)] 
Move extend_info_t into its own header.

7 years agoExtract cell type and their queues into new headers
Nick Mathewson [Fri, 15 Jun 2018 19:27:46 +0000 (15:27 -0400)] 
Extract cell type and their queues into new headers

Since packed_cell and destroy_cell exist only to be queued, they go
in the same headers as the queues.

7 years agoExtract cached_dir_t into a new header.
Nick Mathewson [Fri, 15 Jun 2018 19:06:00 +0000 (15:06 -0400)] 
Extract cached_dir_t into a new header.

7 years agoExtract download_status_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 18:58:43 +0000 (14:58 -0400)] 
Extract download_status_t into its own header.

7 years agoExtract signed_descriptor_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 18:53:07 +0000 (14:53 -0400)] 
Extract signed_descriptor_t into its own header.

7 years agoExtract routerinfo_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 18:49:15 +0000 (14:49 -0400)] 
Extract routerinfo_t into its own header.

I was expecting this to be much worse.

7 years agoExtract microdesc_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 18:38:30 +0000 (14:38 -0400)] 
Extract microdesc_t into its own header.

7 years agoExtract routerstatus_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 18:33:03 +0000 (14:33 -0400)] 
Extract routerstatus_t into its own header.

7 years agoExtract extrainfo_t into its own header
Nick Mathewson [Fri, 15 Jun 2018 18:21:25 +0000 (14:21 -0400)] 
Extract extrainfo_t into its own header

7 years agoExtract authority_cert_t into its own header
Nick Mathewson [Fri, 15 Jun 2018 18:14:11 +0000 (14:14 -0400)] 
Extract authority_cert_t into its own header

7 years agoExtract desc_store_t and routerlist_t into their own headers.
Nick Mathewson [Fri, 15 Jun 2018 18:07:17 +0000 (14:07 -0400)] 
Extract desc_store_t and routerlist_t into their own headers.

7 years agoExtract ns_detached_signatures_st into its own header.
Nick Mathewson [Fri, 15 Jun 2018 17:49:30 +0000 (13:49 -0400)] 
Extract ns_detached_signatures_st into its own header.

7 years agoExtract networkstatus_t and ..sr_info_t into their own headers
Nick Mathewson [Fri, 15 Jun 2018 17:45:15 +0000 (13:45 -0400)] 
Extract networkstatus_t and ..sr_info_t into their own headers

7 years agoExtract networkstatus_vote_info_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 17:31:47 +0000 (13:31 -0400)] 
Extract networkstatus_vote_info_t into its own header.

7 years agoMove document_signature_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 17:27:11 +0000 (13:27 -0400)] 
Move document_signature_t into its own header.

7 years agofixup! Extract node_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 17:23:44 +0000 (13:23 -0400)] 
fixup! Extract node_t into its own header.

7 years agoSplit vote_{microdesc_hash,routerstatus}_t into their own headers
Nick Mathewson [Fri, 15 Jun 2018 17:23:02 +0000 (13:23 -0400)] 
Split vote_{microdesc_hash,routerstatus}_t into their own headers

7 years agoExtract node_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 17:13:33 +0000 (13:13 -0400)] 
Extract node_t into its own header.

7 years agoSplit socks_request_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 17:01:50 +0000 (13:01 -0400)] 
Split socks_request_t into its own header.

7 years agoMove network_liveness_t into circuitstats.h and make it private
Nick Mathewson [Fri, 15 Jun 2018 16:56:54 +0000 (12:56 -0400)] 
Move network_liveness_t into circuitstats.h and make it private

This type is only used in one place and never exposed.

7 years agoMove measured_bw_line_t into dirserv.h
Nick Mathewson [Fri, 15 Jun 2018 16:54:55 +0000 (12:54 -0400)] 
Move measured_bw_line_t into dirserv.h

7 years agoMove fp_pair_t declaration to fp_pair.h.
Nick Mathewson [Fri, 15 Jun 2018 16:52:22 +0000 (12:52 -0400)] 
Move fp_pair_t declaration to fp_pair.h.

7 years agoMove vote_schedule into its own header.
Nick Mathewson [Fri, 15 Jun 2018 16:50:07 +0000 (12:50 -0400)] 
Move vote_schedule into its own header.

7 years agoSplit rend_authorized_client_t and encoded_.._t into their own headers
Nick Mathewson [Fri, 15 Jun 2018 16:36:59 +0000 (12:36 -0400)] 
Split rend_authorized_client_t and encoded_.._t into their own headers

7 years agoExtract rend_intro_point_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 16:23:06 +0000 (12:23 -0400)] 
Extract rend_intro_point_t into its own header.

7 years agoExtract rend_service_descriptor_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 16:18:17 +0000 (12:18 -0400)] 
Extract rend_service_descriptor_t into its own header.

7 years agoExtract tor_version_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 16:12:15 +0000 (12:12 -0400)] 
Extract tor_version_t into its own header.

7 years agoExtract cpath_build_state into its own header.
Nick Mathewson [Fri, 15 Jun 2018 16:07:20 +0000 (12:07 -0400)] 
Extract cpath_build_state into its own header.

More modules use this than I had expected!

7 years agoExtract crypt_path_reference_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 15:57:48 +0000 (11:57 -0400)] 
Extract crypt_path_reference_t into its own header.

7 years agoExtract crypt_path_t and relay_crypto_t into their own headers
Nick Mathewson [Fri, 15 Jun 2018 15:52:32 +0000 (11:52 -0400)] 
Extract crypt_path_t and relay_crypto_t into their own headers

7 years agoExtract circuit_t into its own header
Nick Mathewson [Fri, 15 Jun 2018 15:38:36 +0000 (11:38 -0400)] 
Extract circuit_t into its own header

7 years agoExtract {or,origin}_circuit_t into their own headers
Nick Mathewson [Fri, 15 Jun 2018 15:34:33 +0000 (11:34 -0400)] 
Extract {or,origin}_circuit_t into their own headers

7 years agoExtract connection_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 15:05:56 +0000 (11:05 -0400)] 
Extract connection_t into its own header.

Now the entire connection_t hierarchy is extracted from or.h

7 years agoSplit or_handshake_{certs,state}_t into their own headers.
Nick Mathewson [Fri, 15 Jun 2018 14:56:15 +0000 (10:56 -0400)] 
Split or_handshake_{certs,state}_t into their own headers.

7 years agoMove or_connection_t to its own header.
Nick Mathewson [Fri, 15 Jun 2018 14:48:50 +0000 (10:48 -0400)] 
Move or_connection_t to its own header.

7 years agoSplit listener_connection_t into its own header
Nick Mathewson [Fri, 15 Jun 2018 14:37:33 +0000 (10:37 -0400)] 
Split listener_connection_t into its own header

For once, it's a type that is used almost nowhere else besides the
logical place.

7 years agoSplit dir_connection_t into its own header
Nick Mathewson [Fri, 15 Jun 2018 14:31:21 +0000 (10:31 -0400)] 
Split dir_connection_t into its own header

7 years agoSplit control_connection_t into its own header.
Nick Mathewson [Fri, 15 Jun 2018 14:17:27 +0000 (10:17 -0400)] 
Split control_connection_t into its own header.

This one was actually fairly simple.

7 years agoSplit entry and edge_connection_t into their own headers.
Nick Mathewson [Fri, 15 Jun 2018 14:07:17 +0000 (10:07 -0400)] 
Split entry and edge_connection_t into their own headers.

7 years agoMove dir_server_t into its own header.
Nick Mathewson [Thu, 14 Jun 2018 20:58:01 +0000 (16:58 -0400)] 
Move dir_server_t into its own header.

7 years agoMake server_port_cfg_t and port_cfg_t into separate headers.
Nick Mathewson [Thu, 14 Jun 2018 20:41:54 +0000 (16:41 -0400)] 
Make server_port_cfg_t and port_cfg_t into separate headers.

7 years agoMove entry_port_cfg_t into its own header.
Nick Mathewson [Thu, 14 Jun 2018 20:19:11 +0000 (16:19 -0400)] 
Move entry_port_cfg_t into its own header.

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Thu, 14 Jun 2018 16:49:57 +0000 (12:49 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge remote-tracking branch 'public/bug26258_033' into maint-0.3.3
Nick Mathewson [Thu, 14 Jun 2018 16:47:09 +0000 (12:47 -0400)] 
Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3

7 years agosquash! Make sure that the test_rust.sh script fails when a test fails
Nick Mathewson [Wed, 13 Jun 2018 16:21:25 +0000 (12:21 -0400)] 
squash! Make sure that the test_rust.sh script fails when a test fails

Also make sure that we're actually running the test from within the right
cwd, like we do when we're building.  This seems necessary to avoid
an error when running offline.

Amusingly, it appears that we had this bug before: we just weren't
noticing it, because of bug 26258.

7 years agoMerge remote-tracking branch 'asn-github/bug26358'
Nick Mathewson [Wed, 13 Jun 2018 14:00:37 +0000 (10:00 -0400)] 
Merge remote-tracking branch 'asn-github/bug26358'

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Wed, 13 Jun 2018 13:59:28 +0000 (09:59 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 13 Jun 2018 13:59:28 +0000 (09:59 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Wed, 13 Jun 2018 13:59:28 +0000 (09:59 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoFix an extra space in a changes file
Nick Mathewson [Wed, 13 Jun 2018 13:59:26 +0000 (09:59 -0400)] 
Fix an extra space in a changes file

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 13 Jun 2018 13:58:05 +0000 (09:58 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Wed, 13 Jun 2018 13:58:05 +0000 (09:58 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Wed, 13 Jun 2018 13:58:04 +0000 (09:58 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'bug26158_031' into maint-0.3.1
Nick Mathewson [Wed, 13 Jun 2018 13:58:01 +0000 (09:58 -0400)] 
Merge branch 'bug26158_031' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 13 Jun 2018 13:57:10 +0000 (09:57 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3