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

Add proper support for CIA title keys

Browse Source 
1. Support for `ticket.db`
2. Support for `gm9/support/encTitleKeys.bin`
3. Set the title key and common key index when building standard CIA
This commit is contained in:
Pengfei
2021-07-09 20:08:42 +08:00
parent 3429d9e965
commit 76b0912a9a
12 changed files with 268 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/importer.cpp
+9 -7
View File
@@ -73,12 +73,7 @@ bool SDMCImporter::Init() {
// Load NAND Title DB
if (!config.nand_title_db_path.empty()) {
FileUtil::IOFile file(config.nand_title_db_path, "rb");
DataContainer container(file.GetData());
std::vector<std::vector<u8>> data;
if (container.IsGood() && container.GetIVFCLevel4Data(data)) {
nand_title_db = std::make_unique<TitleDB>(std::move(data[0]));
}
nand_title_db = std::make_unique<TitleDB>(config.nand_title_db_path);
}
if (!nand_title_db || !nand_title_db->IsGood()) {
LOG_WARNING(Core, "NAND title.db invalid");
@@ -680,7 +675,7 @@ bool SDMCImporter::BuildCIA(const ContentSpecifier& specifier, std::string desti
}
}
bool ret = cia_builder->Init(destination, tmd, config.certs_db_path,
bool ret = cia_builder->Init(destination, tmd, config,
FileUtil::GetDirectoryTreeSize(physical_path), callback);
if (!ret) {
return false;
@@ -1186,6 +1181,7 @@ std::vector<Config> LoadPresetConfig(std::string mount_point) {
LOAD_DATA(bootrom_path, BOOTROM9);
LOAD_DATA(certs_db_path, CERTS_DB);
LOAD_DATA(nand_title_db_path, TITLE_DB);
LOAD_DATA(ticket_db_path, TICKET_DB);
LOAD_DATA(safe_mode_firm_path, "firm/");
LOAD_DATA(seed_db_path, SEED_DB);
LOAD_DATA(secret_sector_path, SECRET_SECTOR);
@@ -1195,6 +1191,12 @@ std::vector<Config> LoadPresetConfig(std::string mount_point) {
LOAD_DATA(nand_data_path, "data/");
#undef LOAD_DATA
// encTitleKeys.bin
if (FileUtil::Exists(mount_point + "gm9/support/" ENC_TITLE_KEYS_BIN)) {
config_template.enc_title_keys_bin_path =
mount_point + "gm9/support/" ENC_TITLE_KEYS_BIN;
}
// Load version
if (FileUtil::Exists(mount_point + "threeSD/version.txt")) {
std::ifstream stream;