mirror of
https://github.com/SciresM/hactool
synced 2024-11-10 06:34:14 +00:00
Add basic package2 parsing.
Still needs section saving, and parsing/extraction of INI1. This will require implementing both an INI1 and a KIP1 parser.
This commit is contained in:
Michael Scire
parent
0eb41a5f6b
commit
9ddd0d070e
5 changed files with 225 additions and 6 deletions
18
main.c
18
main.c
|
|
@ -180,13 +180,10 @@ int main(int argc, char **argv) {
|
|||
nca_ctx.tool_ctx->file_type = FILETYPE_NPDM;
|
||||
} else if (!strcmp(optarg, "package1") || !strcmp(optarg, "pk11")) {
|
||||
nca_ctx.tool_ctx->file_type = FILETYPE_PACKAGE1;
|
||||
} else if (!strcmp(optarg, "package2") || !strcmp(optarg, "pk21")) {
|
||||
nca_ctx.tool_ctx->file_type = FILETYPE_PACKAGE2;
|
||||
}
|
||||
/* } else if (!strcmp(optarg, "package2") || !strcmp(optarg, "pk21")) {
|
||||
* nca_ctx.tool_ctx->file_type = FILETYPE_PACKAGE2;
|
||||
* }
|
||||
*/
|
||||
break;
|
||||
|
||||
case 0: filepath_set(&nca_ctx.tool_ctx->settings.section_paths[0], optarg); break;
|
||||
case 1: filepath_set(&nca_ctx.tool_ctx->settings.section_paths[1], optarg); break;
|
||||
case 2: filepath_set(&nca_ctx.tool_ctx->settings.section_paths[2], optarg); break;
|
||||
|
|
@ -437,6 +434,17 @@ int main(int argc, char **argv) {
|
|||
}
|
||||
break;
|
||||
}
|
||||
case FILETYPE_PACKAGE2: {
|
||||
pk21_ctx_t pk21_ctx;
|
||||
memset(&pk21_ctx, 0, sizeof(pk21_ctx));
|
||||
pk21_ctx.file = tool_ctx.file;
|
||||
pk21_ctx.tool_ctx = &tool_ctx;
|
||||
pk21_process(&pk21_ctx);
|
||||
if (pk21_ctx.sections) {
|
||||
free(pk21_ctx.sections);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case FILETYPE_XCI: {
|
||||
xci_ctx_t xci_ctx;
|
||||
memset(&xci_ctx, 0, sizeof(xci_ctx));
|
||||
|
|
|
|||
137
packages.c
137
packages.c
|
|
@ -2,6 +2,8 @@
|
|||
#include <stdio.h>
|
||||
#include "packages.h"
|
||||
#include "aes.h"
|
||||
#include "rsa.h"
|
||||
#include "sha.h"
|
||||
|
||||
void pk11_process(pk11_ctx_t *ctx) {
|
||||
fseeko64(ctx->file, 0, SEEK_SET);
|
||||
|
|
@ -115,4 +117,139 @@ void pk11_save(pk11_ctx_t *ctx) {
|
|||
printf("Saving Secure_Monitor.bin to %s/Secure_Monitor.bin...\n", dirpath->char_path);
|
||||
save_buffer_to_directory_file(pk11_get_secmon(ctx), ctx->pk11->secmon_size, dirpath, "Secure_Monitor.bin");
|
||||
}
|
||||
}
|
||||
|
||||
void pk21_process(pk21_ctx_t *ctx) {
|
||||
fseeko64(ctx->file, 0, SEEK_SET);
|
||||
if (fread(&ctx->header, 1, sizeof(ctx->header), ctx->file) != sizeof(ctx->header)) {
|
||||
fprintf(stderr, "Failed to read PK21 Header!\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (rsa2048_pss_verify(&ctx->header.ctr, 0x100, ctx->header.signature, ctx->tool_ctx->settings.keyset.package2_fixed_key_modulus)) {
|
||||
ctx->signature_validity = VALIDITY_VALID;
|
||||
} else {
|
||||
ctx->signature_validity = VALIDITY_INVALID;
|
||||
}
|
||||
|
||||
/* Nintendo, what the fuck? */
|
||||
ctx->package_size = ctx->header.ctr_dwords[0] ^ ctx->header.ctr_dwords[2] ^ ctx->header.ctr_dwords[3];
|
||||
if (ctx->package_size > 0x7FC000) {
|
||||
fprintf(stderr, "Error: Package2 Header is corrupt!\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
unsigned char ctr[0x10];
|
||||
pk21_header_t temp_header;
|
||||
memcpy(ctr, ctx->header.ctr, sizeof(ctr));
|
||||
|
||||
aes_ctx_t *crypt_ctx = NULL;
|
||||
for (unsigned int i = 0; i < 0x20; i++) {
|
||||
ctx->key_rev = i;
|
||||
memcpy(&temp_header, &ctx->header, sizeof(temp_header));
|
||||
crypt_ctx = new_aes_ctx(&ctx->tool_ctx->settings.keyset.package2_keys[i], 0x10, AES_MODE_CTR);
|
||||
aes_setiv(crypt_ctx, ctr, 0x10);
|
||||
aes_decrypt(crypt_ctx, &temp_header.ctr[0], &temp_header.ctr[0], 0x100);
|
||||
if (temp_header.magic == MAGIC_PK21) {
|
||||
memcpy(&ctx->header, &temp_header, sizeof(temp_header));
|
||||
memcpy(ctx->header.ctr, ctr, sizeof(ctr));
|
||||
break;
|
||||
}
|
||||
free_aes_ctx(crypt_ctx);
|
||||
crypt_ctx = NULL;
|
||||
}
|
||||
|
||||
if (crypt_ctx == NULL) {
|
||||
fprintf(stderr, "Failed to decrypt PK21! Is correct key present?\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (ctx->package_size != 0x200 + ctx->header.section_sizes[0] + ctx->header.section_sizes[1] + ctx->header.section_sizes[2]) {
|
||||
fprintf(stderr, "Error: Package2 Header is corrupt!\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
ctx->sections = malloc(ctx->package_size);
|
||||
if (ctx->sections == NULL) {
|
||||
fprintf(stderr, "Failed to allocate sections!\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (fread(ctx->sections, 1, ctx->package_size - 0x200, ctx->file) != ctx->package_size - 0x200) {
|
||||
fprintf(stderr, "Failed to read PK21 Sections!\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
uint64_t offset = 0;
|
||||
for (unsigned int i = 0; i < 3; i++) {
|
||||
unsigned char calc_hash[0x20];
|
||||
sha256_hash_buffer(calc_hash, ctx->sections + offset, ctx->header.section_sizes[i]);
|
||||
if (memcmp(calc_hash, ctx->header.section_hashes[i], 0x20) == 0) {
|
||||
ctx->section_validities[i] = VALIDITY_VALID;
|
||||
} else {
|
||||
ctx->section_validities[i] = VALIDITY_INVALID;
|
||||
}
|
||||
aes_setiv(crypt_ctx, ctx->header.section_ctrs[i], 0x10);
|
||||
aes_decrypt(crypt_ctx, ctx->sections + offset, ctx->sections + offset, ctx->header.section_sizes[i]);
|
||||
offset += ctx->header.section_sizes[i];
|
||||
}
|
||||
|
||||
/* TODO: Parse INI1 */
|
||||
|
||||
if (ctx->tool_ctx->action & ACTION_INFO) {
|
||||
pk21_print(ctx);
|
||||
}
|
||||
|
||||
if (ctx->tool_ctx->action & ACTION_EXTRACT) {
|
||||
pk21_save(ctx);
|
||||
}
|
||||
}
|
||||
|
||||
const char *pk21_get_section_name(int section) {
|
||||
switch (section) {
|
||||
case 0: return "Kernel";
|
||||
case 1: return "INI1";
|
||||
case 2: return "Empty";
|
||||
default: return "Unknown";
|
||||
}
|
||||
}
|
||||
|
||||
void pk21_print(pk21_ctx_t *ctx) {
|
||||
printf("PK21:\n");
|
||||
if (ctx->tool_ctx->action & ACTION_VERIFY && ctx->signature_validity != VALIDITY_UNCHECKED) {
|
||||
if (ctx->signature_validity == VALIDITY_VALID) {
|
||||
memdump(stdout, " Signature (GOOD): ", &ctx->header.signature, 0x100);
|
||||
} else {
|
||||
memdump(stdout, " Signature (FAIL): ", &ctx->header.signature, 0x100);
|
||||
}
|
||||
} else {
|
||||
memdump(stdout, " Signature: ", &ctx->header.signature, 0x100);
|
||||
}
|
||||
|
||||
/* What the fuck? */
|
||||
printf(" Header Version: %02"PRIx32"\n", (ctx->header.ctr_dwords[1] ^ (ctx->header.ctr_dwords[1] >> 16) ^ (ctx->header.ctr_dwords[1] >> 24)) & 0xFF);
|
||||
|
||||
for (unsigned int i = 0; i < 3; i++) {
|
||||
printf(" Section %"PRId32" (%s):\n", i, pk21_get_section_name(i));
|
||||
if (ctx->tool_ctx->action & ACTION_VERIFY) {
|
||||
if (ctx->section_validities[i] == VALIDITY_VALID) {
|
||||
memdump(stdout, " Hash (GOOD): ", ctx->header.section_hashes[i], 0x20);
|
||||
} else {
|
||||
memdump(stdout, " Hash (FAIL): ", ctx->header.section_hashes[i], 0x20);
|
||||
}
|
||||
} else {
|
||||
memdump(stdout, " Hash: ", ctx->header.section_hashes[i], 0x20);
|
||||
}
|
||||
memdump(stdout, " CTR: ", ctx->header.section_ctrs[i], 0x20);
|
||||
printf(" Load Address: %08"PRIx32"\n", ctx->header.section_offsets[i] + 0x80000000);
|
||||
printf(" Size: %08"PRIx32"\n", ctx->header.section_sizes[i]);
|
||||
}
|
||||
|
||||
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
void pk21_save(pk21_ctx_t *ctx) {
|
||||
printf("Saving PK21 currently not implemented.\n");
|
||||
/* TODO: Save sections + extract INI1 */
|
||||
}
|
||||
37
packages.h
37
packages.h
|
|
@ -56,4 +56,41 @@ void pk11_process(pk11_ctx_t *ctx);
|
|||
void pk11_print(pk11_ctx_t *ctx);
|
||||
void pk11_save(pk11_ctx_t *ctx);
|
||||
|
||||
|
||||
/* Package2 */
|
||||
#pragma pack(push, 1)
|
||||
typedef struct {
|
||||
unsigned char signature[0x100];
|
||||
union {
|
||||
unsigned char ctr[0x10];
|
||||
uint32_t ctr_dwords[0x4];
|
||||
};
|
||||
unsigned char section_ctrs[4][0x10];
|
||||
uint32_t magic;
|
||||
uint32_t base_offset;
|
||||
uint32_t _0x58;
|
||||
uint8_t version_max; /* Must be > TZ value. */
|
||||
uint8_t version_min; /* Must be < TZ value. */
|
||||
uint16_t _0x5E;
|
||||
uint32_t section_sizes[4];
|
||||
uint32_t section_offsets[4];
|
||||
unsigned char section_hashes[4][0x20];
|
||||
} pk21_header_t;
|
||||
#pragma pack(pop)
|
||||
|
||||
typedef struct {
|
||||
FILE *file;
|
||||
hactool_ctx_t *tool_ctx;
|
||||
unsigned int key_rev;
|
||||
uint32_t package_size;
|
||||
validity_t signature_validity;
|
||||
validity_t section_validities[4];
|
||||
unsigned char *sections;
|
||||
pk21_header_t header;
|
||||
} pk21_ctx_t;
|
||||
|
||||
void pk21_process(pk21_ctx_t *ctx);
|
||||
void pk21_print(pk21_ctx_t *ctx);
|
||||
void pk21_save(pk21_ctx_t *ctx);
|
||||
|
||||
#endif
|
||||
36
pki.c
36
pki.c
|
|
@ -219,6 +219,24 @@ const nca_keyset_t nca_keys_retail = {
|
|||
0xB7, 0x88, 0x4A, 0x14, 0x84, 0x80, 0x33, 0x3C, 0x9D, 0x44, 0xB7, 0x3F, 0x4C, 0xE1, 0x75, 0xEA,
|
||||
0x37, 0xEA, 0xE8, 0x1E, 0x7C, 0x77, 0xB7, 0xC6, 0x1A, 0xA2, 0xF0, 0x9F, 0x10, 0x61, 0xCD, 0x7B,
|
||||
0x5B, 0x32, 0x4C, 0x37, 0xEF, 0xB1, 0x71, 0x68, 0x53, 0x0A, 0xED, 0x51, 0x7D, 0x35, 0x22, 0xFD
|
||||
},
|
||||
{ /* Fixed RSA key used to validate PK21 signatures. */
|
||||
0x8D, 0x13, 0xA7, 0x77, 0x6A, 0xE5, 0xDC, 0xC0, 0x3B, 0x25, 0xD0, 0x58, 0xE4, 0x20, 0x69, 0x59,
|
||||
0x55, 0x4B, 0xAB, 0x70, 0x40, 0x08, 0x28, 0x07, 0xA8, 0xA7, 0xFD, 0x0F, 0x31, 0x2E, 0x11, 0xFE,
|
||||
0x47, 0xA0, 0xF9, 0x9D, 0xDF, 0x80, 0xDB, 0x86, 0x5A, 0x27, 0x89, 0xCD, 0x97, 0x6C, 0x85, 0xC5,
|
||||
0x6C, 0x39, 0x7F, 0x41, 0xF2, 0xFF, 0x24, 0x20, 0xC3, 0x95, 0xA6, 0xF7, 0x9D, 0x4A, 0x45, 0x74,
|
||||
0x8B, 0x5D, 0x28, 0x8A, 0xC6, 0x99, 0x35, 0x68, 0x85, 0xA5, 0x64, 0x32, 0x80, 0x9F, 0xD3, 0x48,
|
||||
0x39, 0xA2, 0x1D, 0x24, 0x67, 0x69, 0xDF, 0x75, 0xAC, 0x12, 0xB5, 0xBD, 0xC3, 0x29, 0x90, 0xBE,
|
||||
0x37, 0xE4, 0xA0, 0x80, 0x9A, 0xBE, 0x36, 0xBF, 0x1F, 0x2C, 0xAB, 0x2B, 0xAD, 0xF5, 0x97, 0x32,
|
||||
0x9A, 0x42, 0x9D, 0x09, 0x8B, 0x08, 0xF0, 0x63, 0x47, 0xA3, 0xE9, 0x1B, 0x36, 0xD8, 0x2D, 0x8A,
|
||||
0xD7, 0xE1, 0x54, 0x11, 0x95, 0xE4, 0x45, 0x88, 0x69, 0x8A, 0x2B, 0x35, 0xCE, 0xD0, 0xA5, 0x0B,
|
||||
0xD5, 0x5D, 0xAC, 0xDB, 0xAF, 0x11, 0x4D, 0xCA, 0xB8, 0x1E, 0xE7, 0x01, 0x9E, 0xF4, 0x46, 0xA3,
|
||||
0x8A, 0x94, 0x6D, 0x76, 0xBD, 0x8A, 0xC8, 0x3B, 0xD2, 0x31, 0x58, 0x0C, 0x79, 0xA8, 0x26, 0xE9,
|
||||
0xD1, 0x79, 0x9C, 0xCB, 0xD4, 0x2B, 0x6A, 0x4F, 0xC6, 0xCC, 0xCF, 0x90, 0xA7, 0xB9, 0x98, 0x47,
|
||||
0xFD, 0xFA, 0x4C, 0x6C, 0x6F, 0x81, 0x87, 0x3B, 0xCA, 0xB8, 0x50, 0xF6, 0x3E, 0x39, 0x5D, 0x4D,
|
||||
0x97, 0x3F, 0x0F, 0x35, 0x39, 0x53, 0xFB, 0xFA, 0xCD, 0xAB, 0xA8, 0x7A, 0x62, 0x9A, 0x3F, 0xF2,
|
||||
0x09, 0x27, 0x96, 0x3F, 0x07, 0x9A, 0x91, 0xF7, 0x16, 0xBF, 0xC6, 0x3A, 0x82, 0x5A, 0x4B, 0xCF,
|
||||
0x49, 0x50, 0x95, 0x8C, 0x55, 0x80, 0x7E, 0x39, 0xB1, 0x48, 0x05, 0x1E, 0x21, 0xC7, 0x24, 0x4F
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -438,6 +456,24 @@ const nca_keyset_t nca_keys_dev = {
|
|||
0xB5, 0x99, 0xA5, 0x9F, 0x49, 0xF2, 0xD7, 0x58, 0xFA, 0xF9, 0xC0, 0x25, 0x7D, 0xD6, 0xCB, 0xF3,
|
||||
0xD8, 0x6C, 0xA2, 0x69, 0x91, 0x68, 0x73, 0xB1, 0x94, 0x6F, 0xA3, 0xF3, 0xB9, 0x7D, 0xF8, 0xE0,
|
||||
0x72, 0x9E, 0x93, 0x7B, 0x7A, 0xA2, 0x57, 0x60, 0xB7, 0x5B, 0xA9, 0x84, 0xAE, 0x64, 0x88, 0x69
|
||||
},
|
||||
{ /* Fixed RSA key used to validate PK21 signatures. */
|
||||
0xB3, 0x65, 0x54, 0xFB, 0x0A, 0xB0, 0x1E, 0x85, 0xA7, 0xF6, 0xCF, 0x91, 0x8E, 0xBA, 0x96, 0x99,
|
||||
0x0D, 0x8B, 0x91, 0x69, 0x2A, 0xEE, 0x01, 0x20, 0x4F, 0x34, 0x5C, 0x2C, 0x4F, 0x4E, 0x37, 0xC7,
|
||||
0xF1, 0x0B, 0xD4, 0xCD, 0xA1, 0x7F, 0x93, 0xF1, 0x33, 0x59, 0xCE, 0xB1, 0xE9, 0xDD, 0x26, 0xE6,
|
||||
0xF3, 0xBB, 0x77, 0x87, 0x46, 0x7A, 0xD6, 0x4E, 0x47, 0x4A, 0xD1, 0x41, 0xB7, 0x79, 0x4A, 0x38,
|
||||
0x06, 0x6E, 0xCF, 0x61, 0x8F, 0xCD, 0xC1, 0x40, 0x0B, 0xFA, 0x26, 0xDC, 0xC0, 0x34, 0x51, 0x83,
|
||||
0xD9, 0x3B, 0x11, 0x54, 0x3B, 0x96, 0x27, 0x32, 0x9A, 0x95, 0xBE, 0x1E, 0x68, 0x11, 0x50, 0xA0,
|
||||
0x6B, 0x10, 0xA8, 0x83, 0x8B, 0xF5, 0xFC, 0xBC, 0x90, 0x84, 0x7A, 0x5A, 0x5C, 0x43, 0x52, 0xE6,
|
||||
0xC8, 0x26, 0xE9, 0xFE, 0x06, 0xA0, 0x8B, 0x53, 0x0F, 0xAF, 0x1E, 0xC4, 0x1C, 0x0B, 0xCF, 0x50,
|
||||
0x1A, 0xA4, 0xF3, 0x5C, 0xFB, 0xF0, 0x97, 0xE4, 0xDE, 0x32, 0x0A, 0x9F, 0xE3, 0x5A, 0xAA, 0xB7,
|
||||
0x44, 0x7F, 0x5C, 0x33, 0x60, 0xB9, 0x0F, 0x22, 0x2D, 0x33, 0x2A, 0xE9, 0x69, 0x79, 0x31, 0x42,
|
||||
0x8F, 0xE4, 0x3A, 0x13, 0x8B, 0xE7, 0x26, 0xBD, 0x08, 0x87, 0x6C, 0xA6, 0xF2, 0x73, 0xF6, 0x8E,
|
||||
0xA7, 0xF2, 0xFE, 0xFB, 0x6C, 0x28, 0x66, 0x0D, 0xBD, 0xD7, 0xEB, 0x42, 0xA8, 0x78, 0xE6, 0xB8,
|
||||
0x6B, 0xAE, 0xC7, 0xA9, 0xE2, 0x40, 0x6E, 0x89, 0x20, 0x82, 0x25, 0x8E, 0x3C, 0x6A, 0x60, 0xD7,
|
||||
0xF3, 0x56, 0x8E, 0xEC, 0x8D, 0x51, 0x8A, 0x63, 0x3C, 0x04, 0x78, 0x23, 0x0E, 0x90, 0x0C, 0xB4,
|
||||
0xE7, 0x86, 0x3B, 0x4F, 0x8E, 0x13, 0x09, 0x47, 0x32, 0x0E, 0x04, 0xB8, 0x4D, 0x5B, 0xB0, 0x46,
|
||||
0x71, 0xB0, 0x5C, 0xF4, 0xAD, 0x63, 0x4F, 0xC5, 0xE2, 0xAC, 0x1E, 0xC4, 0x33, 0x96, 0x09, 0x7B
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ typedef struct {
|
|||
unsigned char key_area_keys[0x20][3][0x10]; /* Key area encryption keys. */
|
||||
unsigned char nca_hdr_fixed_key_modulus[0x100]; /* NCA header fixed key RSA pubk. */
|
||||
unsigned char acid_fixed_key_modulus[0x100]; /* ACID fixed key RSA pubk. */
|
||||
unsigned char package2_fixed_key_modulus[0x100]; /* Package2 Header RSA pubk. */
|
||||
} nca_keyset_t;
|
||||
|
||||
typedef struct {
|
||||
|
|
@ -73,7 +74,7 @@ enum hactool_file_type
|
|||
FILETYPE_XCI,
|
||||
FILETYPE_NPDM,
|
||||
FILETYPE_PACKAGE1,
|
||||
/* FILETYPE_PACKAGE2, */
|
||||
FILETYPE_PACKAGE2
|
||||
};
|
||||
|
||||
#define ACTION_INFO (1<<0)
|
||||
|
|
|
|||
Loading…
Reference in a new issue