diff --git a/src/cmd_decrypt.rs b/src/cmd_decrypt.rs index 6b356b6..a518b83 100644 --- a/src/cmd_decrypt.rs +++ b/src/cmd_decrypt.rs @@ -210,7 +210,7 @@ pub fn decrypt_single(config: &Option, Ok(meta.file_length) } -fn decrypt_file(file_in: &mut File, file_len: u64, file_out: &mut impl Write, +fn decrypt_file(file_in: &mut impl Read, file_len: u64, file_out: &mut impl Write, cryptor: Cryptor, key_nonce: &KeyNonce, compress: bool) -> XResult { let mut total_len = 0_u64; let mut buffer = [0u8; 1024 * 8]; diff --git a/src/cmd_directdecrypt.rs b/src/cmd_directdecrypt.rs index c7ced37..51d5c34 100644 --- a/src/cmd_directdecrypt.rs +++ b/src/cmd_directdecrypt.rs @@ -96,8 +96,7 @@ pub fn direct_decrypt(cmd_direct_decrypt: CmdDirectDecrypt) -> XResult<()> { Ok(()) } - -fn decrypt_file(file_in: &mut File, file_len: u64, file_out: &mut impl Write, +fn decrypt_file(file_in: &mut impl Read, file_len: u64, file_out: &mut impl Write, cryptor: Cryptor, key_nonce: &KeyNonce) -> XResult { let mut total_len = 0_u64; let mut buffer = [0u8; 1024 * 8]; diff --git a/src/cmd_encrypt.rs b/src/cmd_encrypt.rs index ce33976..075c00a 100644 --- a/src/cmd_encrypt.rs +++ b/src/cmd_encrypt.rs @@ -184,7 +184,7 @@ pub fn encrypt_single_file_out(path: &PathBuf, path_out: &str, envelops: &[&Tiny Ok(file_metadata.len()) } -fn encrypt_file(file_in: &mut File, file_len: u64, file_out: &mut impl Write, cryptor: Cryptor, +fn encrypt_file(file_in: &mut impl Read, file_len: u64, file_out: &mut impl Write, cryptor: Cryptor, key_nonce: &KeyNonce, compress_level: &Option) -> XResult { let compress = compress_level.is_some(); let mut total_len = 0_u64; diff --git a/src/spec.rs b/src/spec.rs index 9b111e4..4be367a 100644 --- a/src/spec.rs +++ b/src/spec.rs @@ -1,6 +1,5 @@ use std::fs::Metadata; -use flate2::Compression; use rust_util::{opt_result, util_time, XResult}; use rust_util::util_time::get_millis; use serde::{Deserialize, Serialize};