Browse Source

Implement Default for state

pull/9/merge
Cesar Eduardo Barros 6 years ago
parent
commit
38f2642ca3
  1. 10
      src/blake2.rs
  2. 9
      src/blake2b.rs
  3. 9
      src/blake2s.rs

10
src/blake2.rs

@ -283,6 +283,12 @@ macro_rules! blake2_impl {
}
}
impl Default for $state {
fn default() -> Self {
Self::new($bytes)
}
}
#[cfg(feature = "std")]
impl io::Write for $state {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
@ -354,7 +360,7 @@ macro_rules! blake2_selftest_impl {
}
macro_rules! blake2_bench_impl {
($state:ident, $bytes:expr) => {
($state:ident) => {
#[cfg(all(feature = "bench", test))]
mod bench {
use std::iter::repeat;
@ -372,7 +378,7 @@ macro_rules! blake2_bench_impl {
b.bytes = bytes as u64;
b.iter(|| {
let mut state = $state::new($bytes);
let mut state = $state::default();
state.update(&data[..]);
state.finalize()
})

9
src/blake2b.rs

@ -50,7 +50,7 @@ blake2_selftest_impl!(Blake2b, blake2b, [
0x7F, 0x5E, 0x76, 0x5A, 0x7B, 0xCC, 0xD4, 0x75,
], [ 20, 32, 48, 64 ], [ 0, 3, 128, 129, 255, 1024 ]);
blake2_bench_impl!(Blake2b, 64);
blake2_bench_impl!(Blake2b);
#[cfg(test)]
mod tests {
@ -69,6 +69,13 @@ mod tests {
.unwrap()[..]);
}
#[test]
fn test_default() {
assert_eq!(&Blake2b::default().finalize(), &HEXUPPER.decode(
b"786A02F742015903C6C6FD852552D272912F4740E15847618A86E217F71F5419D25E1031AFEE585313896444934EB04B903A685B1448B755D56F701AFE9BE2CE")
.unwrap()[..]);
}
#[test]
fn selftest() {
super::selftest();

9
src/blake2s.rs

@ -48,7 +48,7 @@ blake2_selftest_impl!(Blake2s, blake2s, [
0xFB, 0xDC, 0x88, 0x79, 0x7F, 0x4C, 0x1D, 0xFE,
], [ 16, 20, 28, 32 ], [ 0, 3, 64, 65, 255, 1024 ]);
blake2_bench_impl!(Blake2s, 32);
blake2_bench_impl!(Blake2s);
#[cfg(test)]
mod tests {
@ -67,6 +67,13 @@ mod tests {
.unwrap()[..]);
}
#[test]
fn test_default() {
assert_eq!(&Blake2s::default().finalize(), &HEXUPPER.decode(
b"69217A3079908094E11121D042354A7C1F55B6482CA1A51E1B250DFD1ED0EEF9")
.unwrap()[..]);
}
#[test]
fn selftest() {
super::selftest();

Loading…
Cancel
Save