[ctrtool] Re-added "--seed" option, simplified/corrected common-key selection logic.

This commit is contained in:
jakcron
2017-06-05 11:31:18 +08:00
parent 3cca6a7a93
commit 56ef8b41d1
8 changed files with 111 additions and 91 deletions
+4 -3
View File
@@ -168,9 +168,10 @@ unsigned char* settings_get_ncchkeyX_ninesix(settings* usersettings)
GETKEY(usersettings, ncchkeyX_ninesix);
}
unsigned char* settings_get_common_keyX(settings* usersettings)
unsigned char* settings_get_common_key(settings* usersettings, u8 index)
{
GETKEY(usersettings, commonkeyX);
if (index > (COMMONKEY_NUM - 1)) return NULL;
GETKEY(usersettings, commonkey[index]);
}
unsigned char* settings_get_seed(settings* usersettings, u64 title_id)
@@ -182,7 +183,7 @@ unsigned char* settings_get_seed(settings* usersettings, u64 title_id)
return usersettings->keys.seed_db[i].seed;
}
}
return NULL;
GETKEY(usersettings, seed_fallback);
}
unsigned char* settings_get_title_key(settings* usersettings)