ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WiiSave: Get rid of some magic numbers 

It would make sense for 0x80 and 0xf0c0 to be respectively
sizeof(BkHeader) and sizeof(Header) as Nintendo is signing anything
that comes after the header, including the BkHeader.
This commit is contained in:
Léo Lam 2018-06-01 23:44:24 +02:00
parent 8eafd1928e
commit 210377816d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HW/WiiSave.cpp
View File

@ -78,6 +78,7 @@ struct Header
DataBinHeader hdr; DataBinHeader hdr;
u8 banner[FULL_BNR_MAX]; u8 banner[FULL_BNR_MAX];
}; };
static_assert(sizeof(Header) == 0xf0c0, "Header has an incorrect size");
struct BkHeader struct BkHeader
{ {
@ -96,6 +97,7 @@ struct BkHeader
std::array<u8, 6> mac_address; std::array<u8, 6> mac_address;
std::array<u8, 0x12> padding; std::array<u8, 0x12> padding;
}; };
static_assert(sizeof(BkHeader) == 0x80, "BkHeader has an incorrect size");
struct FileHDR struct FileHDR
{ {
@ -464,9 +466,9 @@ private:
return false; return false;
// Read data to sign. // Read data to sign.
const u32 data_size = bk_header->size_of_files + 0x80; const u32 data_size = bk_header->size_of_files + sizeof(BkHeader);
auto data = std::make_unique<u8[]>(data_size); auto data = std::make_unique<u8[]>(data_size);
m_file.Seek(0xf0c0, SEEK_SET); m_file.Seek(sizeof(Header), SEEK_SET);
if (!m_file.ReadBytes(data.get(), data_size)) if (!m_file.ReadBytes(data.get(), data_size))
return false; return false;