Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Edat / Sdata: On the fly decryption for edat, fix EDAT_FLAG_0x20 decryption

Browse Source
This commit is contained in:
Jake
2017-03-10 03:06:36 -06:00
parent 596db2c29c
commit a6f8e4f6b3
7 changed files with 247 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Crypto/unedat.h
+27 -6
View File
@@ -2,6 +2,8 @@
#include <stdio.h>
#include <string.h>
#include <array>
#include "utils.h"
constexpr u32 SDAT_FLAG = 0x01000000;
@@ -12,6 +14,12 @@ constexpr u32 EDAT_FLAG_0x10 = 0x00000010;
constexpr u32 EDAT_FLAG_0x20 = 0x00000020;
constexpr u32 EDAT_DEBUG_DATA_FLAG = 0x80000000;
struct EdatKeys_t
{
std::array<u8, 0x10> devKlic{};
std::array<u8, 0x10> rifKey{};
};
struct NPD_HEADER
{
u32 magic;
@@ -36,11 +44,14 @@ struct EDAT_HEADER
// Decrypts full file, or null/empty file
extern fs::file DecryptEDAT(const fs::file& input, const std::string& input_file_name, int mode, const std::string& rap_file_name, u8 *custom_klic, bool verbose);
struct SDATADecrypter final : fs::file_base
extern bool VerifyEDATHeaderWithKLicense(const fs::file& input, const std::string& input_file_name, const std::array<u8,0x10>& custom_klic);
extern std::array<u8, 0x10> GetEdatRifKeyFromRapFile(const fs::file& rap_file);
struct EDATADecrypter final : fs::file_base
{
// file stream
const fs::file sdata_file;
const u64 file_offset;
const fs::file edata_file;
u64 file_size{0};
u32 total_blocks{0};
u64 pos{0};
@@ -53,9 +64,19 @@ struct SDATADecrypter final : fs::file_base
u64 data_buf_size{0};
std::array<u8, 0x10> dec_key{};
// edat usage
std::array<u8, 0x10> rif_key{};
std::array<u8, 0x10> dev_key{};
public:
SDATADecrypter(fs::file&& input, u64 offset=0);
~SDATADecrypter() override {}
// SdataByFd usage
EDATADecrypter(fs::file&& input)
: edata_file(std::move(input)) {}
// Edat usage
EDATADecrypter(fs::file&& input, const std::array<u8, 0x10>& dev_key, const std::array<u8, 0x10>& rif_key)
: edata_file(std::move(input)), rif_key(rif_key), dev_key(dev_key) {}
~EDATADecrypter() override {}
// false if invalid
bool ReadHeader();
u64 ReadData(u64 pos, u8* data, u64 size);
@@ -92,7 +113,7 @@ public:
whence == fs::seek_set ? pos = offset :
whence == fs::seek_cur ? pos = offset + pos :
whence == fs::seek_end ? pos = offset + size() :
(fmt::raw_error("SDATADecrypter::seek(): invalid whence"), 0);
(fmt::raw_error("EDATADecrypter::seek(): invalid whence"), 0);
}
u64 size() override { return file_size; }
};