tor-commits October 2018

tor-commits@lists.torproject.org

17 participants
2350 discussions

[tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/431' into maint-0.3.5
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 97324a731f5cbdfd0a00b852f4388c3dd149c7fa Merge: ee1cc0fea 7bf9c93ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:35:07 2018 -0400 Merge remote-tracking branch 'tor-github/pr/431' into maint-0.3.5 changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 19 ++++--------------- 2 files changed, 9 insertions(+), 15 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit cf2cb783b77bf9a84c6485b492ebb7e09914b74f Merge: c4b6b5738 038bc21f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:34:04 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0

[tor/master] Remove extraneous argument from Rust protover_compute_vote()
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 80ad15921cef42ac12da356584f217d2ead5cb09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 17 11:50:46 2018 -0400 Remove extraneous argument from Rust protover_compute_vote() This argument was added to match an older idea for the C api, but we decided not to do it that way in C. Fixes bug 27741; bugfix on 0.3.3.6 / TROVE-2018-005 fix. --- changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/changes/bug27741 b/changes/bug27741 new file mode 100644 index 000000000..531e264b6 --- /dev/null +++ b/changes/bug27741 @@ -0,0 +1,5 @@ + o Minor bugfixes (rust, directory authority): + - Fix an API mismatch in the rust implementation of + protover_compute_vote(). This bug could have caused crashes on any + directory authorities running Tor with Rust (which we do not yet + recommend). Fixes bug 27741; bugfix on 0.3.3.6. diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 9656e8c31..f803bd015 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -207,8 +207,7 @@ pub extern "C" fn protover_get_supported_protocols() -> *const c_char { #[no_mangle] pub extern "C" fn protover_compute_vote( list: *const Stringlist, - threshold: c_int, - allow_long_proto_names: bool, + threshold: c_int ) -> *mut c_char { if list.is_null() { @@ -223,13 +222,9 @@ pub extern "C" fn protover_compute_vote( let mut proto_entries: Vec<UnvalidatedProtoEntry> = Vec::new(); for datum in data { - let entry: UnvalidatedProtoEntry = match allow_long_proto_names { - true => match UnvalidatedProtoEntry::from_str_any_len(datum.as_str()) { - Ok(n) => n, - Err(_) => continue}, - false => match datum.parse() { - Ok(n) => n, - Err(_) => continue}, + let entry: UnvalidatedProtoEntry = match datum.parse() { + Ok(n) => n, + Err(_) => continue }; proto_entries.push(entry); }

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 038bc21f8894043fbdda0cc87adddfbad84f65c4 Merge: 8013e3e8b 80ad15921 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:33:36 2018 -0400 Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3 changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-)

1 0

[tor/release-0.3.4] Remove extraneous argument from Rust protover_compute_vote()
by nickm＠torproject.org 30 Oct '18

30 Oct '18

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
by nickm＠torproject.org 30 Oct '18

30 Oct '18

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 3a05b5acdc4a40eae6016ab94067bf5dde92e5fe Merge: 97324a731 cf2cb783b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:35:11 2018 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5

1 0

[tor/release-0.3.5] Remove extraneous argument from Rust protover_compute_vote()
by nickm＠torproject.org 30 Oct '18

30 Oct '18

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 30 Oct '18

30 Oct '18

commit 6ba7f9f0a42ff2a55b2e66998b4ebf55c90b2787 Merge: 30d853a90 3a05b5acd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 30 09:35:11 2018 -0400 Merge branch 'maint-0.3.5' changes/bug27741 | 5 +++++ src/rust/protover/ffi.rs | 19 ++++--------------- 2 files changed, 9 insertions(+), 15 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/431' into maint-0.3.5
by nickm＠torproject.org 30 Oct '18

30 Oct '18

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2018