hatter/digest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update format

Browse Source
This commit is contained in:
Hatter Jiang
2019-11-24 13:20:48 +08:00
parent 16c1c7d178
commit 2cf731dd42
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.rs
View File

@@ -68,9 +68,7 @@ fn main() -> XResult<()> {
if options.file_name_list.is_empty() { if options.file_name_list.is_empty() {
let boxed_digest = get_digest_by_algorithm(the_algo.as_str(), &options); let boxed_digest = get_digest_by_algorithm(the_algo.as_str(), &options);
match boxed_digest { match boxed_digest {
Some(mut digest) => { Some(mut digest) => println!("{} - ({})", calc_digest_stdin(&mut *digest)?, the_algo),
println!("{} - ({})", calc_digest_stdin(&mut *digest)?, the_algo);
},
None => match the_algo.as_str() { None => match the_algo.as_str() {
"SM3" => println!("{} - ({})", hex::encode(Sm3Hash::new(&read_full_stdin()?).get_hash()), the_algo), "SM3" => println!("{} - ({})", hex::encode(Sm3Hash::new(&read_full_stdin()?).get_hash()), the_algo),
_ => print_message(MessageType::ERROR, &format!("Unknown algorithm: {}", options.algorithm)), _ => print_message(MessageType::ERROR, &format!("Unknown algorithm: {}", options.algorithm)),
@@ -81,9 +79,7 @@ fn main() -> XResult<()> {
let the_fn = f.as_str(); let the_fn = f.as_str();
let boxed_digest = get_digest_by_algorithm(the_algo.as_str(), &options); let boxed_digest = get_digest_by_algorithm(the_algo.as_str(), &options);
match boxed_digest { match boxed_digest {
Some(mut digest) => { Some(mut digest) => println!("{} - {} ({})", calc_file_digest(&mut *digest, the_fn)?, the_fn, the_algo),
println!("{} - {} ({})", calc_file_digest(&mut *digest, the_fn)?, the_fn, the_algo);
},
None => match the_algo.as_str() { None => match the_algo.as_str() {
"SM3" => println!("{} - {} ({})", hex::encode(Sm3Hash::new(&read_file_full(the_fn)?).get_hash()), the_fn, the_algo), "SM3" => println!("{} - {} ({})", hex::encode(Sm3Hash::new(&read_file_full(the_fn)?).get_hash()), the_fn, the_algo),
_ => { _ => {
@@ -120,8 +116,8 @@ fn get_digest_by_algorithm(algo: &str, options: &Options) -> Option<Box<dyn Dige
match algo { match algo {
"RIPEMD160" => Some(Box::new(Ripemd160::new())), "RIPEMD160" => Some(Box::new(Ripemd160::new())),
"WHIRLPOOL" => Some(Box::new(Whirlpool::new())), "WHIRLPOOL" => Some(Box::new(Whirlpool::new())),
"BLAKE2S" => Some(Box::new(Blake2s::new(if options.blake_len == 0_usize { 32 } else { options.blake_len }))), "BLAKE2S" => Some(Box::new(Blake2s::new(if options.blake_len == 0_usize { 32 } else { options.blake_len }))),
"BLAKE2B" => Some(Box::new(Blake2b::new(if options.blake_len == 0_usize { 64 } else { options.blake_len }))), "BLAKE2B" => Some(Box::new(Blake2b::new(if options.blake_len == 0_usize { 64 } else { options.blake_len }))),
"MD5" => Some(Box::new(Md5::new())), "MD5" => Some(Box::new(Md5::new())),
"SHA1" | "SHA-1" => Some(Box::new(Sha1::new())), "SHA1" | "SHA-1" => Some(Box::new(Sha1::new())),
"SHA224" | "SHA-224" => Some(Box::new(Sha224::new())), "SHA224" | "SHA-224" => Some(Box::new(Sha224::new())),