mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-12 09:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix decrypt_self usage

Browse Source
This commit is contained in:
Nekotekina 2017-09-01 02:10:57 +03:00
parent 174f11bdbd
commit 5b00aaf561
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/Cell/Modules/sys_spu_.cpp
View File

@ -383,7 +383,7 @@ s32 sys_raw_spu_load(s32 id, vm::cptr<char> path, vm::ptr<u32> entry)
{
sysPrxForUser.warning("sys_raw_spu_load(id=%d, path=%s, entry=*0x%x)", id, path, entry);
const fs::file elf_file = decrypt_self(fs::file(vfs::get(path.get_ptr())));
const fs::file elf_file = fs::file(vfs::get(path.get_ptr()));
if (!elf_file)
{

4
rpcs3/Emu/Cell/lv2/sys_prx.cpp
View File

@ -121,9 +121,7 @@ error_code prx_load_module(std::string path, u64 flags, vm::ptr<sys_prx_load_mod
return not_an_error(idm::last_id());
}
const auto loadedkeys = fxm::get_always<LoadedNpdrmKeys_t>();
const ppu_prx_object obj = decrypt_self(fs::file(vfs::get(path)), loadedkeys->devKlic.data());
const ppu_prx_object obj = decrypt_self(fs::file(vfs::get(path)), fxm::get_always<LoadedNpdrmKeys_t>()->devKlic.data());
if (obj != elf_error::ok)
{

5
rpcs3/Emu/Cell/lv2/sys_spu.cpp
View File

@ -3,6 +3,7 @@
#include "Emu/System.h"
#include "Emu/IdManager.h"
#include "Crypto/unself.h"
#include "Crypto/unedat.h"
#include "Crypto/sha1.h"
#include "Loader/ELF.h"
#include "Utilities/bin_patch.h"
@ -163,11 +164,11 @@ error_code sys_spu_image_open(vm::ptr<sys_spu_image> img, vm::cptr<char> path)
{
sys_spu.warning("sys_spu_image_open(img=*0x%x, path=%s)", img, path);
const fs::file elf_file = decrypt_self(fs::file(vfs::get(path.get_ptr())));
const fs::file elf_file = decrypt_self(fs::file(vfs::get(path.get_ptr())), fxm::get_always<LoadedNpdrmKeys_t>()->devKlic.data());
if (!elf_file)
{
sys_spu.error("sys_spu_image_open() error: %s not found!", path);
sys_spu.error("sys_spu_image_open() error: failed to open %s!", path);
return CELL_ENOENT;
}