Add engine_input_impl! macro.

This was previously removed to aid restructuring, but should be added
back so we don't have to remember to modify every HashEngine every time
we modify the input function.

Author: dongcarl

src/ripemd160.rs

@@ -64,29 +64,7 @@ impl EngineTrait for HashEngine {
 
     const BLOCK_SIZE: usize = 64;
 
-    #[cfg(not(feature = "fuzztarget"))]
-    fn input(&mut self, mut inp: &[u8]) {
-        while !inp.is_empty() {
-            let buf_idx = self.length % <Self as EngineTrait>::BLOCK_SIZE;
-            let rem_len = <Self as EngineTrait>::BLOCK_SIZE - buf_idx;
-            let write_len = cmp::min(rem_len, inp.len());
-            
-            self.buffer[buf_idx..buf_idx + write_len].copy_from_slice(&inp[..write_len]);
-            self.length += write_len;
-            if self.length % <Self as EngineTrait>::BLOCK_SIZE == 0 {
-                self.process_block();
-            }
-            inp = &inp[write_len..];
-        }
-    }
-
-    #[cfg(feature = "fuzztarget")]
-    fn input(&mut self, inp: &[u8]) {
-        for c in inp {
-            self.buffer[0] ^= *c;
-        }
-        self.length += inp.len();
-    }
+    engine_input_impl!();
 }
 
 /// Output of the RIPEMD160 hash function

src/sha1.rs

@@ -51,29 +51,8 @@ impl EngineTrait for HashEngine {
 
 
     const BLOCK_SIZE: usize = 64;
-    #[cfg(not(feature = "fuzztarget"))]
-    fn input(&mut self, mut inp: &[u8]) {
-        while !inp.is_empty() {
-            let buf_idx = self.length % <Self as EngineTrait>::BLOCK_SIZE;
-            let rem_len = <Self as EngineTrait>::BLOCK_SIZE - buf_idx;
-            let write_len = cmp::min(rem_len, inp.len());
-        
-            self.buffer[buf_idx..buf_idx + write_len].copy_from_slice(&inp[..write_len]);
-            self.length += write_len;
-            if self.length % <Self as EngineTrait>::BLOCK_SIZE == 0 {
-                self.process_block();
-            }
-            inp = &inp[write_len..];
-        }
-    }
-    
-    #[cfg(feature = "fuzztarget")]
-    fn input(&mut self, inp: &[u8]) {
-        for c in inp {
-            self.buffer[0] ^= *c;
-        }
-        self.length += inp.len();
-    }
+
+    engine_input_impl!();
 }
 
 /// Output of the SHA1 hash function

src/sha256.rs

@@ -60,30 +60,7 @@ impl EngineTrait for HashEngine {
 
     const BLOCK_SIZE: usize = 64;
 
-    #[cfg(not(feature = "fuzztarget"))]
-    fn input(&mut self, mut inp: &[u8]) {
-        while !inp.is_empty() {
-            let buf_idx = self.length % <Self as EngineTrait>::BLOCK_SIZE;
-            let rem_len = <Self as EngineTrait>::BLOCK_SIZE - buf_idx;
-            let write_len = cmp::min(rem_len, inp.len());
-
-            self.buffer[buf_idx..buf_idx + write_len]
-                .copy_from_slice(&inp[..write_len]);
-            self.length += write_len;
-            if self.length % <Self as EngineTrait>::BLOCK_SIZE == 0 {
-                self.process_block();
-            }
-            inp = &inp[write_len..];
-        }
-    }
-
-    #[cfg(feature = "fuzztarget")]
-    fn input(&mut self, inp: &[u8]) {
-        for c in inp {
-            self.buffer[0] ^= *c;
-        }
-        self.length += inp.len();
-    }
+    engine_input_impl!();
 }
 
 /// Output of the SHA256 hash function

src/sha512.rs

@@ -65,29 +65,7 @@ impl EngineTrait for HashEngine {
 
     const BLOCK_SIZE: usize = 128;
 
-    #[cfg(not(feature = "fuzztarget"))]
-    fn input(&mut self, mut inp: &[u8]) {
-        while !inp.is_empty() {
-            let buf_idx = self.length % <Self as EngineTrait>::BLOCK_SIZE;
-            let rem_len = <Self as EngineTrait>::BLOCK_SIZE - buf_idx;
-            let write_len = cmp::min(rem_len, inp.len());
-        
-            self.buffer[buf_idx..buf_idx + write_len].copy_from_slice(&inp[..write_len]);
-            self.length += write_len;
-            if self.length % <Self as EngineTrait>::BLOCK_SIZE == 0 {
-                self.process_block();
-            }
-            inp = &inp[write_len..];
-        }
-    }
-    
-    #[cfg(feature = "fuzztarget")]
-    fn input(&mut self, inp: &[u8]) {
-        for c in inp {
-            self.buffer[0] ^= *c;
-        }
-        self.length += inp.len();
-    }
+    engine_input_impl!();
 }
 
 /// Output of the SHA256 hash function

src/util.rs

@@ -99,6 +99,35 @@ macro_rules! borrow_slice_impl(
     )
 );
 
+macro_rules! engine_input_impl(
+    () => (
+        #[cfg(not(feature = "fuzztarget"))]
+        fn input(&mut self, mut inp: &[u8]) {
+            while !inp.is_empty() {
+                let buf_idx = self.length % <Self as EngineTrait>::BLOCK_SIZE;
+                let rem_len = <Self as EngineTrait>::BLOCK_SIZE - buf_idx;
+                let write_len = cmp::min(rem_len, inp.len());
+
+                self.buffer[buf_idx..buf_idx + write_len]
+                    .copy_from_slice(&inp[..write_len]);
+                self.length += write_len;
+                if self.length % <Self as EngineTrait>::BLOCK_SIZE == 0 {
+                    self.process_block();
+                }
+                inp = &inp[write_len..];
+            }
+        }
+
+        #[cfg(feature = "fuzztarget")]
+        fn input(&mut self, inp: &[u8]) {
+            for c in inp {
+                self.buffer[0] ^= *c;
+            }
+            self.length += inp.len();
+        }
+    )
+);
+
 #[cfg(test)]
 mod test {
     use Hash;