Merge pull request #27 from RustCrypto/fix-word-idx-warning

salsa20-core: Address `word_idx`-related warning (closes #23)
RustCrypto · Aug 13, 2019 · daafc49 · daafc49
2 parents b08e245 + 2284811
commit daafc49
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/salsa20-core/src/salsa_family_state.rs b/salsa20-core/src/salsa_family_state.rs
@@ -90,18 +90,10 @@ pub trait SalsaFamilyCipher {
                                 i += 1;
                             }
                         }
-
-                        self.next_block();
-                    } else {
-                        // TODO(tarcieri): is this else clause unnecessary or is there a bug?
-                        // See: <https://github.com/RustCrypto/stream-ciphers/issues/23>
-                        #[allow(unused_assignments)]
-                        {
-                            word_idx = 0;
-                            self.next_block();
-                        }
                     }
 
+                    self.next_block();
+
                     let nblocks = (datalen - i) / 64;
                     let leftover = (datalen - i) % 64;