feat: v1.4.1
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
use std::fs;
|
||||
use std::io;
|
||||
use std::fs::File;
|
||||
|
||||
use clap::{App, Arg, ArgMatches, SubCommand};
|
||||
@@ -8,7 +10,7 @@ use openssl::rsa::Rsa;
|
||||
use openssl::sign::Verifier;
|
||||
use rust_util::util_clap::{Command, CommandError};
|
||||
use rust_util::util_msg::MessageType;
|
||||
use rust_util::XResult;
|
||||
use rust_util::{util_msg, XResult};
|
||||
|
||||
use crate::digest::sha256_bytes;
|
||||
|
||||
@@ -34,7 +36,7 @@ impl Command for CommandImpl {
|
||||
// if json_output { rust_util::util_msg::set_logger_std_out(false); }
|
||||
|
||||
let pub_key_in = opt_value_result!(sub_arg_matches.value_of("pub-key-in"), "Require public key in");
|
||||
let pub_key_bytes = opt_result!(std::fs::read(pub_key_in), "Read file: {}, failed: {}", pub_key_in);
|
||||
let pub_key_bytes = opt_result!(fs::read(pub_key_in), "Read file: {}, failed: {}", pub_key_in);
|
||||
|
||||
// let mut json = BTreeMap::new();
|
||||
|
||||
@@ -49,7 +51,7 @@ impl Command for CommandImpl {
|
||||
return simple_error!("Signature is required, --signature argument!");
|
||||
};
|
||||
|
||||
rust_util::util_msg::when(MessageType::DEBUG, || {
|
||||
util_msg::when(MessageType::DEBUG, || {
|
||||
let rsa = keypair.rsa().unwrap();
|
||||
let n = rsa.n();
|
||||
let e = rsa.e();
|
||||
@@ -68,7 +70,7 @@ impl Command for CommandImpl {
|
||||
let digest = get_digest(hash)?;
|
||||
let mut verifier = opt_result!(Verifier::new(digest, &keypair), "Verifier new failed: {}");
|
||||
let mut f = opt_result!(File::open(file_in), "Open file: {}, failed: {}", file_in);
|
||||
opt_result!(std::io::copy(&mut f, &mut verifier), "Verifier failed: {}");
|
||||
opt_result!(io::copy(&mut f, &mut verifier), "Verifier failed: {}");
|
||||
let result = opt_result!(verifier.verify(&signature), "Verifier verify failed: {}");
|
||||
if result {
|
||||
success!("Verify success");
|
||||
|
||||
Reference in New Issue
Block a user