Skip to content

Commit

Permalink
Merge a2066b4 into e75fc70
Browse files Browse the repository at this point in the history
  • Loading branch information
@hauleth
hauleth committed Nov 5, 2015
2 parents e75fc70 + a2066b4 commit 129242b
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 39 deletions.
8 changes: 4 additions & 4 deletions benches/digest/sha3.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@ mod sha224 {

use octavo::digest::sha3;

bench_digest!(sha3::Sha3224);
bench_digest!(sha3::Sha224);
}

mod sha256 {
use test::Bencher;

use octavo::digest::sha3;

bench_digest!(sha3::Sha3256);
bench_digest!(sha3::Sha256);
}

mod sha384 {
use test::Bencher;

use octavo::digest::sha3;

bench_digest!(sha3::Sha3384);
bench_digest!(sha3::Sha384);
}

mod sha512 {
use test::Bencher;

use octavo::digest::sha3;

bench_digest!(sha3::Sha3512);
bench_digest!(sha3::Sha512);
}
29 changes: 14 additions & 15 deletions examples/sums.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ use octavo::digest::md4::Md4;
use octavo::digest::md5::Md5;
use octavo::digest::ripemd::Ripemd160;
use octavo::digest::sha1::Sha1;
use octavo::digest::sha2::*;
use octavo::digest::sha3::*;
use octavo::digest::{sha2, sha3};
use octavo::digest::tiger::Tiger;

fn hex<T: AsRef<[u8]>, D: Digest>(data: T, mut digest: D) -> String {
Expand All @@ -33,17 +32,17 @@ fn main() {

println!("Data: {:?}\n", data);

println!("MD4: {}", hex(&data, Md4::default()));
println!("MD5: {}", hex(&data, Md5::default()));
println!("RIPEMD160: {}", hex(&data, Ripemd160::default()));
println!("SHA1: {}", hex(&data, Sha1::default()));
println!("SHA224: {}", hex(&data, Sha224::default()));
println!("SHA256: {}", hex(&data, Sha256::default()));
println!("SHA384: {}", hex(&data, Sha384::default()));
println!("SHA512: {}", hex(&data, Sha512::default()));
println!("SHA3-224: {}", hex(&data, Sha3224::default()));
println!("SHA3-256: {}", hex(&data, Sha3256::default()));
println!("SHA3-384: {}", hex(&data, Sha3384::default()));
println!("SHA3-512: {}", hex(&data, Sha3512::default()));
println!("Tiger: {}", hex(&data, Tiger::default()));
println!("MD4: {}", hex(&data, Md4::default()));
println!("MD5: {}", hex(&data, Md5::default()));
println!("RIPEMD-160: {}", hex(&data, Ripemd160::default()));
println!("SHA-1: {}", hex(&data, Sha1::default()));
println!("SHA-224: {}", hex(&data, sha2::Sha224::default()));
println!("SHA-256: {}", hex(&data, sha2::Sha256::default()));
println!("SHA-384: {}", hex(&data, sha2::Sha384::default()));
println!("SHA-512: {}", hex(&data, sha2::Sha512::default()));
println!("SHA3-224: {}", hex(&data, sha3::Sha224::default()));
println!("SHA3-256: {}", hex(&data, sha3::Sha256::default()));
println!("SHA3-384: {}", hex(&data, sha3::Sha384::default()));
println!("SHA3-512: {}", hex(&data, sha3::Sha512::default()));
println!("Tiger: {}", hex(&data, Tiger::default()));
}
12 changes: 6 additions & 6 deletions src/bin/sum.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use octavo::digest::*;
const ENGINES: &'static [&'static str] = &["MD4",
"MD5",
"RIPEMD-160",
"SHA1",
"SHA-1",
"SHA-224",
"SHA-256",
"SHA-384",
Expand Down Expand Up @@ -88,15 +88,15 @@ fn main() {
"MD4" => md4::Md4,
"MD5" => md5::Md5,
"RIPEMD-160" => ripemd::Ripemd160,
"SHA1" => sha1::Sha1,
"SHA-1" => sha1::Sha1,
"SHA-224" => sha2::Sha224,
"SHA-256" => sha2::Sha256,
"SHA-384" => sha2::Sha384,
"SHA-512" => sha2::Sha512,
"SHA3-224" => sha3::Sha3224,
"SHA3-256" => sha3::Sha3256,
"SHA3-384" => sha3::Sha3384,
"SHA3-512" => sha3::Sha3512,
"SHA3-224" => sha3::Sha224,
"SHA3-256" => sha3::Sha256,
"SHA3-384" => sha3::Sha384,
"SHA3-512" => sha3::Sha512,
"Tiger" => tiger::Tiger,
}
};
Expand Down
28 changes: 14 additions & 14 deletions src/digest/sha3.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,15 @@ macro_rules! sha3_impl {
}
}

sha3_impl!(Sha3224 -> 224);
sha3_impl!(Sha3256 -> 256);
sha3_impl!(Sha3384 -> 384);
sha3_impl!(Sha3512 -> 512);
sha3_impl!(Sha224 -> 224);
sha3_impl!(Sha256 -> 256);
sha3_impl!(Sha384 -> 384);
sha3_impl!(Sha512 -> 512);

#[cfg(test)]
mod tests {
mod sha3224 {
use digest::sha3::Sha3224;
mod sha224 {
use digest::sha3::Sha224;
use digest::test::Test;

const TESTS: &'static [Test<'static>] = &[
Expand All @@ -248,13 +248,13 @@ mod tests {
#[test]
fn simple_test_vectors() {
for test in TESTS {
test.test(Sha3224::default());
test.test(Sha224::default());
}
}
}

mod sha3256 {
use digest::sha3::Sha3256;
mod sha256 {
use digest::sha3::Sha256;
use digest::test::Test;

const TESTS: &'static [Test<'static>] = &[
Expand All @@ -271,13 +271,13 @@ mod tests {
#[test]
fn simple_test_vectors() {
for test in TESTS {
test.test(Sha3256::default());
test.test(Sha256::default());
}
}
}

mod sha3384 {
use digest::sha3::Sha3384;
use digest::sha3::Sha384;
use digest::test::Test;

const TESTS: &'static [Test<'static>] = &[
Expand All @@ -294,13 +294,13 @@ mod tests {
#[test]
fn simple_test_vectors() {
for test in TESTS {
test.test(Sha3384::default());
test.test(Sha384::default());
}
}
}

mod sha3512 {
use digest::sha3::Sha3512;
use digest::sha3::Sha512;
use digest::test::Test;

const TESTS: &'static [Test<'static>] = &[
Expand All @@ -318,7 +318,7 @@ mod tests {
#[test]
fn simple_test_vectors() {
for test in TESTS {
test.test(Sha3512::default());
test.test(Sha512::default());
}
}
}
Expand Down

0 comments on commit 129242b

Please sign in to comment.