mirrors/shadPS4
0
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-05 23:58:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

small fixes

Browse source
This commit is contained in:
georgemoralis 2024-02-29 16:22:01 +02:00
commit c1e701a2e5
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/file_format/pkg.cpp
View file

@ -166,7 +166,7 @@ bool PKG::Extract(const std::string& filepath, const std::filesystem::path& extr
// Read the seed // Read the seed
std::array<CryptoPP::byte, 16> seed; std::array<CryptoPP::byte, 16> seed;
file.Seek(pkgheader.pfs_image_offset + 0x370); file.Seek(pkgheader.pfs_image_offset + 0x370);
file.ReadRaw<u8>(seed.data(), seed.size()); file.Read(seed);
// Get data and tweak keys. // Get data and tweak keys.
PKG::crypto.PfsGenCryptoKey(ekpfsKey, seed, dataKey, tweakKey); PKG::crypto.PfsGenCryptoKey(ekpfsKey, seed, dataKey, tweakKey);
@ -347,7 +347,7 @@ void PKG::ExtractFiles(const int& index) {
int previousData = (sectorOffset + pfsc_offset) - sectorOffsetMask; int previousData = (sectorOffset + pfsc_offset) - sectorOffsetMask;
pkgFile.Seek(fileOffset - previousData); pkgFile.Seek(fileOffset - previousData);
pkgFile.ReadRaw<u8>(pfsc.data(), pfsc.size()); pkgFile.Read(pfsc);
PKG::crypto.decryptPFS(dataKey, tweakKey, pfsc, pfs_decrypted, currentSector1); PKG::crypto.decryptPFS(dataKey, tweakKey, pfsc, pfs_decrypted, currentSector1);

6
src/core/loader.cpp
View file

@ -8,7 +8,7 @@
FileTypes DetectFileType(const std::string& filepath) { FileTypes DetectFileType(const std::string& filepath) {
if (filepath.size() == 0) // no file loaded if (filepath.size() == 0) // no file loaded
{ {
return FILETYPE_UNKNOWN; return FileTypes::Unknown;
} }
Common::FS::IOFile file; Common::FS::IOFile file;
file.Open(filepath, Common::FS::FileAccessMode::Read); file.Open(filepath, Common::FS::FileAccessMode::Read);
@ -18,7 +18,7 @@ FileTypes DetectFileType(const std::string& filepath) {
file.Close(); file.Close();
switch (magic) { switch (magic) {
case 0x544e437f: // PS4 PKG case 0x544e437f: // PS4 PKG
return FILETYPE_PKG; return FileTypes::Pkg;
} }
return FILETYPE_UNKNOWN; return FileTypes::Unknown;
} }