mirrors/lib_um_crypto_rust
1
0
Fork 0
mirror of https://git.um-react.app/um/lib_um_crypto_rust.git synced 2026-03-08 04:29:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: address clippy warnings

Browse Source
This commit is contained in:
鲁树人
2025-09-08 20:35:09 +09:00
parent 9ba4eed1ea
commit 2db85a1e9c
12 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
um_cli/src/cmd/kgm.rs
View File

@@ -48,7 +48,7 @@ impl ArgsKGM {
let mut file_input = File::open(&self.input)?; let mut file_input = File::open(&self.input)?;
let mut header = [0u8; 0x40]; let mut header = [0u8; 0x40];
file_input.read_exact(&mut header)?; file_input.read_exact(&mut header)?;
let kgm_header = Header::from_buffer(&mut header)?; let kgm_header = Header::from_buffer(header)?;
let decipher = Decipher::new(&kgm_header)?; let decipher = Decipher::new(&kgm_header)?;
file_input.seek(SeekFrom::Start(kgm_header.offset_to_data as u64))?; file_input.seek(SeekFrom::Start(kgm_header.offset_to_data as u64))?;

10
um_cli/src/cmd/mod.rs
View File

@@ -13,16 +13,16 @@ pub mod xmly;
#[derive(Subcommand)] #[derive(Subcommand)]
pub enum Commands { pub enum Commands {
#[command(name = "ncm")] #[command(name = "ncm")]
NCM(ncm::ArgsNCM), Ncm(ncm::ArgsNCM),
#[command(name = "kgm")] #[command(name = "kgm")]
KGM(kgm::ArgsKGM), Kgm(kgm::ArgsKGM),
#[command(name = "mg3d")] #[command(name = "mg3d")]
Migu3D(mg3d::ArgsMigu3D), Migu3D(mg3d::ArgsMigu3D),
#[command(name = "joox")] #[command(name = "joox")]
JOOX(joox::ArgsJoox), Joox(joox::ArgsJoox),
#[command(name = "qmc1")] #[command(name = "qmc1")]
QMCv1(qmc1::ArgsQMCv1), QMCv1(qmc1::ArgsQMCv1),
@@ -30,11 +30,11 @@ pub enum Commands {
QMCv2(qmc2::ArgsQMCv2), QMCv2(qmc2::ArgsQMCv2),
#[command(name = "qtfm")] #[command(name = "qtfm")]
QTFM(qtfm::ArgsQingTingFM), QtFM(qtfm::ArgsQingTingFM),
#[command(name = "xiami")] #[command(name = "xiami")]
Xiami(xiami::ArgsXiami), Xiami(xiami::ArgsXiami),
#[command(name = "xmly")] #[command(name = "xmly")]
XMLY(xmly::ArgsXimalaya), Xmly(xmly::ArgsXimalaya),
} }

2
um_cli/src/cmd/ncm.rs
View File

@@ -48,7 +48,7 @@ impl ArgsNCM {
fn write_cover(&self, cli: &Cli, ncm: &NCMFile) -> anyhow::Result<()> { fn write_cover(&self, cli: &Cli, ncm: &NCMFile) -> anyhow::Result<()> {
if let Some(cover_path) = &self.cover { if let Some(cover_path) = &self.cover {
if let Some(cover) = &ncm.image1 { if let Some(cover) = &ncm.image1 {
File::create(cover_path)?.write_all(&cover)?; File::create(cover_path)?.write_all(cover)?;
if cli.verbose { if cli.verbose {
let cover_path = cover_path.display(); let cover_path = cover_path.display();
let len = cover.len(); let len = cover.len();

4
um_cli/src/cmd/qtfm.rs
View File

@@ -48,8 +48,8 @@ impl ArgsQingTingFM {
let iv = make_decipher_iv(&file_name)?; let iv = make_decipher_iv(&file_name)?;
if cli.verbose { if cli.verbose {
eprintln!(" file_name: {}", file_name); eprintln!(" file_name: {}", file_name);
eprintln!("device_key: {}", hex::encode(&device_key)); eprintln!("device_key: {}", hex::encode(device_key));
eprintln!(" file_iv: {}", hex::encode(&iv)); eprintln!(" file_iv: {}", hex::encode(iv));
} }
let decipher = Decipher::new(&device_key, &iv); let decipher = Decipher::new(&device_key, &iv);

18
um_cli/src/main.rs
View File

@@ -28,15 +28,15 @@ pub struct Cli {
fn run_command(cli: &Cli) -> Result<i32> { fn run_command(cli: &Cli) -> Result<i32> {
match &cli.command { match &cli.command {
Some(Commands::JOOX(cmd)) => cmd.run(&cli), Some(Commands::Joox(cmd)) => cmd.run(cli),
Some(Commands::KGM(cmd)) => cmd.run(&cli), Some(Commands::Kgm(cmd)) => cmd.run(cli),
Some(Commands::Migu3D(cmd)) => cmd.run(&cli), Some(Commands::Migu3D(cmd)) => cmd.run(cli),
Some(Commands::NCM(cmd)) => cmd.run(&cli), Some(Commands::Ncm(cmd)) => cmd.run(cli),
Some(Commands::QMCv1(cmd)) => cmd.run(&cli), Some(Commands::QMCv1(cmd)) => cmd.run(cli),
Some(Commands::QMCv2(cmd)) => cmd.run(&cli), Some(Commands::QMCv2(cmd)) => cmd.run(cli),
Some(Commands::QTFM(cmd)) => cmd.run(&cli), Some(Commands::QtFM(cmd)) => cmd.run(cli),
Some(Commands::Xiami(cmd)) => cmd.run(&cli), Some(Commands::Xiami(cmd)) => cmd.run(cli),
Some(Commands::XMLY(cmd)) => cmd.run(&cli), Some(Commands::Xmly(cmd)) => cmd.run(cli),
None => { None => {
// https://github.com/clap-rs/clap/issues/3857#issuecomment-1161796261 // https://github.com/clap-rs/clap/issues/3857#issuecomment-1161796261
todo!("implement a sensible default command, similar to um/cli"); todo!("implement a sensible default command, similar to um/cli");

2
um_crypto/joox/src/decrypt.rs
View File

@@ -23,7 +23,7 @@ impl JooxDecipher for Header {
let (buffer, _) = buffer let (buffer, _) = buffer
.split_at_mut_checked(buffer_size) .split_at_mut_checked(buffer_size)
.ok_or_else(|| JooxError::OutputBufferTooSmall(buffer_size))?; .ok_or(JooxError::OutputBufferTooSmall(buffer_size))?;
let result = (&self.aes_engine) let result = (&self.aes_engine)
.decrypt_padded_mut::<Pkcs7>(buffer) .decrypt_padded_mut::<Pkcs7>(buffer)

6
um_crypto/kgm/src/header.rs
View File

@@ -96,9 +96,9 @@ impl Header {
} }
fn get_challenge_data(magic_header: &[u8; 0x10]) -> Result<[u8; 0x10], KugouError> { fn get_challenge_data(magic_header: &[u8; 0x10]) -> Result<[u8; 0x10], KugouError> {
match magic_header { match *magic_header {
&KGM_HEADER => Ok(KGM_TEST_DATA), KGM_HEADER => Ok(KGM_TEST_DATA),
&VPR_HEADER => Ok(VPR_TEST_DATA), VPR_HEADER => Ok(VPR_TEST_DATA),
_ => Err(KugouError::NotKGMFile)?, _ => Err(KugouError::NotKGMFile)?,
} }
} }

2
um_crypto/kgm/src/v2.rs
View File

@@ -9,7 +9,7 @@ pub struct DecipherV2 {
impl DecipherV2 { impl DecipherV2 {
pub fn new(header: &Header) -> Result<Self, KugouError> { pub fn new(header: &Header) -> Result<Self, KugouError> {
let mut key = [0u8; 4]; let mut key = [0u8; 4];
key.copy_from_slice(get_slot_key(&header)?); key.copy_from_slice(get_slot_key(header)?);
Ok(Self { key }) Ok(Self { key })
} }

2
um_crypto/qmc/src/footer/pc_v1_legacy.rs
View File

@@ -28,7 +28,7 @@ impl MetadataParser for PcV1Legacy {
let ekey = payload let ekey = payload
.iter() .iter()
.take_while(|&&b| b != 0) .take_while(|&&b| b != 0)
.map(|&b| b) .copied()
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let ekey = String::from_utf8_lossy(ekey.as_slice()); let ekey = String::from_utf8_lossy(ekey.as_slice());
if !is_base64(ekey.as_bytes()) { if !is_base64(ekey.as_bytes()) {

0
um_crypto/qrc/src/des/des.rs → um_crypto/qrc/src/des/des_impl.rs
View File

4
um_crypto/qrc/src/des/mod.rs
View File

@@ -1,5 +1,5 @@
mod constants; mod constants;
mod des; mod des_impl;
mod utils; mod utils;
pub use des::{DESMode, QrcDes}; pub use des_impl::{DESMode, QrcDes};

2
um_crypto/qtfm/src/secret.rs
View File

@@ -28,7 +28,7 @@ pub fn make_device_secret<S: AsRef<[u8]>>(
let device_id_hash_code_hex = device_id_hash_code_hex.as_bytes(); let device_id_hash_code_hex = device_id_hash_code_hex.as_bytes();
let mut device_key = [0u8; 0x10]; let mut device_key = [0u8; 0x10];
device_key[..device_id_hash_code_hex.len()].copy_from_slice(&device_id_hash_code_hex); device_key[..device_id_hash_code_hex.len()].copy_from_slice(device_id_hash_code_hex);
for (key, salt) in device_key.iter_mut().zip(DEVICE_KEY_SALT) { for (key, salt) in device_key.iter_mut().zip(DEVICE_KEY_SALT) {
*key = salt.wrapping_add(*key); *key = salt.wrapping_add(*key);
} }