these-android-re/androscalpel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bump rust edition for apk_frauder

Browse source
This commit is contained in:
Jean-Marie Mineau 2025-04-18 11:03:47 +02:00
parent 2db1a83345
commit 4fa4043b97
Signed by: histausse
GPG key ID: B66AEEDA9B645AD2
6 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apk_frauder/Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "apk_frauder" name = "apk_frauder"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2024"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

2
apk_frauder/src/file_header.rs
View file

@ -4,7 +4,7 @@ use std::io::{SeekFrom, Write};
use crate::compression::CompressionMethod; use crate::compression::CompressionMethod;
use crate::error::Error; use crate::error::Error;
use crate::extra_fields::{ExtraField, GenericExtraField, Zip64ExtraField}; use crate::extra_fields::{ExtraField, GenericExtraField, Zip64ExtraField};
use crate::{cp437, external_file_attributes, general_purpose_flags, Encoding, Signature}; use crate::{Encoding, Signature, cp437, external_file_attributes, general_purpose_flags};
use androscalpel_serializer::{ReadSeek, Result, Serializable}; use androscalpel_serializer::{ReadSeek, Result, Serializable};
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]

14
apk_frauder/src/lib.rs
View file

@ -164,15 +164,13 @@ pub fn replace_dex(
keypassword: Option<&str>, keypassword: Option<&str>,
additionnal_files: Option<HashMap<String, Option<impl Read + Seek>>>, additionnal_files: Option<HashMap<String, Option<impl Read + Seek>>>,
) -> Result<()> { ) -> Result<()> {
let zipalign = if let Some(path) = &zipalign { let zipalign = match &zipalign {
path.as_ref().as_os_str() Some(path) => path.as_ref().as_os_str(),
} else { _ => "zipalign".as_ref(),
"zipalign".as_ref()
}; };
let apksigner = if let Some(path) = &apksigner { let apksigner = match &apksigner {
path.as_ref().as_os_str() Some(path) => path.as_ref().as_os_str(),
} else { _ => "apksigner".as_ref(),
"apksigner".as_ref()
}; };
let tmp_dir = env::temp_dir().join(format!("apk_frauder_{:x}", rand::random::<u128>())); let tmp_dir = env::temp_dir().join(format!("apk_frauder_{:x}", rand::random::<u128>()));
let unaligned_path = tmp_dir.join("stripped.apk"); let unaligned_path = tmp_dir.join("stripped.apk");

2
apk_frauder/src/local_file_header.rs
View file

@ -5,7 +5,7 @@ use log::warn;
use crate::compression::CompressionMethod; use crate::compression::CompressionMethod;
use crate::error::Error; use crate::error::Error;
use crate::extra_fields::{ExtraField, GenericExtraField, Zip64ExtraField}; use crate::extra_fields::{ExtraField, GenericExtraField, Zip64ExtraField};
use crate::{cp437, general_purpose_flags, Encoding, Signature}; use crate::{Encoding, Signature, cp437, general_purpose_flags};
use androscalpel_serializer::{ReadSeek, Result, Serializable}; use androscalpel_serializer::{ReadSeek, Result, Serializable};
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]

5
apk_frauder/src/zip_reader.rs
View file

@ -1,4 +1,5 @@
use crate::{ use crate::{
FileHeader, FileInfo, LocalFileHeader, Signature,
apk_signing_block::ApkSigningBlock, apk_signing_block::ApkSigningBlock,
apk_signing_block::Magic, apk_signing_block::Magic,
compression::CompressionMethod, compression::CompressionMethod,
@ -6,10 +7,10 @@ use crate::{
end_of_central_directory::EndCentralDirectory, end_of_central_directory::EndCentralDirectory,
end_of_central_directory::Zip64EndCentralDirectory, end_of_central_directory::Zip64EndCentralDirectory,
end_of_central_directory::Zip64EndCentralDirectoryLocator, end_of_central_directory::Zip64EndCentralDirectoryLocator,
general_purpose_flags, FileHeader, FileInfo, LocalFileHeader, Signature, general_purpose_flags,
}; };
use androscalpel_serializer::Serializable; use androscalpel_serializer::Serializable;
use anyhow::{bail, Context, Result}; use anyhow::{Context, Result, bail};
use flate2::read::DeflateDecoder; use flate2::read::DeflateDecoder;
use log::{info, warn}; use log::{info, warn};
use std::collections::HashMap; use std::collections::HashMap;

2
apk_frauder/src/zip_writer.rs
View file

@ -6,7 +6,7 @@ use crate::data_descriptor::DataDescriptor;
use crate::end_of_central_directory::{ use crate::end_of_central_directory::{
EndCentralDirectory, Zip64EndCentralDirectory, Zip64EndCentralDirectoryLocator, EndCentralDirectory, Zip64EndCentralDirectory, Zip64EndCentralDirectoryLocator,
}; };
use crate::{general_purpose_flags, FileHeader, FileInfo, LocalFileHeader, ZipFileReader}; use crate::{FileHeader, FileInfo, LocalFileHeader, ZipFileReader, general_purpose_flags};
use androscalpel_serializer::Serializable; use androscalpel_serializer::Serializable;
use flate2::write::DeflateEncoder; use flate2::write::DeflateEncoder;
use flate2::{Compression, CrcWriter}; use flate2::{Compression, CrcWriter};