diff --git a/src/main.rs b/src/main.rs index 1dd6d33..f2f2b56 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,7 +16,7 @@ use std::{ fs::{ self, File }, }; use std::path::PathBuf; -use rust_util::{XResult, util_time::*}; +use rust_util::{XResult, util_time::*, util_msg::*}; use tiny_encrypt::CmdEncrypt; use oss_util::*; use config_util::*; diff --git a/src/pgp_util.rs b/src/pgp_util.rs index 9d85e7d..992c765 100644 --- a/src/pgp_util.rs +++ b/src/pgp_util.rs @@ -12,7 +12,7 @@ use openpgp::{ types::KeyFlags, serialize::stream::{ Message, - Encryptor, + Encryptor2, LiteralWriter, }, policy::StandardPolicy as P, @@ -65,7 +65,7 @@ impl OpenPGPTool { } else { Message::new(bw) }; - let encryptor = Encryptor::for_recipients(message, recipients).build()?; + let encryptor = Encryptor2::for_recipients(message, recipients).build()?; let mut pgp_encrypt_writer = LiteralWriter::new(encryptor).build()?; let mut from = File::open(from_file)?; encrypt_read_write(&mut from, &mut pgp_encrypt_writer)?; @@ -81,7 +81,7 @@ fn encrypt_read_write(file: &mut File, write: &mut dyn Write) -> XResult<()> { let mut read = 0_u64; let pb = ProgressBar::new(file_len); - pb.set_style(ProgressStyle::default_bar().template(PB_TEMPLATE).progress_chars(PB_PROGRESS)); + pb.set_style(ProgressStyle::default_bar().template(PB_TEMPLATE)?.progress_chars(PB_PROGRESS)); loop { let len = match file.read(&mut buf) {