thegame_1980/unixtract
1
0
Fork 0
mirror of https://github.com/Ap0dexMe0/unixtract.git synced 2026-07-15 21:00:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

epk2,epk3: improve signature handling

Browse Source
This commit is contained in:
theubusu
2026-01-24 17:35:34 +01:00
parent 060d808b44
commit 872eee9e6e
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/formats/epk2.rs
+3 -3
View File
@@ -75,7 +75,7 @@ pub fn is_epk2_file(file: &File) -> bool {
} }
pub fn extract_epk2(mut file: &File, output_folder: &str) -> Result<(), Box<dyn std::error::Error>> { pub fn extract_epk2(mut file: &File, output_folder: &str) -> Result<(), Box<dyn std::error::Error>> {
file.seek(SeekFrom::Start(128))?; //inital signature let _header_signature = common::read_exact(&mut file, SIGNATURE_SIZE as usize)?;
let stored_header = common::read_exact(&mut file, 1584)?; //max header size let stored_header = common::read_exact(&mut file, 1584)?; //max header size
let header; let header;
@@ -122,7 +122,7 @@ pub fn extract_epk2(mut file: &File, output_folder: &str) -> Result<(), Box<dyn
let actual_offset = pak.offset + (SIGNATURE_SIZE * signature_count); let actual_offset = pak.offset + (SIGNATURE_SIZE * signature_count);
file.seek(SeekFrom::Start(actual_offset as u64))?; file.seek(SeekFrom::Start(actual_offset as u64))?;
let _signature = common::read_exact(&mut file, SIGNATURE_SIZE as usize)?; let mut _segment_signature = common::read_exact(&mut file, SIGNATURE_SIZE as usize)?;
signature_count += 1; signature_count += 1;
let encrypted_header = common::read_exact(&mut file, 128)?; let encrypted_header = common::read_exact(&mut file, 128)?;
@@ -150,7 +150,7 @@ pub fn extract_epk2(mut file: &File, output_folder: &str) -> Result<(), Box<dyn
for i in 0..pak_header.segment_count { for i in 0..pak_header.segment_count {
// for first segment we already read the header so skip doing that for it // for first segment we already read the header so skip doing that for it
if i > 0 { if i > 0 {
let _signature = common::read_exact(&mut file, 128)?; _segment_signature = common::read_exact(&mut file, 128)?;
signature_count += 1; signature_count += 1;
let encrypted_header = common::read_exact(&mut file, 128)?; let encrypted_header = common::read_exact(&mut file, 128)?;
src/formats/epk3.rs
+13 -13
View File
@@ -71,27 +71,28 @@ impl PkgInfoEntry {
} }
pub fn extract_epk3(mut file: &File, output_folder: &str) -> Result<(), Box<dyn std::error::Error>> { pub fn extract_epk3(mut file: &File, output_folder: &str) -> Result<(), Box<dyn std::error::Error>> {
file.seek(SeekFrom::Start(128))?; //inital signature file.seek(SeekFrom::Start(0))?;
let stored_header = common::read_exact(&mut file, 1712)?;
let stored_header = common::read_exact(&mut file, 1584)?; //max header size
let header: Vec<u8>; let header: Vec<u8>;
let _header_signature;
let mut new_type = false; let mut new_type = false;
let matching_key: Option<Vec<u8>>; let matching_key: Option<Vec<u8>>;
println!("Finding key..."); println!("Finding key...");
// find the key, knowing that the header should start with "EPK3" // find the key, knowing that the header should start with "EPK3" (old type 128 byte signature)
if let Some((key_name, key_bytes)) = find_key(&keys::EPK, &stored_header, b"EPK3")? { if let Some((key_name, key_bytes)) = find_key(&keys::EPK, &stored_header[128..], b"EPK3")? {
println!("Found valid key: {}", key_name); println!("Found valid key: {}", key_name);
matching_key = Some(key_bytes); matching_key = Some(key_bytes);
header = decrypt_aes_ecb_auto(matching_key.as_ref().unwrap(), &stored_header)?; _header_signature = &stored_header[..128];
header = decrypt_aes_ecb_auto(matching_key.as_ref().unwrap(), &stored_header[128..])?;
//try for new format epk3 where theres an additional 128byte signature at the beginning //try for new format epk3 (new type 256 byte signature)
} else if let Some((key_name, key_bytes)) = find_key(&keys::EPK, &stored_header[128..], b"EPK3")? { } else if let Some((key_name, key_bytes)) = find_key(&keys::EPK, &stored_header[256..], b"EPK3")? {
println!("Found valid key: {}", key_name); println!("Found valid key: {}", key_name);
matching_key = Some(key_bytes); matching_key = Some(key_bytes);
header = decrypt_aes_ecb_auto(matching_key.as_ref().unwrap(), &stored_header)?; _header_signature = &stored_header[..256];
header = decrypt_aes_ecb_auto(matching_key.as_ref().unwrap(), &stored_header[256..])?;
new_type = true; new_type = true;
} else { } else {
@@ -106,7 +107,6 @@ pub fn extract_epk3(mut file: &File, output_folder: &str) -> Result<(), Box<dyn
//parse header //parse header
let mut hdr_reader = Cursor::new(header); let mut hdr_reader = Cursor::new(header);
if new_type {let _signature = common::read_exact(&mut hdr_reader, 128)?;};
let hdr: Header = hdr_reader.read_le()?; let hdr: Header = hdr_reader.read_le()?;
println!("\nEPK info -\nEPK3 type: {}\nOTA ID: {}\nVersion: {:02x?}.{:02x?}.{:02x?}.{:02x?}\nPackage Info size: {}", println!("\nEPK info -\nEPK3 type: {}\nOTA ID: {}\nVersion: {:02x?}.{:02x?}.{:02x?}.{:02x?}\nPackage Info size: {}",
@@ -121,7 +121,7 @@ pub fn extract_epk3(mut file: &File, output_folder: &str) -> Result<(), Box<dyn
println!(); println!();
let _platform_versions = common::read_exact(&mut file, 36)?; let _platform_versions = common::read_exact(&mut file, 36)?;
let _signature = common::read_exact(&mut file, signature_size)?; let _pkg_info_signature = common::read_exact(&mut file, signature_size)?;
//PKG INFO //PKG INFO
let pkg_info_encrypted = common::read_exact(&mut file, hdr.package_info_size as usize)?; let pkg_info_encrypted = common::read_exact(&mut file, hdr.package_info_size as usize)?;
@@ -148,7 +148,7 @@ pub fn extract_epk3(mut file: &File, output_folder: &str) -> Result<(), Box<dyn
println!("- Segment {}/{}, Size: {}", entry.segment_index + 1, entry.segment_count, entry.segment_size); println!("- Segment {}/{}, Size: {}", entry.segment_index + 1, entry.segment_count, entry.segment_size);
let _signature = common::read_exact(&mut file, signature_size)?; let _segment_signature = common::read_exact(&mut file, signature_size)?;
let encrypted_data = common::read_exact(&mut file, entry.segment_size as usize + extra_segment_size)?; let encrypted_data = common::read_exact(&mut file, entry.segment_size as usize + extra_segment_size)?;
let out_data = decrypt_aes_ecb_auto(matching_key_bytes, &encrypted_data)?; let out_data = decrypt_aes_ecb_auto(matching_key_bytes, &encrypted_data)?;