May 2018 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 22 May '18

22 May '18

commit cde5c9d0c335e51c254251f018e9de620c27d9db Merge: b858f576c a5d4ce2b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 22 13:35:33 2018 -0400 Merge branch 'maint-0.3.3' src/or/protover_rust.c | 17 ++++++++++++++++- src/rust/protover/ffi.rs | 26 ++++++++++++++++++++++++++ src/test/test_protover.c | 2 ++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --cc src/test/test_protover.c index 1b0adb175,0948cd564..70b7c9a85 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@@ -317,13 -317,15 +317,15 @@@ test_protover_all_supported(void *arg tor_end_capture_bugs_(); /* Protocol name too long */ + #ifndef HAVE_RUST // XXXXXX ????? tor_capture_bugs_(1); tt_assert(protover_all_supported( - "DoSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" - "aaaaaaaaaaaa=1-65536", &msg)); + "DoSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + "aaaaaaaaaaaa=1-65536", &msg)); tor_end_capture_bugs_(); + #endif done: tor_end_capture_bugs_();

1 0

[tor/master] Make the TROVE-2018-005 fix work with rust.
by nickm＠torproject.org 22 May '18

22 May '18

commit a5d4ce2b393955f60962d3db8744a846506c3e7b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 22 13:35:20 2018 -0400 Make the TROVE-2018-005 fix work with rust. --- src/or/protover_rust.c | 17 ++++++++++++++++- src/rust/protover/ffi.rs | 26 ++++++++++++++++++++++++++ src/test/test_protover.c | 2 ++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/src/or/protover_rust.c b/src/or/protover_rust.c index 26e21cc1c..99304f8b5 100644 --- a/src/or/protover_rust.c +++ b/src/or/protover_rust.c @@ -13,7 +13,22 @@ #ifdef HAVE_RUST /* Define for compatibility, used in main.c */ -void protover_free_all(void) {} +void +protover_free_all(void) +{ +} + +int protover_contains_long_protocol_names_(const char *s); + +/** + * Return true if the unparsed protover in s would contain a protocol + * name longer than MAX_PROTOCOL_NAME_LENGTH, and false otherwise. + */ +bool +protover_contains_long_protocol_names(const char *s) +{ + return protover_contains_long_protocol_names_(s) != 0; +} #endif /* defined(HAVE_RUST) */ diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index ed078654f..9656e8c31 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -116,6 +116,32 @@ pub extern "C" fn protocol_list_supports_protocol( } } +#[no_mangle] +pub extern "C" fn protover_contains_long_protocol_names_( + c_protocol_list: *const c_char +) -> c_int { + if c_protocol_list.is_null() { + return 1; + } + + // Require an unsafe block to read the version from a C string. The pointer + // is checked above to ensure it is not null. + let c_str: &CStr = unsafe { CStr::from_ptr(c_protocol_list) }; + + let protocol_list = match c_str.to_str() { + Ok(n) => n, + Err(_) => return 1 + }; + + let protocol_entry : Result<UnvalidatedProtoEntry,_> = + protocol_list.parse(); + + match protocol_entry { + Ok(_) => 0, + Err(_) => 1, + } +} + /// Provide an interface for C to translate arguments and return types for /// protover::list_supports_protocol_or_later #[no_mangle] diff --git a/src/test/test_protover.c b/src/test/test_protover.c index a7d4667df..0948cd564 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -317,6 +317,7 @@ test_protover_all_supported(void *arg) tor_end_capture_bugs_(); /* Protocol name too long */ +#ifndef HAVE_RUST // XXXXXX ????? tor_capture_bugs_(1); tt_assert(protover_all_supported( "DoSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" @@ -324,6 +325,7 @@ test_protover_all_supported(void *arg) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaa=1-65536", &msg)); tor_end_capture_bugs_(); +#endif done: tor_end_capture_bugs_();

1 0

[tor/maint-0.3.3] Make the TROVE-2018-005 fix work with rust.
by nickm＠torproject.org 22 May '18

22 May '18

commit a5d4ce2b393955f60962d3db8744a846506c3e7b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 22 13:35:20 2018 -0400 Make the TROVE-2018-005 fix work with rust. --- src/or/protover_rust.c | 17 ++++++++++++++++- src/rust/protover/ffi.rs | 26 ++++++++++++++++++++++++++ src/test/test_protover.c | 2 ++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/src/or/protover_rust.c b/src/or/protover_rust.c index 26e21cc1c..99304f8b5 100644 --- a/src/or/protover_rust.c +++ b/src/or/protover_rust.c @@ -13,7 +13,22 @@ #ifdef HAVE_RUST /* Define for compatibility, used in main.c */ -void protover_free_all(void) {} +void +protover_free_all(void) +{ +} + +int protover_contains_long_protocol_names_(const char *s); + +/** + * Return true if the unparsed protover in s would contain a protocol + * name longer than MAX_PROTOCOL_NAME_LENGTH, and false otherwise. + */ +bool +protover_contains_long_protocol_names(const char *s) +{ + return protover_contains_long_protocol_names_(s) != 0; +} #endif /* defined(HAVE_RUST) */ diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index ed078654f..9656e8c31 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -116,6 +116,32 @@ pub extern "C" fn protocol_list_supports_protocol( } } +#[no_mangle] +pub extern "C" fn protover_contains_long_protocol_names_( + c_protocol_list: *const c_char +) -> c_int { + if c_protocol_list.is_null() { + return 1; + } + + // Require an unsafe block to read the version from a C string. The pointer + // is checked above to ensure it is not null. + let c_str: &CStr = unsafe { CStr::from_ptr(c_protocol_list) }; + + let protocol_list = match c_str.to_str() { + Ok(n) => n, + Err(_) => return 1 + }; + + let protocol_entry : Result<UnvalidatedProtoEntry,_> = + protocol_list.parse(); + + match protocol_entry { + Ok(_) => 0, + Err(_) => 1, + } +} + /// Provide an interface for C to translate arguments and return types for /// protover::list_supports_protocol_or_later #[no_mangle] diff --git a/src/test/test_protover.c b/src/test/test_protover.c index a7d4667df..0948cd564 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -317,6 +317,7 @@ test_protover_all_supported(void *arg) tor_end_capture_bugs_(); /* Protocol name too long */ +#ifndef HAVE_RUST // XXXXXX ????? tor_capture_bugs_(1); tt_assert(protover_all_supported( "DoSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" @@ -324,6 +325,7 @@ test_protover_all_supported(void *arg) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaa=1-65536", &msg)); tor_end_capture_bugs_(); +#endif done: tor_end_capture_bugs_();

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 22 May '18

22 May '18

commit 0256702362b76345401156fa5258b686b53fe28e Merge: 20f8fead9 a5d4ce2b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 22 13:35:33 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/or/protover_rust.c | 17 ++++++++++++++++- src/rust/protover/ffi.rs | 26 ++++++++++++++++++++++++++ src/test/test_protover.c | 2 ++ 3 files changed, 44 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Make the TROVE-2018-005 fix work with rust.
by nickm＠torproject.org 22 May '18

22 May '18

commit a5d4ce2b393955f60962d3db8744a846506c3e7b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 22 13:35:20 2018 -0400 Make the TROVE-2018-005 fix work with rust. --- src/or/protover_rust.c | 17 ++++++++++++++++- src/rust/protover/ffi.rs | 26 ++++++++++++++++++++++++++ src/test/test_protover.c | 2 ++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/src/or/protover_rust.c b/src/or/protover_rust.c index 26e21cc1c..99304f8b5 100644 --- a/src/or/protover_rust.c +++ b/src/or/protover_rust.c @@ -13,7 +13,22 @@ #ifdef HAVE_RUST /* Define for compatibility, used in main.c */ -void protover_free_all(void) {} +void +protover_free_all(void) +{ +} + +int protover_contains_long_protocol_names_(const char *s); + +/** + * Return true if the unparsed protover in s would contain a protocol + * name longer than MAX_PROTOCOL_NAME_LENGTH, and false otherwise. + */ +bool +protover_contains_long_protocol_names(const char *s) +{ + return protover_contains_long_protocol_names_(s) != 0; +} #endif /* defined(HAVE_RUST) */ diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index ed078654f..9656e8c31 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -116,6 +116,32 @@ pub extern "C" fn protocol_list_supports_protocol( } } +#[no_mangle] +pub extern "C" fn protover_contains_long_protocol_names_( + c_protocol_list: *const c_char +) -> c_int { + if c_protocol_list.is_null() { + return 1; + } + + // Require an unsafe block to read the version from a C string. The pointer + // is checked above to ensure it is not null. + let c_str: &CStr = unsafe { CStr::from_ptr(c_protocol_list) }; + + let protocol_list = match c_str.to_str() { + Ok(n) => n, + Err(_) => return 1 + }; + + let protocol_entry : Result<UnvalidatedProtoEntry,_> = + protocol_list.parse(); + + match protocol_entry { + Ok(_) => 0, + Err(_) => 1, + } +} + /// Provide an interface for C to translate arguments and return types for /// protover::list_supports_protocol_or_later #[no_mangle] diff --git a/src/test/test_protover.c b/src/test/test_protover.c index a7d4667df..0948cd564 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -317,6 +317,7 @@ test_protover_all_supported(void *arg) tor_end_capture_bugs_(); /* Protocol name too long */ +#ifndef HAVE_RUST // XXXXXX ????? tor_capture_bugs_(1); tt_assert(protover_all_supported( "DoSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" @@ -324,6 +325,7 @@ test_protover_all_supported(void *arg) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaa=1-65536", &msg)); tor_end_capture_bugs_(); +#endif done: tor_end_capture_bugs_();

1 0

[translation/torbutton-torbuttondtd_completed] Update translations for torbutton-torbuttondtd_completed
by translation＠torproject.org 22 May '18

22 May '18

commit 2e8a6b04e5bab0fed7d766df27871d36e4a7215d Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 22 17:17:39 2018 +0000 Update translations for torbutton-torbuttondtd_completed --- es/torbutton.dtd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/es/torbutton.dtd b/es/torbutton.dtd index 69f479a90..465fea873 100644 --- a/es/torbutton.dtd +++ b/es/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Algunas fuentes y símbolos matemáticos están deshabilitados."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algunas fuentes, iconos, símbolos matemáticos, e imágenes están deshabilitados."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio y vídeo (medios HTML5) son de tipo pulsar-para-reproducir."> -<!ENTITY torbutton.circuit_display.title "Circuito Tor para este sitio"> +<!ENTITY torbutton.circuit_display.title "Circuito Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Nuevo Circuito para este Sitio">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 22 May '18

22 May '18

commit b91f17916236e2f7e082171c97d9e9b42309105c Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 22 17:17:33 2018 +0000 Update translations for torbutton-torbuttondtd --- es/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/torbutton.dtd b/es/torbutton.dtd index a851b1181..465fea873 100644 --- a/es/torbutton.dtd +++ b/es/torbutton.dtd @@ -47,5 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Algunas fuentes y símbolos matemáticos están deshabilitados."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algunas fuentes, iconos, símbolos matemáticos, e imágenes están deshabilitados."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio y vídeo (medios HTML5) son de tipo pulsar-para-reproducir."> -<!ENTITY torbutton.circuit_display.title "Tor Circuit"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> +<!ENTITY torbutton.circuit_display.title "Circuito Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Nuevo Circuito para este Sitio">

1 0

[tor/maint-0.3.3] uint breaks compilation on windows
by nickm＠torproject.org 22 May '18

22 May '18

commit 240bb177140099690213dfc524a235abd2aa0eb8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 22 12:54:05 2018 -0400 uint breaks compilation on windows --- src/or/protover.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/protover.c b/src/or/protover.c index 94e6b11c4..ae6cda092 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -53,7 +53,7 @@ static const struct { /* Maximum allowed length of any single subprotocol name. */ // C_RUST_COUPLED: src/rust/protover/protover.rs // `MAX_PROTOCOL_NAME_LENGTH` -static const uint MAX_PROTOCOL_NAME_LENGTH = 100; +static const unsigned MAX_PROTOCOL_NAME_LENGTH = 100; /** * Given a protocol_type_t, return the corresponding string used in

1 0

[tor/maint-0.3.3] Merge branch 'trove-2018-005_032' into maint-0.3.3
by nickm＠torproject.org 22 May '18

22 May '18

commit 6e8e005b531c9061866bb4f601e4b97814834687 Merge: 074b182ba 240bb1771 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 22 12:54:26 2018 -0400 Merge branch 'trove-2018-005_032' into maint-0.3.3 src/or/protover.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] uint breaks compilation on windows
by nickm＠torproject.org 22 May '18

22 May '18

commit 240bb177140099690213dfc524a235abd2aa0eb8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 22 12:54:05 2018 -0400 uint breaks compilation on windows --- src/or/protover.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/protover.c b/src/or/protover.c index 94e6b11c4..ae6cda092 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -53,7 +53,7 @@ static const struct { /* Maximum allowed length of any single subprotocol name. */ // C_RUST_COUPLED: src/rust/protover/protover.rs // `MAX_PROTOCOL_NAME_LENGTH` -static const uint MAX_PROTOCOL_NAME_LENGTH = 100; +static const unsigned MAX_PROTOCOL_NAME_LENGTH = 100; /** * Given a protocol_type_t, return the corresponding string used in

1 0