From 56ef8b41d18f598afa5cb0c777e4a24a10f899d8 Mon Sep 17 00:00:00 2001 From: jakcron Date: Mon, 5 Jun 2017 11:31:18 +0800 Subject: [PATCH] [ctrtool] Re-added "--seed" option, simplified/corrected common-key selection logic. --- ctrtool/cia.c | 12 +++--- ctrtool/keyset.cpp | 91 ++++++++++++++++++++++++++++++---------------- ctrtool/keyset.h | 7 +++- ctrtool/main.c | 31 +++++++++------- ctrtool/settings.c | 7 ++-- ctrtool/settings.h | 2 +- ctrtool/tik.c | 46 ++++++++--------------- ctrtool/tik.h | 6 +-- 8 files changed, 111 insertions(+), 91 deletions(-) diff --git a/ctrtool/cia.c b/ctrtool/cia.c index 4723c70..cac3260 100644 --- a/ctrtool/cia.c +++ b/ctrtool/cia.c @@ -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); diff --git a/ctrtool/keyset.cpp b/ctrtool/keyset.cpp index dd79300..b4e6763 100644 --- a/ctrtool/keyset.cpp +++ b/ctrtool/keyset.cpp @@ -36,8 +36,6 @@ static unsigned char hextobin(char c) void keyset_init(keyset* keys, u32 actions) { const key128 defaultkeys_retail[] = { - // common keyX - {{0x61, 0x70, 0x85, 0x71, 0x9b, 0x7c, 0xfb, 0x31, 0x6d, 0xf4, 0xdf, 0x2e, 0x83, 0x62, 0xc6, 0xe2}, 1}, // fixed system key - unknown if used/correct? {{0x52, 0x7c, 0xe6, 0x30, 0xa9, 0xca, 0x30, 0x5f, 0x36, 0x96, 0xf3, 0xcd, 0xe9, 0x54, 0x19, 0x4b}, 1}, // NCCH 0x2c keyX @@ -47,11 +45,21 @@ void keyset_init(keyset* keys, u32 actions) // NCCH 0x18 keyX N9.3 {{0x82, 0xe9, 0xc9, 0xbe, 0xbf, 0xb8, 0xbd, 0xb8, 0x75, 0xec, 0xc0, 0xa0, 0x7d, 0x47, 0x43, 0x74}, 1}, // NCCH 0x1B keyX N9.6 - {{0x45, 0xad, 0x04, 0x95, 0x39, 0x92, 0xc7, 0xc8, 0x93, 0x72, 0x4a, 0x9a, 0x7b, 0xce, 0x61, 0x82}, 1} + {{0x45, 0xad, 0x04, 0x95, 0x39, 0x92, 0xc7, 0xc8, 0x93, 0x72, 0x4a, 0x9a, 0x7b, 0xce, 0x61, 0x82}, 1}, + // common key index0 (application) + {{0x64, 0xC5, 0xFD, 0x55, 0xDD, 0x3A, 0xD9, 0x88, 0x32, 0x5B, 0xAA, 0xEC, 0x52, 0x43, 0xDB, 0x98}, 1}, + // common key index1 (system) + {{0x4A, 0xAA, 0x3D, 0x0E, 0x27, 0xD4, 0xD7, 0x28, 0xD0, 0xB1, 0xB4, 0x33, 0xF0, 0xF9, 0xCB, 0xC8}, 1}, + // common key index2 + {{0xFB, 0xB0, 0xEF, 0x8C, 0xDB, 0xB0, 0xD8, 0xE4, 0x53, 0xCD, 0x99, 0x34, 0x43, 0x71, 0x69, 0x7F}, 1}, + // common key index3 + {{0x25, 0x95, 0x9B, 0x7A, 0xD0, 0x40, 0x9F, 0x72, 0x68, 0x41, 0x98, 0xBA, 0x2E, 0xCD, 0x7D, 0xC6}, 1}, + // common key index4 + {{0x7A, 0xDA, 0x22, 0xCA, 0xFF, 0xC4, 0x76, 0xCC, 0x82, 0x97, 0xA0, 0xC7, 0xCE, 0xEE, 0xEE, 0xBE}, 1}, + // common key index5 + {{0xA5, 0x05, 0x1C, 0xA1, 0xB3, 0x7D, 0xCF, 0x3A, 0xFB, 0xCF, 0x8C, 0xC1, 0xED, 0xD9, 0xCE, 0x02}, 1}, }; const key128 defaultkeys_dev[] = { - // common keyX - {{0xbd, 0x4f, 0xe7, 0xe7, 0x33, 0xc7, 0x55, 0xfc, 0xe7, 0x54, 0x0e, 0xab, 0xbd, 0x8a, 0xc3, 0x0d}, 1}, // fixed system key {{0x52, 0x7c, 0xe6, 0x30, 0xa9, 0xca, 0x30, 0x5f, 0x36, 0x96, 0xf3, 0xcd, 0xe9, 0x54, 0x19, 0x4b}, 1}, // NCCH 0x2c keyX @@ -61,7 +69,19 @@ void keyset_init(keyset* keys, u32 actions) // NCCH 0x18 keyX N9.3 {{0x30, 0x4b, 0xf1, 0x46, 0x83, 0x72, 0xee, 0x64, 0x11, 0x5e, 0xbd, 0x40, 0x93, 0xd8, 0x42, 0x76}, 1}, // NCCH 0x1B keyX N9.6 - {{0x6c, 0x8b, 0x29, 0x44, 0xa0, 0x72, 0x60, 0x35, 0xf9, 0x41, 0xdf, 0xc0, 0x18, 0x52, 0x4f, 0xb6}, 1} + {{0x6c, 0x8b, 0x29, 0x44, 0xa0, 0x72, 0x60, 0x35, 0xf9, 0x41, 0xdf, 0xc0, 0x18, 0x52, 0x4f, 0xb6}, 1}, + // common key index0 + {{0x55, 0xA3, 0xF8, 0x72, 0xBD, 0xC8, 0x0C, 0x55, 0x5A, 0x65, 0x43, 0x81, 0x13, 0x9E, 0x15, 0x3B}, 1}, + // common key index1 + {{0x44, 0x34, 0xED, 0x14, 0x82, 0x0C, 0xA1, 0xEB, 0xAB, 0x82, 0xC1, 0x6E, 0x7B, 0xEF, 0x0C, 0x25}, 1}, + // common key index2 + {{0xF6, 0x2E, 0x3F, 0x95, 0x8E, 0x28, 0xA2, 0x1F, 0x28, 0x9E, 0xEC, 0x71, 0xA8, 0x66, 0x29, 0xDC}, 1}, + // common key index3 + {{0x2B, 0x49, 0xCB, 0x6F, 0x99, 0x98, 0xD9, 0xAD, 0x94, 0xF2, 0xED, 0xE7, 0xB5, 0xDA, 0x3E, 0x27}, 1}, + // common key index4 + {{0x75, 0x05, 0x52, 0xBF, 0xAA, 0x1C, 0x04, 0x07, 0x55, 0xC8, 0xD5, 0x9A, 0x55, 0xF9, 0xAD, 0x1F}, 1}, + // common key index5 + {{0xAA, 0xDA, 0x4C, 0xA8, 0xF6, 0xE5, 0xA9, 0x77, 0xE0, 0xA0, 0xF9, 0xE4, 0x76, 0xCF, 0x0D, 0x63}, 1}, }; memset(keys, 0, sizeof(keyset)); @@ -69,21 +89,23 @@ void keyset_init(keyset* keys, u32 actions) if (actions & PlainFlag) return; - if (!(actions & DevFlag)) { - memcpy(&keys->commonkeyX, &defaultkeys_retail[0], sizeof(key128)); - memcpy(&keys->ncchfixedsystemkey, &defaultkeys_retail[1], sizeof(key128)); - memcpy(&keys->ncchkeyX_old, &defaultkeys_retail[2], sizeof(key128)); - memcpy(&keys->ncchkeyX_seven, &defaultkeys_retail[3], sizeof(key128)); - memcpy(&keys->ncchkeyX_ninethree, &defaultkeys_retail[4], sizeof(key128)); - memcpy(&keys->ncchkeyX_ninesix, &defaultkeys_retail[5], sizeof(key128)); - } else { - memcpy(&keys->commonkeyX, &defaultkeys_dev[0], sizeof(key128)); - memcpy(&keys->ncchfixedsystemkey, &defaultkeys_dev[1], sizeof(key128)); - memcpy(&keys->ncchkeyX_old, &defaultkeys_dev[2], sizeof(key128)); - memcpy(&keys->ncchkeyX_seven, &defaultkeys_dev[3], sizeof(key128)); - memcpy(&keys->ncchkeyX_ninethree, &defaultkeys_dev[4], sizeof(key128)); - memcpy(&keys->ncchkeyX_ninesix, &defaultkeys_dev[5], sizeof(key128)); + // select keyset + const key128* default_keys = (actions & DevFlag)? defaultkeys_dev : defaultkeys_retail; + + u32 key_index = 0; + // set ncch keys + memcpy(&keys->ncchfixedsystemkey, &default_keys[key_index++], sizeof(key128)); + memcpy(&keys->ncchkeyX_old, &default_keys[key_index++], sizeof(key128)); + memcpy(&keys->ncchkeyX_seven, &default_keys[key_index++], sizeof(key128)); + memcpy(&keys->ncchkeyX_ninethree, &default_keys[key_index++], sizeof(key128)); + memcpy(&keys->ncchkeyX_ninesix, &default_keys[key_index++], sizeof(key128)); + + // set common keys + for (u32 i = 0; i < COMMONKEY_NUM; i++) + { + memcpy(&keys->commonkey[i], &default_keys[key_index++], sizeof(key128)); } + } int keyset_load_key(TiXmlHandle node, unsigned char* key, unsigned int size, int* valid) @@ -206,13 +228,13 @@ int keyset_load(keyset* keys, const char* fname, int verbose) keyset_load_rsakey2048(root.FirstChild("ncchrsakey"), &keys->ncchrsakey); keyset_load_rsakey2048(root.FirstChild("ncchdescrsakey"), &keys->ncchdescrsakey); keyset_load_rsakey2048(root.FirstChild("firmrsakey"), &keys->firmrsakey); - keyset_load_key128(root.FirstChild("commonkeyx"), &keys->commonkeyX); + /* keyset_load_key128(root.FirstChild("ncchfixedsystemkey"), &keys->ncchfixedsystemkey); keyset_load_key128(root.FirstChild("ncchkeyxold"), &keys->ncchkeyX_old); keyset_load_key128(root.FirstChild("ncchkeyxseven"), &keys->ncchkeyX_seven); keyset_load_key128(root.FirstChild("ncchkeyxninethree"), &keys->ncchkeyX_ninethree); keyset_load_key128(root.FirstChild("ncchkeyxninesix"), &keys->ncchkeyX_ninesix); - + */ return 1; } @@ -225,8 +247,15 @@ void keyset_merge(keyset* keys, keyset* src) keyset_set_key128(&keys->v, src->v.data);\ } while (0) + // todo complete key copy + /* COPY_IF_VALID(commonkey[0]); */ + //if () + for (size_t i = 0; i < COMMONKEY_NUM; i++) + { + COPY_IF_VALID(commonkey[i]); + } COPY_IF_VALID(titlekey); - COPY_IF_VALID(commonkeyX); + COPY_IF_VALID(seed_fallback); COPY_IF_VALID(ncchfixedsystemkey); COPY_IF_VALID(ncchkeyX_old); COPY_IF_VALID(ncchkeyX_seven); @@ -235,8 +264,8 @@ void keyset_merge(keyset* keys, keyset* src) if (src->seed_num > 0) { keys->seed_num = src->seed_num; - keys->seed_db = (seeddb_entry*)calloc(src->seed_num, sizeof(seeddb_entry)); - memcpy(keys->seed_db, src->seed_db, src->seed_num * sizeof(seeddb_entry)); + keys->seed_db = (seeddb_entry*)calloc(keys->seed_num, sizeof(seeddb_entry)); + memcpy(keys->seed_db, src->seed_db, keys->seed_num * sizeof(seeddb_entry)); } #undef COPY_IF_VALID @@ -253,11 +282,6 @@ void keyset_parse_key128(key128* key, char* keytext, int keylen) keyset_parse_key(keytext, keylen, key->data, 16, &key->valid); } -void keyset_parse_commonkeyX(keyset* keys, char* keytext, int keylen) -{ - keyset_parse_key128(&keys->commonkeyX, keytext, keylen); -} - void keyset_parse_titlekey(keyset* keys, char* keytext, int keylen) { keyset_parse_key128(&keys->titlekey, keytext, keylen); @@ -315,6 +339,12 @@ void keyset_parse_seeddb(keyset* keys, char* path) fread(keys->seed_db, keys->seed_num * sizeof(seeddb_entry), 1, fp); } +void keyset_parse_seed_fallback(keyset* keys, char* keytext, int keylen) +{ + keyset_parse_key128(&keys->seed_fallback, keytext, keylen); +} + + void keyset_dump_rsakey(rsakey2048* key, const char* keytitle) { if (key->keytype == RSAKEY_INVALID) @@ -355,7 +385,6 @@ void keyset_dump(keyset* keys) DUMP_KEY(ncchkeyX_ninethree, "NCCH N9.3 KEYX"); DUMP_KEY(ncchkeyX_ninesix, "NCCH N9.6 KEYX"); DUMP_KEY(ncchfixedsystemkey, "NCCH FIXEDSYSTEMKEY"); - DUMP_KEY(commonkeyX, "COMMON KEYX"); #undef DUMP_KEY keyset_dump_rsakey(&keys->ncsdrsakey, "NCSD RSA KEY"); diff --git a/ctrtool/keyset.h b/ctrtool/keyset.h index 3d6610f..4d9235d 100644 --- a/ctrtool/keyset.h +++ b/ctrtool/keyset.h @@ -7,6 +7,8 @@ extern "C" { #endif +#define COMMONKEY_NUM 6 + typedef enum { KEY_ERR_LEN_MISMATCH, @@ -59,8 +61,9 @@ typedef struct u32 seed_num; seeddb_entry* seed_db; + key128 commonkey[COMMONKEY_NUM]; key128 titlekey; - key128 commonkeyX; + key128 seed_fallback; key128 ncchfixedsystemkey; key128 ncchkeyX_old; key128 ncchkeyX_seven; @@ -75,7 +78,6 @@ typedef struct void keyset_init(keyset* keys, u32 actions); int keyset_load(keyset* keys, const char* fname, int verbose); void keyset_merge(keyset* keys, keyset* src); -void keyset_parse_commonkeyX(keyset* keys, char* keytext, int keylen); void keyset_parse_titlekey(keyset* keys, char* keytext, int keylen); void keyset_parse_ncchkeyX_old(keyset* keys, char* keytext, int keylen); void keyset_parse_ncchfixedsystemkey(keyset* keys, char* keytext, int keylen); @@ -83,6 +85,7 @@ void keyset_parse_ncchkeyX_seven(keyset* keys, char* keytext, int keylen); void keyset_parse_ncchkeyX_ninethree(keyset* keys, char* keytext, int keylen); void keyset_parse_ncchkeyX_ninesix(keyset* keys, char* keytext, int keylen); void keyset_parse_seeddb(keyset* keys, char* path); +void keyset_parse_seed_fallback(keyset* keys, char* keytext, int keylen); void keyset_dump(keyset* keys); #ifdef __cplusplus diff --git a/ctrtool/main.c b/ctrtool/main.c index 1711374..3c94958 100644 --- a/ctrtool/main.c +++ b/ctrtool/main.c @@ -54,11 +54,12 @@ static void usage(const char *argv0) " -y, --verify Verify hashes and signatures.\n" " -d, --dev Decrypt with development keys instead of retail.\n" " --unitsize=size Set media unit size (default 0x200).\n" - " --commonkey=key Set common key.\n" +// " --commonkey=key Set common key.\n" " --titlekey=key Set tik title key.\n" - " --ncchkey=key Set ncch key.\n" - " --ncchsyskey=key Set ncch fixed system key.\n" +// " --ncchkey=key Set ncch key.\n" +// " --ncchsyskey=key Set ncch fixed system key.\n" " --seeddb=file Set seeddb for ncch seed crypto.\n" + " --seed=key Set specific seed for ncch seed crypto.\n" " --showkeys Show the keys being used.\n" " --showsyscalls Show system call names instead of numbers.\n" " -t, --intype=type Specify input file type [ncsd, ncch, exheader, cia, tmd, lzss,\n" @@ -138,8 +139,8 @@ int main(int argc, char* argv[]) {"raw", 0, NULL, 'r'}, {"unitsize", 1, NULL, 9}, {"showkeys", 0, NULL, 10}, - {"commonkeyx", 1, NULL, 11}, - {"ncchkeyxold", 1, NULL, 12}, + //{"commonkeyx", 1, NULL, 11}, + //{"ncchkeyxold", 1, NULL, 12}, {"intype", 1, NULL, 't'}, {"lzssout", 1, NULL, 13}, {"firmdir", 1, NULL, 14}, @@ -153,10 +154,11 @@ int main(int argc, char* argv[]) {"titlekey", 1, NULL, 22}, {"plainrgn", 1, NULL, 23}, {"showsyscalls", 0, NULL, 24}, - {"ncchkeyxseven", 1, NULL, 25}, - {"ncchkeyxninethree", 1, NULL, 26}, - {"ncchkeyxninesix", 1, NULL, 27}, + //{"ncchkeyxseven", 1, NULL, 25}, + //{"ncchkeyxninethree", 1, NULL, 26}, + //{"ncchkeyxninesix", 1, NULL, 27}, {"seeddb", 1, NULL, 28}, + {"seed", 1, NULL, 29 }, {NULL}, }; @@ -237,11 +239,11 @@ int main(int argc, char* argv[]) case 8: settings_set_exefs_dir_path(&ctx.usersettings, optarg); break; case 9: settings_set_mediaunit_size(&ctx.usersettings, strtoul(optarg, 0, 0)); break; case 10: ctx.actions |= ShowKeysFlag; break; - case 11: keyset_parse_commonkeyX(&tmpkeys, optarg, strlen(optarg)); break; - case 12: keyset_parse_ncchkeyX_old(&tmpkeys, optarg, strlen(optarg)); break; + //case 11: keyset_parse_commonkeyX(&tmpkeys, optarg, strlen(optarg)); break; + //case 12: keyset_parse_ncchkeyX_old(&tmpkeys, optarg, strlen(optarg)); break; case 13: settings_set_lzss_path(&ctx.usersettings, optarg); break; case 14: settings_set_firm_dir_path(&ctx.usersettings, optarg); break; - case 15: keyset_parse_ncchfixedsystemkey(&tmpkeys, optarg, strlen(optarg)); break; + //case 15: keyset_parse_ncchfixedsystemkey(&tmpkeys, optarg, strlen(optarg)); break; case 16: settings_set_wav_path(&ctx.usersettings, optarg); break; case 17: settings_set_romfs_dir_path(&ctx.usersettings, optarg); break; case 18: settings_set_list_romfs_files(&ctx.usersettings, 1); break; @@ -251,10 +253,11 @@ int main(int argc, char* argv[]) case 22: keyset_parse_titlekey(&tmpkeys, optarg, strlen(optarg)); break; case 23: settings_set_plainrgn_path(&ctx.usersettings, optarg); break; case 24: ctx.actions |= ShowSyscallsFlag; break; - case 25: keyset_parse_ncchkeyX_seven(&tmpkeys, optarg, strlen(optarg)); break; - case 26: keyset_parse_ncchkeyX_ninethree(&tmpkeys, optarg, strlen(optarg)); break; - case 27: keyset_parse_ncchkeyX_ninesix(&tmpkeys, optarg, strlen(optarg)); break; + //case 25: keyset_parse_ncchkeyX_seven(&tmpkeys, optarg, strlen(optarg)); break; + //case 26: keyset_parse_ncchkeyX_ninethree(&tmpkeys, optarg, strlen(optarg)); break; + //case 27: keyset_parse_ncchkeyX_ninesix(&tmpkeys, optarg, strlen(optarg)); break; case 28: keyset_parse_seeddb(&tmpkeys, optarg); break; + case 29: keyset_parse_seed_fallback(&tmpkeys, optarg, strlen(optarg)); break; default: usage(argv[0]); diff --git a/ctrtool/settings.c b/ctrtool/settings.c index 15523b0..9fbf056 100644 --- a/ctrtool/settings.c +++ b/ctrtool/settings.c @@ -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) diff --git a/ctrtool/settings.h b/ctrtool/settings.h index c90947b..e634eaa 100644 --- a/ctrtool/settings.h +++ b/ctrtool/settings.h @@ -51,7 +51,7 @@ unsigned char* settings_get_ncchkeyX_old(settings* usersettings); unsigned char* settings_get_ncchkeyX_seven(settings* usersettings); unsigned char* settings_get_ncchkeyX_ninethree(settings* usersettings); unsigned char* settings_get_ncchkeyX_ninesix(settings* usersettings); -unsigned char* settings_get_common_keyX(settings* usersettings); +unsigned char* settings_get_common_key(settings* usersettings, u8 index); unsigned char* settings_get_seed(settings* usersettings, u64 title_id); unsigned char* settings_get_title_key(settings* usersettings); int settings_get_ignore_programid(settings* usersettings); diff --git a/ctrtool/tik.c b/ctrtool/tik.c index 0c1b69c..285f403 100644 --- a/ctrtool/tik.c +++ b/ctrtool/tik.c @@ -32,9 +32,9 @@ void tik_set_usersettings(tik_context* ctx, settings* usersettings) ctx->usersettings = usersettings; } -void tik_get_titlekey(tik_context* ctx, u8 key[0x10]) +const unsigned char* tik_get_titlekey(tik_context* ctx) { - memcpy(key, ctx->titlekey, 0x10); + return ctx->titlekey.valid ? ctx->titlekey.data : NULL; } void tik_get_titleid(tik_context* ctx, u8 titleid[8]) @@ -48,38 +48,24 @@ void tik_get_iv(tik_context* ctx, u8 iv[16]) memcpy(iv, ctx->tik.title_id, 8); } -void tik_decrypt_titlekey(tik_context* ctx, u8 decryptedkey[0x10]) +int tik_decrypt_titlekey(tik_context* ctx, u8 decryptedkey[0x10]) { u8 iv[16]; - u8* keyX = settings_get_common_keyX(ctx->usersettings); - const u8 keyYs[6][16] = { - // application titles (eShop titles) - {0xd0, 0x7b, 0x33, 0x7f, 0x9c, 0xa4, 0x38, 0x59, 0x32, 0xa2, 0xe2, 0x57, 0x23, 0x23, 0x2e, 0xb9}, - // system titles - {0x0c, 0x76, 0x72, 0x30, 0xf0, 0x99, 0x8f, 0x1c, 0x46, 0x82, 0x82, 0x02, 0xfa, 0xac, 0xbe, 0x4c}, - // these are unused - {0xc4, 0x75, 0xcb, 0x3a, 0xb8, 0xc7, 0x88, 0xbb, 0x57, 0x5e, 0x12, 0xa1, 0x09, 0x07, 0xb8, 0xa4}, - {0xe4, 0x86, 0xee, 0xe3, 0xd0, 0xc0, 0x9c, 0x90, 0x2f, 0x66, 0x86, 0xd4, 0xc0, 0x6f, 0x64, 0x9f}, - {0xed, 0x31, 0xba, 0x9c, 0x04, 0xb0, 0x67, 0x50, 0x6c, 0x44, 0x97, 0xa3, 0x5b, 0x78, 0x04, 0xfc}, - {0x5e, 0x66, 0x99, 0x8a, 0xb4, 0xe8, 0x93, 0x16, 0x06, 0x85, 0x0f, 0xd7, 0xa1, 0x6d, 0xd7, 0x55}, - }; - u8 key[16]; + u8* commonkey = settings_get_common_key(ctx->usersettings, ctx->tik.commonkey_idx); memset(decryptedkey, 0, 0x10); - - if (!keyX) + if (!commonkey) { - fprintf(stdout, "Warning, could not read common key.\n"); + fprintf(stdout, "Error, could not read common key.\n"); + return 1; } - else - { - ctr_aes_keygen(keyX, keyYs[(ctx->tik.title_id[3] & 0x10) ? 1 : 0], key); - memset(iv, 0, 0x10); - memcpy(iv, ctx->tik.title_id, 8); + + memset(iv, 0, 0x10); + memcpy(iv, ctx->tik.title_id, 8); - ctr_init_cbc_decrypt(&ctx->aes, key, iv); - ctr_decrypt_cbc(&ctx->aes, ctx->tik.encrypted_title_key, decryptedkey, 0x10); - } + ctr_init_cbc_decrypt(&ctx->aes, commonkey, iv); + ctr_decrypt_cbc(&ctx->aes, ctx->tik.encrypted_title_key, decryptedkey, 0x10); + return 0; } void tik_process(tik_context* ctx, u32 actions) @@ -93,7 +79,7 @@ void tik_process(tik_context* ctx, u32 actions) fseeko64(ctx->file, ctx->offset, SEEK_SET); fread((u8*)&ctx->tik, 1, sizeof(eticket), ctx->file); - tik_decrypt_titlekey(ctx, ctx->titlekey); + ctx->titlekey.valid = tik_decrypt_titlekey(ctx, ctx->titlekey.data) == 0 ? 1 : 0; if (actions & InfoFlag) { @@ -122,8 +108,8 @@ void tik_print(tik_context* ctx) memdump(stdout, "Encrypted Titlekey: ", tik->encrypted_title_key, 0x10); - if (settings_get_common_keyX(ctx->usersettings)) - memdump(stdout, "Decrypted Titlekey: ", ctx->titlekey, 0x10); + if (ctx->titlekey.valid) + memdump(stdout, "Decrypted Titlekey: ", ctx->titlekey.data, 0x10); memdump(stdout, "Ticket ID: ", tik->ticket_id, 0x08); fprintf(stdout, "Ticket Version: %d\n", getle16(tik->ticket_version)); diff --git a/ctrtool/tik.h b/ctrtool/tik.h index 1aa0596..4d85aaa 100644 --- a/ctrtool/tik.h +++ b/ctrtool/tik.h @@ -43,7 +43,7 @@ typedef struct FILE* file; u64 offset; u32 size; - u8 titlekey[16]; + key128 titlekey; eticket tik; ctr_aes_context aes; settings* usersettings; @@ -54,10 +54,10 @@ void tik_set_file(tik_context* ctx, FILE* file); void tik_set_offset(tik_context* ctx, u64 offset); void tik_set_size(tik_context* ctx, u32 size); void tik_set_usersettings(tik_context* ctx, settings* usersettings); -void tik_get_titlekey(tik_context* ctx, u8 key[0x10]); +const unsigned char* tik_get_titlekey(tik_context* ctx); void tik_get_titleid(tik_context* ctx, u8 titleid[8]); void tik_get_iv(tik_context* ctx, u8 iv[0x10]); -void tik_decrypt_titlekey(tik_context* ctx, u8 decryptedkey[0x10]); +int tik_decrypt_titlekey(tik_context* ctx, u8 decryptedkey[0x10]); void tik_print(tik_context* ctx); void tik_process(tik_context* ctx, u32 actions);