Drop rust-crypto trait usage

[rust-lightning] / src / util / mod.rs

diff --git a/src/util/mod.rs b/src/util/mod.rs
index b91b4f25d96fa116ea92b473e0b69c313b178919..1a6eb80493404e88a591005d17d1f2480118f7b4 100644 (file)
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -5,6 +5,8 @@ pub mod errors;
 pub mod ser;
 
 pub(crate) mod byte_utils;
+pub(crate) mod chacha20;
+pub(crate) mod poly1305;
 pub(crate) mod chacha20poly1305rfc;
 pub(crate) mod internal_traits;
 pub(crate) mod rng;
@@ -15,16 +17,12 @@ pub(crate) mod ser_macros;
 #[macro_use]
 pub(crate) mod macro_logger;
 
-// Logger has to come after macro_logger for tests to build:
+// These have to come after macro_logger to build
 pub mod logger;
+pub mod config;
 
 #[cfg(feature = "fuzztarget")]
-pub mod sha2;
-#[cfg(not(feature = "fuzztarget"))]
-pub(crate) mod sha2;
-
-#[cfg(feature = "fuzztarget")]
-pub use self::rng::reset_rng_state;
+pub use self::rng::{reset_rng_state, fill_bytes};
 
 #[cfg(test)]
 pub(crate) mod test_utils;