lifegpc/msg-tool
1
0
Fork 0
mirror of https://github.com/lifegpc/msg-tool.git synced 2026-06-06 12:58:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump deps version: sha1/sha2 0.10 -> 0.11

Browse Source
This commit is contained in:
lifegpc
2026-04-05 13:26:54 +08:00
parent 30ba09a3a6
commit a752629886
3 changed files with 251 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

443
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

7
Cargo.toml
View File

@@ -17,6 +17,7 @@ clap = { version = "4.5", features = ["derive"] }
crc32fast = { version = "1.5", optional = true }
csv = "1.3"
ctrlc = "3.4"
digest-io = { version = "0.1", optional = true }
emote-psb = { version = "0.5", optional = true , features = ["serde"] }
encoding = "0.2"
fancy-regex = { version = "0.17", optional = true }
@@ -46,8 +47,8 @@ rust-ini = { version = "0.21", optional = true }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
serde_yaml_ng = "0.10"
sha1 = { version = "0.10", optional = true }
sha2 = { version = "0.10", optional = true }
sha1 = { version = "0.11", optional = true }
sha2 = { version = "0.11", optional = true }
stylua = { version = "2.1", optional = true, default-features = false}
unicode-segmentation = "1.12"
url = { version = "2.5", optional = true }
@@ -67,7 +68,7 @@ all-arc = ["artemis-arc", "bgi-arc", "cat-system-arc", "circus-arc", "escude-arc
all-audio = ["bgi-audio", "circus-audio"]
artemis = ["stylua", "utils-escape"]
artemis-panmimisoft = ["artemis", "rust-ini"]
artemis-arc = ["artemis", "msg_tool_macro/artemis-arc", "sha1"]
artemis-arc = ["artemis", "digest-io", "msg_tool_macro/artemis-arc", "sha1"]
bgi = ["fancy-regex"]
bgi-arc = ["bgi", "rand", "utils-bit-stream"]
bgi-audio = ["bgi"]

9
src/scripts/artemis/archive/pfs.rs
View File

@@ -5,6 +5,7 @@ use crate::scripts::base::*;
use crate::types::*;
use crate::utils::struct_pack::*;
use anyhow::Result;
use digest_io::IoWrapper;
use msg_tool_macro::*;
use sha1::Digest;
use std::collections::HashMap;
@@ -174,12 +175,12 @@ impl<T: Read + Seek + std::fmt::Debug> ArtemisArc<T> {
}
let xor_key = if version == b'8' {
reader.seek(SeekFrom::Start(7))?;
let mut sha = sha1::Sha1::default();
let mut sha = IoWrapper(sha1::Sha1::default());
let ra = &mut reader;
let mut r = ra.take(index_size as u64);
std::io::copy(&mut r, &mut sha)?;
sha.flush()?;
let result = sha.finalize();
let result = sha.0.finalize();
let mut xor_key = [0u8; 20];
xor_key.copy_from_slice(&result);
Some(xor_key)
@@ -422,12 +423,12 @@ impl<T: Write + Seek + Read> Archive for ArtemisArcWriter<T> {
}
if !self.disable_xor {
self.writer.seek(SeekFrom::Start(7))?;
let mut sha = sha1::Sha1::default();
let mut sha = IoWrapper(sha1::Sha1::default());
let w = &mut self.writer;
let mut header = w.take(self.index_size as u64);
std::io::copy(&mut header, &mut sha)?;
sha.flush()?;
let result = sha.finalize();
let result = sha.0.finalize();
let mut xor_key = [0u8; 20];
xor_key.copy_from_slice(&result);
let mut buf = [0u8; 1024];