hatter/tiny-encrypt-rs
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: optimize

Browse Source
This commit is contained in:
Hatter Jiang
2023-10-28 16:47:08 +08:00
parent 89ed3c26ed
commit 20b0fe1ea2
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cmd_encrypt.rs
View File

@@ -132,9 +132,9 @@ pub fn encrypt_single_file_out(path: &PathBuf, path_out: &str, envelops: &[&Tiny
util::require_file_not_exists(path_out)?;
let (key, nonce) = util::make_key256_and_nonce();
let key_nonce = KeyNonce { k: &key.0, n: &nonce.0 };
let key_nonce = KeyNonce { k: key.as_ref(), n: nonce.as_ref() };
// Encrypt session key to envelops
let envelops = encrypt_envelops(cryptor, &key.0, envelops)?;
let envelops = encrypt_envelops(cryptor, key.as_ref(), envelops)?;
let encrypted_comment = match &cmd_encrypt.encrypted_comment {
None => None,
@@ -162,7 +162,7 @@ pub fn encrypt_single_file_out(path: &PathBuf, path_out: &str, envelops: &[&Tiny
};
let encrypt_meta = TinyEncryptMeta::new(
&file_metadata, &enc_metadata, cryptor, &nonce.0, envelops);
&file_metadata, &enc_metadata, cryptor, nonce.as_ref(), envelops);
debugging!("Encrypted meta: {:?}", encrypt_meta);
let mut file_out = File::create(path_out)?;
@@ -305,7 +305,7 @@ fn encrypt_envelop_shared_secret(cryptor: Cryptor,
envelop: &TinyEncryptConfigEnvelop) -> XResult<TinyEncryptEnvelop> {
let shared_key = util::simple_kdf(shared_secret);
let nonce = util::make_nonce();
let key_nonce = KeyNonce { k: &shared_key, n: &nonce.0 };
let key_nonce = KeyNonce { k: &shared_key, n: nonce.as_ref() };
let encrypted_key = crypto_simple::encrypt(
cryptor, &key_nonce, key)?;