remove rand_core-0.7-dependent test; remove unnecessary comments; ren…

…ame LesserBlock to Block

.gitignore

@@ -1,3 +1,4 @@
 target/
 **/Cargo.lock
-*/.cargo/config
+*/.cargo/config
+.vscode/

chacha20/Cargo.toml

@@ -21,7 +21,7 @@ categories = ["cryptography", "no-std"]
 [dependencies]
 cfg-if = "1"
 cipher = "0.4.4"
-rand_core = { version = "0.7.0", git = "https://github.com/rust-random/rand.git", package = "rand_core", branch = "master", optional = true, default-features = false, features = ["getrandom"] }
+rand_core = { version = "0.6.4", optional = true, default-features = false, features = ["getrandom"] }
 serde = { version = "1.0", features = ["derive"], optional = true }
 
 [target.'cfg(any(target_arch = "x86_64", target_arch = "x86"))'.dependencies]

chacha20/src/rng.rs

@@ -61,9 +61,7 @@ impl AsMut<[u32]> for BlockRngResults {
 impl BlockSizeUser for BlockRngResults {
     type BlockSize = U64;
     fn block_size() -> usize {
-        256 // for U32x64
-            //512 // for U64x64
-            //256 // for U64x32
+        256
     }
 }
 
@@ -79,20 +77,20 @@ impl ZeroizeOnDrop for BlockRngResults {}
 
 /// This is the internal block of ChaChaCore
 #[derive(Copy, Clone)]
-struct LesserBlock(GenericArray<u8, U64>);
-impl AsRef<[u8]> for LesserBlock {
+struct Block(GenericArray<u8, U64>);
+impl AsRef<[u8]> for Block {
     fn as_ref(&self) -> &[u8] {
         &self.0
     }
 }
 
-impl BlockSizeUser for LesserBlock {
+impl BlockSizeUser for Block {
     type BlockSize = U64;
     fn block_size() -> usize {
         64
     }
 }
-impl ParBlocksSizeUser for LesserBlock {
+impl ParBlocksSizeUser for Block {
     type ParBlocksSize = U4;
 }
 
@@ -237,7 +235,7 @@ macro_rules! impl_chacha_rng {
         #[derive(Clone)]
         pub struct $ChaChaXCore {
             block: ChaChaCore<$rounds>,
-            parallel_blocks: ParBlocks<LesserBlock>,
+            parallel_blocks: ParBlocks<Block>,
             counter: u32,
         }
 
@@ -260,10 +258,6 @@ macro_rules! impl_chacha_rng {
             type Results = BlockRngResults;
 
             fn generate(&mut self, results: &mut Self::Results) {
-                // builds a wide buffer to send into Backend .gen_par_ks_blocks()
-                // through StreamBackend's .write_keystream_blocks()
-                // Buffer is [[u8; 64]; 4] and will run .gen_ks_block() 4 times if
-                // it uses soft.rs instead of SIMD
                 self.block.write_keystream_blocks(&mut self.parallel_blocks);
                 let mut offset = 0;
                 for block in self.parallel_blocks {
@@ -528,9 +522,6 @@ mod tests {
 
         assert_eq!(rng.get_seed(), seed);
         assert_eq!(rng.get_stream(), stream);
-        // set_word_pos() rounds it down to the nearest multiple of 16
-        // which would fail this:
-        // assert_eq!(rng.get_word_pos(), word_pos);
         assert_eq!(rng.get_word_pos(), original_rng.get_word_pos() as u64);
         assert_eq!(rng.get_word_pos(), word_pos);
     }
@@ -829,14 +820,14 @@ mod tests {
         assert_eq!(rng.get_word_pos(), 0);
     }
 
-    #[test]
-    fn test_trait_objects() {
-        use rand_core::CryptoRng;
+    // #[test]
+    // fn test_trait_objects() {
+    //     use rand_core::CryptoRng;
 
-        let mut rng1 = ChaChaRng::from_seed(Default::default());
-        let rng2 = &mut rng1.clone() as &mut dyn CryptoRng;
-        for _ in 0..1000 {
-            assert_eq!(rng1.next_u64(), rng2.next_u64());
-        }
-    }
+    //     let mut rng1 = ChaChaRng::from_seed(Default::default());
+    //     let rng2 = &mut rng1.clone() as &mut dyn CryptoRng;
+    //     for _ in 0..1000 {
+    //         assert_eq!(rng1.next_u64(), rng2.next_u64());
+    //     }
+    // }
 }