From 6bbfba3c39a74822e782f827096f1a09b14b2dd7 Mon Sep 17 00:00:00 2001 From: Noah Stiltner Date: Wed, 13 Dec 2023 19:54:54 -0600 Subject: [PATCH] removed unnecessary dev dependencies --- Cargo.lock | 51 --------------------------------------------- chacha20/Cargo.toml | 2 -- chacha20/src/rng.rs | 51 +-------------------------------------------- 3 files changed, 1 insertion(+), 103 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca8daa9c..0d8a415d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9,15 +9,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "847495c209977a90e8aad588b959d0ca9f5dc228096d29a6bd3defd53f35eaec" -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - [[package]] name = "block-padding" version = "0.3.3" @@ -45,8 +36,6 @@ dependencies = [ "rand_core", "serde", "serde_json", - "sha2", - "sha3", "zeroize", ] @@ -81,16 +70,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -142,15 +121,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" -[[package]] -name = "keccak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" -dependencies = [ - "cpufeatures", -] - [[package]] name = "libc" version = "0.2.149" @@ -261,27 +231,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha3" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" -dependencies = [ - "digest", - "keccak", -] - [[package]] name = "syn" version = "2.0.38" diff --git a/chacha20/Cargo.toml b/chacha20/Cargo.toml index dc1248b2..8c65db19 100644 --- a/chacha20/Cargo.toml +++ b/chacha20/Cargo.toml @@ -32,8 +32,6 @@ cipher = { version = "0.4.4", features = ["dev"] } hex-literal = "0.3.3" rand_chacha = "0.3.1" serde_json = "1.0" # Only to test serde1 -sha2 = "0.10" # For testing fill_bytes() -sha3 = "0.10" # Also for testing fill_bytes(), but it may be unnecessary [features] default = ["cipher"] diff --git a/chacha20/src/rng.rs b/chacha20/src/rng.rs index bf62239b..65085264 100644 --- a/chacha20/src/rng.rs +++ b/chacha20/src/rng.rs @@ -1033,56 +1033,7 @@ mod tests { assert_eq!(rng.get_word_pos(), 0); } - #[test] - /// The hash values from this are from a previous working version of the RNG - fn test_fill_bytes_hashes() { - use hex_literal::hex; - use sha2::{Digest, Sha256, Sha512}; - use sha3::{Sha3_256, Sha3_512}; - - let mut rng = ChaCha20Rng::from_seed([0u8; 32]); - let mut samples = [0u8; 4192]; - rng.fill_bytes(&mut samples[0..3]); - rng.fill_bytes(&mut samples[3..15]); - rng.fill_bytes(&mut samples[15..907]); - rng.fill_bytes(&mut samples[907..938]); - rng.fill_bytes(&mut samples[938..1735]); - rng.fill_bytes(&mut samples[1735..1800]); - rng.fill_bytes(&mut samples[1800..2204]); - rng.fill_bytes(&mut samples[2204..2222]); - rng.fill_bytes(&mut samples[2222..2500]); - rng.fill_bytes(&mut samples[2500..2525]); - rng.fill_bytes(&mut samples[2525..3001]); - rng.fill_bytes(&mut samples[3001..3800]); - rng.fill_bytes(&mut samples[3800..4192]); - - let mut hasher = Sha256::new(); - hasher.update(samples); - let sha256 = hasher.finalize(); - assert_eq!( - sha256, - hex!("ded7b3a2b6a1cce08021a7130fee540ee44271af307b296b67c712c3543c3d66").into() - ); - let mut hasher = Sha512::new(); - hasher.update(samples); - let sha512 = hasher.finalize(); - assert_eq!(sha512, hex!("378c5ccb5f7239635a5a2470168a7c9d9ed03780d83e52ec046429fb0061ea202f2f603fa51c8f33f73fbf889fc666394ab33963a640d658e18fd32041d86ed6").into()); - - let mut hasher = Sha3_256::new(); - hasher.update(samples); - let sha3_256 = hasher.finalize(); - assert_eq!( - sha3_256, - hex!("8c7a9aeb2f5a5c2b2f9a045acd6ca9961b466be6a4d6939c76a6edb714ded194").into() - ); - - // testing - let mut hasher = Sha3_512::new(); - hasher.update(samples); - let sha3_512 = hasher.finalize(); - assert_eq!(sha3_512, hex!("299604773b3aa69c28376677c7fb8a242d6fda6083f8ecabbb637a0bbf500f6a45006b1705b08d2a268a02319f97a8bc257600fb29bd7029fb5116039b4809fb").into()); - } - + // test for next rand_core version // #[test] // fn test_trait_objects() { // use rand_core::CryptoRng;