commit e2261e77272bd57fa20fc00f436feb4f57d52739 Merge: 23811052f 508332fea Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 18 16:12:29 2018 -0400

Merge remote-tracking branch 'isis/bug26398'

src/rust/Cargo.toml | 9 +++++++++ src/rust/crypto/Cargo.toml | 4 ++++ src/rust/crypto/digests/sha2.rs | 6 ++++++ 3 files changed, 19 insertions(+)

diff --cc src/rust/crypto/Cargo.toml index 869e0d625,c31c8e185..d68ac48e2 --- a/src/rust/crypto/Cargo.toml +++ b/src/rust/crypto/Cargo.toml @@@ -26,3 -25,9 +26,7 @@@ rand = { version = "=0.5.0-pre.2", defa rand_core = { version = "=0.2.0-pre.0", default-features = false }

[features] -testing = ["tor_log/testing"] + # If this feature is enabled, test code which calls Tor C code from Rust will + # execute with `cargo test`. Due to numerous linker issues (#25386), this is + # currently disabled by default. + test-c-from-rust = [] - diff --cc src/rust/crypto/digests/sha2.rs index 03e0843dc,bb610ed9e..d0246eeb9 --- a/src/rust/crypto/digests/sha2.rs +++ b/src/rust/crypto/digests/sha2.rs @@@ -190,9 -191,10 +194,10 @@@ mod test

println!("{:?}", &result[..]);

- assert_eq!(&result[..], &b"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"[..]); + assert_eq!(result, expected); }

+ #[cfg(feature = "test-c-from-rust")] #[test] fn sha512_default() { let _: Sha512 = Sha512::default();