mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-19 19:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

unpkg: allow package_reader creation with provided fs::file

Browse source
This commit is contained in:
DH 2025-02-28 20:58:45 +03:00 • committed by Megamouse
parent f3d988d8ab
commit bbb682a440
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rpcs3/Crypto/unpkg.cpp
View file

@ -16,10 +16,11 @@
LOG_CHANNEL(pkg_log, "PKG");
package_reader::package_reader(const std::string& path)
package_reader::package_reader(const std::string& path, fs::file file)
: m_path(path)
, m_file(std::move(file))
{
if (!m_file.open(path))
if (!m_file && !m_file.open(path))
{
pkg_log.error("PKG file not found!");
return;
@ -119,7 +120,7 @@ bool package_reader::read_header()
return false;
}
if (u64{umax} / sizeof(PKGEntry) < m_header.file_count)
if (u64{umax} / sizeof(PKGEntry) < u64(m_header.file_count))
{
pkg_log.error("PKG file count is too large! (0x%x)", m_header.file_count);
return false;
@ -505,7 +506,7 @@ bool package_reader::set_decryption_key()
}
std::memcpy(m_dec_key.data(), PKG_AES_KEY, m_dec_key.size());
if (std::vector<PKGEntry> entries; !read_entries(entries))
{
pkg_log.notice("PKG may be IDU, retrying with IDU key.");

2
rpcs3/Crypto/unpkg.h
View file

@ -332,7 +332,7 @@ class package_reader
};
public:
package_reader(const std::string& path);
package_reader(const std::string& path, fs::file file = {});
~package_reader();
enum result