mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/406'

Browse source
This commit is contained in:
Nick Mathewson 2018-10-16 21:33:38 -04:00
commit 34cd1fc523
3 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/rust/external/external.rs vendored
View file

@ -32,7 +32,6 @@ extern "C" {
} }
/// Return true if Tor was built to use NSS. /// Return true if Tor was built to use NSS.
pub fn c_tor_is_using_nss() -> bool pub fn c_tor_is_using_nss() -> bool {
{
0 != unsafe { tor_is_using_nss() } 0 != unsafe { tor_is_using_nss() }
} }

2
src/rust/protover/protoset.rs
View file

@ -290,7 +290,7 @@ impl ProtoSet {
}); });
let pairs = pairs.collect(); let pairs = pairs.collect();
ProtoSet::is_ok(ProtoSet{ pairs }).expect("should be already sorted") ProtoSet::is_ok(ProtoSet { pairs }).expect("should be already sorted")
} }
} }

14
src/rust/protover/protover.rs
View file

@ -124,15 +124,15 @@ impl From<Protocol> for UnknownProtocol {
} }
} }
#[cfg(feature="test_linking_hack")] #[cfg(feature = "test_linking_hack")]
fn have_linkauth_v1() -> bool { fn have_linkauth_v1() -> bool {
true true
} }
#[cfg(not(feature="test_linking_hack"))] #[cfg(not(feature = "test_linking_hack"))]
fn have_linkauth_v1() -> bool { fn have_linkauth_v1() -> bool {
use external::c_tor_is_using_nss; use external::c_tor_is_using_nss;
! c_tor_is_using_nss() !c_tor_is_using_nss()
} }
/// Get a CStr representation of current supported protocols, for /// Get a CStr representation of current supported protocols, for
@ -152,8 +152,9 @@ fn have_linkauth_v1() -> bool {
/// ///
// C_RUST_COUPLED: protover.c `protover_get_supported_protocols` // C_RUST_COUPLED: protover.c `protover_get_supported_protocols`
pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { pub(crate) fn get_supported_protocols_cstr() -> &'static CStr {
if ! have_linkauth_v1() { if !have_linkauth_v1() {
cstr!("Cons=1-2 \ cstr!(
"Cons=1-2 \
Desc=1-2 \ Desc=1-2 \
DirCache=1-2 \ DirCache=1-2 \
HSDir=1-2 \ HSDir=1-2 \
@ -165,7 +166,8 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr {
Relay=1-2" Relay=1-2"
) )
} else { } else {
cstr!("Cons=1-2 \ cstr!(
"Cons=1-2 \
Desc=1-2 \ Desc=1-2 \
DirCache=1-2 \ DirCache=1-2 \
HSDir=1-2 \ HSDir=1-2 \