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

Fix C00 SPRX loading

Browse source
This commit is contained in:
Jake 2017-05-16 23:20:04 -05:00 • committed by Ivan
parent 7ccc5d3910
commit 4bcafb3e75
5 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Crypto/key_vault.cpp
View file

@ -748,12 +748,13 @@ SELF_KEY KeyVault::FindSelfKey(u32 type, u16 revision, u64 version)
void KeyVault::SetKlicenseeKey(u8 *key) void KeyVault::SetKlicenseeKey(u8 *key)
{ {
memcpy(klicensee_key, key, 0x10); klicensee_key = std::make_unique<u8[]>(0x10);
memcpy(klicensee_key.get(), key, 0x10);
} }
u8 *KeyVault::GetKlicenseeKey() u8 *KeyVault::GetKlicenseeKey()
{ {
return klicensee_key; return klicensee_key.get();
} }
void rap_to_rif(unsigned char* rap, unsigned char* rif) void rap_to_rif(unsigned char* rap, unsigned char* rif)

5
rpcs3/Crypto/key_vault.h
View file

@ -2,6 +2,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <memory>
enum SELF_KEY_TYPE { enum SELF_KEY_TYPE {
KEY_LV0 = 1, KEY_LV0 = 1,
@ -11,7 +12,7 @@ enum SELF_KEY_TYPE {
KEY_ISO, KEY_ISO,
KEY_LDR, KEY_LDR,
KEY_UNK7, KEY_UNK7,
KEY_NPDRM KEY_NPDRM
}; };
struct SELF_KEY { struct SELF_KEY {
@ -159,7 +160,7 @@ class KeyVault
std::vector<SELF_KEY> sk_LDR_arr; std::vector<SELF_KEY> sk_LDR_arr;
std::vector<SELF_KEY> sk_UNK7_arr; std::vector<SELF_KEY> sk_UNK7_arr;
std::vector<SELF_KEY> sk_NPDRM_arr; std::vector<SELF_KEY> sk_NPDRM_arr;
u8 klicensee_key[0x10] = {}; std::unique_ptr<u8[]> klicensee_key;
public: public:
KeyVault(); KeyVault();

15
rpcs3/Crypto/unself.cpp
View file

@ -5,6 +5,7 @@
#include "unself.h" #include "unself.h"
#include "Emu/VFS.h" #include "Emu/VFS.h"
#include <algorithm>
// TODO: Still reliant on wxWidgets for zlib functions. Alternative solutions? // TODO: Still reliant on wxWidgets for zlib functions. Alternative solutions?
#include <zlib.h> #include <zlib.h>
@ -1085,9 +1086,6 @@ bool SELFDecrypter::DecryptNPDRM(u8 *metadata, u32 metadata_size)
return true; return true;
} }
u8 klicensee_key[0x10];
memcpy(klicensee_key, key_v.GetKlicenseeKey(), 0x10);
if (ctrl->npdrm.license == 1) // Network license. if (ctrl->npdrm.license == 1) // Network license.
{ {
LOG_ERROR(LOADER, "SELF: Can't decrypt network NPDRM!"); LOG_ERROR(LOADER, "SELF: Can't decrypt network NPDRM!");
@ -1105,8 +1103,8 @@ bool SELFDecrypter::DecryptNPDRM(u8 *metadata, u32 metadata_size)
else if (ctrl->npdrm.license == 3) // Free license. else if (ctrl->npdrm.license == 3) // Free license.
{ {
// Use klicensee if available. // Use klicensee if available.
if (memcmp(klicensee_key, std::array<u8, 0x10>{0}.data(), 0x10)) if (key_v.GetKlicenseeKey() != nullptr)
memcpy(npdrm_key, klicensee_key, 0x10); memcpy(npdrm_key, key_v.GetKlicenseeKey(), 0x10);
else else
memcpy(npdrm_key, NP_KLIC_FREE, 0x10); memcpy(npdrm_key, NP_KLIC_FREE, 0x10);
} }
@ -1559,4 +1557,11 @@ extern bool verify_npdrm_self_headers(const fs::file& self, u8* klic_key)
} }
} }
return true; return true;
}
std::array<u8, 0x10> get_default_self_klic()
{
std::array<u8, 0x10> key;
std::copy(std::begin(NP_KLIC_FREE), std::end(NP_KLIC_FREE), std::begin(key));
return key;
} }

1
rpcs3/Crypto/unself.h
View file

@ -418,3 +418,4 @@ public:
extern fs::file decrypt_self(fs::file elf_or_self, u8* klic_key = nullptr); extern fs::file decrypt_self(fs::file elf_or_self, u8* klic_key = nullptr);
extern bool verify_npdrm_self_headers(const fs::file& self, u8* klic_key = nullptr); extern bool verify_npdrm_self_headers(const fs::file& self, u8* klic_key = nullptr);
extern std::array<u8, 0x10> get_default_self_klic();

3
rpcs3/Emu/Cell/Modules/sceNp.cpp
View file

@ -83,6 +83,9 @@ s32 npDrmIsAvailable(vm::cptr<u8> k_licensee_addr, vm::cptr<char> drm_path)
if (magic == "SCE\0"_u32) if (magic == "SCE\0"_u32)
{ {
if (k_licensee_addr == vm::null)
k_licensee = get_default_self_klic();
if (verify_npdrm_self_headers(enc_file, k_licensee.data())) if (verify_npdrm_self_headers(enc_file, k_licensee.data()))
{ {
npdrmkeys->devKlic = std::move(k_licensee); npdrmkeys->devKlic = std::move(k_licensee);