archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-08 16:01:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Crypto: fix magical type

Browse source
This commit is contained in:
Megamouse 2020-04-18 12:17:57 +02:00
parent 3a6bda4d93
commit e4b6de409a
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Crypto/unpkg.cpp
View file

@ -129,7 +129,7 @@ bool pkg_install(const std::string& path, atomic_t<double>& sync)
//pkg_log.notice("Extended header: padding2 = 0x%x = %d", ext_header.padding2, ext_header.padding2); //pkg_log.notice("Extended header: padding2 = 0x%x = %d", ext_header.padding2, ext_header.padding2);
} }
if (header.pkg_magic != "\x7FPKG"_u32) if (header.pkg_magic != std::bit_cast<le_t<u32>>("\x7FPKG"_u32))
{ {
pkg_log.error("Not a PKG file!"); pkg_log.error("Not a PKG file!");
return false; return false;

4
rpcs3/Crypto/unpkg.h
View file

@ -35,7 +35,7 @@ enum : u32
// Structs // Structs
struct PKGHeader struct PKGHeader
{ {
nse_t<u32> pkg_magic; // Magic (0x7f504b47) (" PKG") le_t<u32> pkg_magic; // Magic (0x7f504b47) (" PKG")
be_t<u16> pkg_type; // Release type (Retail:0x8000, Debug:0x0000) be_t<u16> pkg_type; // Release type (Retail:0x8000, Debug:0x0000)
be_t<u16> pkg_platform; // Platform type (PS3:0x0001, PSP:0x0002) be_t<u16> pkg_platform; // Platform type (PS3:0x0001, PSP:0x0002)
be_t<u32> pkg_info_off; be_t<u32> pkg_info_off;
@ -54,7 +54,7 @@ struct PKGHeader
// Extended header in PSP and PSVita packages // Extended header in PSP and PSVita packages
struct PKGExtHeader struct PKGExtHeader
{ {
nse_t<u32> magic; // 0x7F657874 (" ext") le_t<u32> magic; // 0x7F657874 (" ext")
be_t<u32> unknown_1; // Maybe version. always 1 be_t<u32> unknown_1; // Maybe version. always 1
be_t<u32> ext_hdr_size; // Extended header size. ex: 0x40 be_t<u32> ext_hdr_size; // Extended header size. ex: 0x40
be_t<u32> ext_data_size; // ex: 0x180 be_t<u32> ext_data_size; // ex: 0x180