[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
+5 -7
View File
@@ -211,14 +211,12 @@ void cia_process(cia_context* ctx, u32 actions)
tik_process(&ctx->tik, actions);
memset(ctx->iv, 0, 16);
if (settings_get_common_keyX(ctx->usersettings))
tik_get_titlekey(&ctx->tik, ctx->titlekey);
else if(settings_get_title_key(ctx->usersettings))
memcpy(ctx->titlekey, settings_get_title_key(ctx->usersettings), 16);
if (tik_get_titlekey(&ctx->tik))
memcpy(ctx->titlekey, tik_get_titlekey(&ctx->tik), 16);
else if (settings_get_title_key(ctx->usersettings))
memcpy(ctx->titlekey, settings_get_title_key(ctx->usersettings), 16);
tmd_set_file(&ctx->tmd, ctx->file);
tmd_set_offset(&ctx->tmd, ctx->offsettmd);
tmd_set_size(&ctx->tmd, ctx->sizetmd);