Dark98/threeSD
1
0
Fork 0
mirror of https://github.com/Dark98/threeSD.git synced 2026-07-03 00:38:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: Add slot0x18KeyX and slot0x1BKeyX

Browse Source
This commit is contained in:
zhupengfei
2020-05-01 13:24:34 +08:00
parent 0f7ebef23f
commit c6d561d4ed
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/importer.cpp
+7 -3
View File
@@ -265,6 +265,8 @@ bool SDMCImporter::ImportSysdata(u64 id, [[maybe_unused]] const ProgressCallback
return false; return false;
} }
file.WriteString("slot0x25KeyX=" + Key::KeyToString(Key::GetKeyX(0x25)) + "\n"); file.WriteString("slot0x25KeyX=" + Key::KeyToString(Key::GetKeyX(0x25)) + "\n");
file.WriteString("slot0x18KeyX=" + Key::KeyToString(Key::GetKeyX(0x18)) + "\n");
file.WriteString("slot0x1BKeyX=" + Key::KeyToString(Key::GetKeyX(0x1B)) + "\n");
return true; return true;
} }
case 5: { // Config savegame case 5: { // Config savegame
@@ -504,10 +506,12 @@ void SDMCImporter::ListSysdata(std::vector<ContentSpecifier>& out) const {
CHECK_CONTENT(0, config.bootrom_path, sysdata_path + BOOTROM9, BOOTROM9); CHECK_CONTENT(0, config.bootrom_path, sysdata_path + BOOTROM9, BOOTROM9);
CHECK_CONTENT(3, config.secret_sector_path, sysdata_path + SECRET_SECTOR, SECRET_SECTOR); CHECK_CONTENT(3, config.secret_sector_path, sysdata_path + SECRET_SECTOR, SECRET_SECTOR);
if (!config.bootrom_path.empty()) { if (!config.bootrom_path.empty()) {
// 47 bytes = "slot0x26KeyX=<32>\r\n" is only for Windows, // Check in case there was an older version
const bool exists = FileUtil::Exists(sysdata_path + AES_KEYS) &&
FileUtil::GetSize(sysdata_path + AES_KEYS) >= 46 * 3;
// 47 bytes = "slot0xIDKeyX=<32>\r\n" is only for Windows,
// but it's maximum_size so probably okay // but it's maximum_size so probably okay
out.push_back( out.push_back({ContentType::Sysdata, 4, exists, 47 * 3, AES_KEYS});
{ContentType::Sysdata, 4, FileUtil::Exists(sysdata_path + AES_KEYS), 47, AES_KEYS});
} }
CHECK_CONTENT(5, config.config_savegame_path, CHECK_CONTENT(5, config.config_savegame_path,
fmt::format("{}data/00000000000000000000000000000000/sysdata/00010017/", fmt::format("{}data/00000000000000000000000000000000/sysdata/00010017/",
src/core/key/key.cpp
+17 -9
View File
@@ -162,17 +162,25 @@ void LoadBootromKeys(const std::string& path) {
} }
} }
// HACK: "Dump" 0x25 KeyX constexpr std::array<std::pair<std::size_t, std::array<u64, 16>>, 3> hack_keyXs{
// TODO: Is this legal? {{0x25,
constexpr std::array<u64, 16> offsets{{0x138A, 0xCAB, 0xD07, 0x3004, 0x2C, 0x49, 0xE6, 0x146E, {{0x138A, 0xCAB, 0xD07, 0x3004, 0x2C, 0x49, 0xE6, 0x146E, 0x1126, 0xD0, 0x85C, 0x47,
0x1126, 0xD0, 0x85C, 0x47, 0x70A, 0x112C, 0x808, 0x89}}; 0x70A, 0x112C, 0x808, 0x89}}},
{0x18,
{{0x70A, 0xFF, 0xDB8, 0x2D70, 0x1084, 0x36B, 0x3EA, 0x36B, 0xDA7, 0x16F1, 0x49, 0x46,
0xE96, 0x1095, 0x963, 0xD97}}},
{0x1B,
{{0x1540, 0x1B40, 0x4C, 0xF8D, 0x940, 0x4E, 0x1C0B, 0x108A, 0x23A, 0xD71, 0x1179, 0x828,
0xE6C, 0x138A, 0xD14, 0x70A}}}}};
for (std::size_t i = 0; i < offsets.size(); ++i) { for (const auto& [slot, offsets] : hack_keyXs) {
file.Seek(offsets[i], SEEK_SET); for (std::size_t i = 0; i < offsets.size(); ++i) {
file.ReadBytes(&new_key[i], 1); file.Seek(offsets[i], SEEK_SET);
file.ReadBytes(&new_key[i], 1);
}
LOG_DEBUG(Key, "Loaded Slot{:#04x} KeyX: {}", slot, KeyToString(new_key));
SetKeyX(slot, new_key);
} }
LOG_DEBUG(Key, "Loaded Slot0x25 KeyX: {}", KeyToString(new_key));
SetKeyX(0x25, new_key);
} }
void LoadMovableSedKeys(const std::string& path) { void LoadMovableSedKeys(const std::string& path) {