commit e6aa2d526e84e4ea19e1841b56be8cf58b0c6cfb Author: Nick Mathewson <nickm@torproject.org> Date: Sat Jun 16 13:22:44 2018 -0400 Changes to make the rust crypto::mod tests compile The digest tests don't link yet, though. --- src/rust/crypto/lib.rs | 8 ++++++++ src/rust/crypto/rand/mod.rs | 10 ---------- src/rust/crypto/rand/rng.rs | 4 ++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/rust/crypto/lib.rs b/src/rust/crypto/lib.rs index b349664db..b4250dec3 100644 --- a/src/rust/crypto/lib.rs +++ b/src/rust/crypto/lib.rs @@ -29,9 +29,17 @@ // External crates from cargo or TOR_RUST_DEPENDENCIES. extern crate digest; extern crate libc; +extern crate rand_core; + +// External dependencies for tests. +#[cfg(test)] +extern crate rand as rand_crate; // Our local crates. extern crate external; +#[cfg(not(test))] +#[macro_use] +extern crate tor_log; pub mod digests; // Unfortunately named "digests" plural to avoid name conflict with the digest crate pub mod rand; diff --git a/src/rust/crypto/rand/mod.rs b/src/rust/crypto/rand/mod.rs index 6b3058ad5..82d02a70b 100644 --- a/src/rust/crypto/rand/mod.rs +++ b/src/rust/crypto/rand/mod.rs @@ -2,15 +2,5 @@ // Copyright (c) 2018, isis agora lovecruft // See LICENSE for licensing information -// External dependencies -#[cfg(test)] -extern crate rand; -extern crate rand_core; - // Internal dependencies -extern crate external; -#[cfg(not(test))] -#[macro_use] -extern crate tor_log; - pub mod rng; diff --git a/src/rust/crypto/rand/rng.rs b/src/rust/crypto/rand/rng.rs index d5fae8a32..07a0a7bdc 100644 --- a/src/rust/crypto/rand/rng.rs +++ b/src/rust/crypto/rand/rng.rs @@ -130,8 +130,8 @@ mod internal { #[cfg(test)] mod internal { // It doesn't matter if we pretend ChaCha is a CSPRNG in tests. - pub use rand::ChaChaRng as TorRng; - pub use rand::ChaChaRng as TorStrongestRng; + pub use rand_crate::ChaChaRng as TorRng; + pub use rand_crate::ChaChaRng as TorStrongestRng; } // Finally, expose the public functionality of whichever appropriate internal