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

feat: optimize code

Browse Source
This commit is contained in:
Hatter Jiang
2023-11-04 23:35:54 +08:00
parent 6279e8e16b
commit e6b1ec8a86
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/util_enc_file.rs
View File

@@ -6,9 +6,9 @@ use crate::compress;
use crate::consts::{TINY_ENC_COMPRESSED_MAGIC_TAG, TINY_ENC_MAGIC_TAG};
use crate::spec::TinyEncryptMeta;
pub fn write_tiny_encrypt_meta(w: &mut impl Write, meta: &TinyEncryptMeta, compress_meta: bool) -> XResult<usize> {
let tag = iff!(compress_meta, TINY_ENC_COMPRESSED_MAGIC_TAG, TINY_ENC_MAGIC_TAG);
opt_result!(w.write_all(&tag.to_be_bytes()), "Write tag failed: {}");
pub fn write_tiny_encrypt_meta(write: &mut impl Write, meta: &TinyEncryptMeta, compress_meta: bool) -> XResult<usize> {
let meta_tag = iff!(compress_meta, TINY_ENC_COMPRESSED_MAGIC_TAG, TINY_ENC_MAGIC_TAG);
opt_result!(write.write_all(&meta_tag.to_be_bytes()), "Write tag failed: {}");
let mut encrypted_meta_bytes = opt_result!(serde_json::to_vec(&meta), "Generate meta json bytes failed: {}");
if compress_meta {
encrypted_meta_bytes = opt_result!(
@@ -16,46 +16,46 @@ pub fn write_tiny_encrypt_meta(w: &mut impl Write, meta: &TinyEncryptMeta, compr
}
let encrypted_meta_bytes_len = encrypted_meta_bytes.len() as u32;
debugging!("Encrypted meta len: {}", encrypted_meta_bytes_len);
opt_result!(w.write_all(&encrypted_meta_bytes_len.to_be_bytes()), "Write meta len failed: {}");
opt_result!(w.write_all(&encrypted_meta_bytes), "Write meta failed: {}");
opt_result!(write.write_all(&encrypted_meta_bytes_len.to_be_bytes()), "Write meta len failed: {}");
opt_result!(write.write_all(&encrypted_meta_bytes), "Write meta failed: {}");
Ok(encrypted_meta_bytes.len() + 2 + 4)
}
pub fn read_tiny_encrypt_meta_and_normalize(r: &mut impl Read) -> XResult<(u32, TinyEncryptMeta)> {
let mut meta_and_len = read_tiny_encrypt_meta(r);
let _ = meta_and_len.as_mut().map(|meta| meta.1.normalize());
meta_and_len
let mut meta_len_and_meta = read_tiny_encrypt_meta(r);
let _ = meta_len_and_meta.as_mut().map(|ml| ml.1.normalize());
meta_len_and_meta
}
pub fn read_tiny_encrypt_meta(r: &mut impl Read) -> XResult<(u32, TinyEncryptMeta)> {
let mut tag_buff = [0_u8; 2];
opt_result!(r.read_exact(&mut tag_buff), "Read tag failed: {}");
let tag = u16::from_be_bytes(tag_buff);
debugging!("Found tag: {}", tag);
let is_normal_tiny_enc = tag == TINY_ENC_MAGIC_TAG;
let is_compressed_tiny_enc = tag == TINY_ENC_COMPRESSED_MAGIC_TAG;
if !is_normal_tiny_enc && !is_compressed_tiny_enc {
return simple_error!("Tag is not 0x01 or 0x02, but is: 0x{:x}", tag);
let mut meta_tag_buff = [0_u8; 2];
opt_result!(r.read_exact(&mut meta_tag_buff), "Read tag failed: {}");
let meta_tag = u16::from_be_bytes(meta_tag_buff);
debugging!("Found tag: {}", meta_tag);
let is_meta_normal = meta_tag == TINY_ENC_MAGIC_TAG;
let is_meta_compressed = meta_tag == TINY_ENC_COMPRESSED_MAGIC_TAG;
if !is_meta_normal && !is_meta_compressed {
return simple_error!("Tag is not 0x01 or 0x02, but is: 0x{:x}", meta_tag);
}
let mut length_buff = [0_u8; 4];
opt_result!(r.read_exact(&mut length_buff), "Read length failed: {}");
let length = u32::from_be_bytes(length_buff);
if length > 100 * 1024 * 1024 {
return simple_error!("Meta too large: {}", length);
let mut meta_length_buff = [0_u8; 4];
opt_result!(r.read_exact(&mut meta_length_buff), "Read length failed: {}");
let meta_length = u32::from_be_bytes(meta_length_buff);
if meta_length > 10 * 1024 * 1024 {
return simple_error!("Meta too large: {}", meta_length);
}
debugging!("Encrypted meta length: {}", length);
let mut meta_buff = vec![0; length as usize];
debugging!("Encrypted meta length: {}", meta_length);
let mut meta_buff = vec![0; meta_length as usize];
opt_result!(r.read_exact(meta_buff.as_mut_slice()), "Read meta failed: {}");
debugging!("Tiny enc meta compressed: {}", is_compressed_tiny_enc);
if is_compressed_tiny_enc {
debugging!("Tiny enc meta compressed: {}", is_meta_compressed);
if is_meta_compressed {
meta_buff = opt_result!(compress::decompress(&meta_buff), "Decompress meta failed: {}");
debugging!("Encrypted meta decompressed: {} byte(s) -> {} byte(s)", length, meta_buff.len());
debugging!("Encrypted meta decompressed: {} byte(s) -> {} byte(s)", meta_length, meta_buff.len());
}
debugging!("Encrypted meta: {}", String::from_utf8_lossy(&meta_buff));
Ok((length, opt_result!(serde_json::from_slice(&meta_buff), "Parse meta failed: {}")))
Ok((meta_length, opt_result!(serde_json::from_slice(&meta_buff), "Parse meta failed: {}")))
}