From fdf3978df6a68c1a32adf8c0e4e7376ba2fa4301 Mon Sep 17 00:00:00 2001 From: Martins Mozeiko Date: Mon, 6 Nov 2017 21:44:36 -0800 Subject: [PATCH] unpack all required files for PSP-PCEngine pkg --- pkg2zip.c | 75 +++++++++++++++++++++++++++++++++------------------ pkg2zip_psp.c | 69 +++++++++++++++++++++++++++++++++++++++++------ pkg2zip_psp.h | 1 + 3 files changed, 111 insertions(+), 34 deletions(-) diff --git a/pkg2zip.c b/pkg2zip.c index 396db24..33e63bb 100644 --- a/pkg2zip.c +++ b/pkg2zip.c @@ -23,7 +23,7 @@ static const uint8_t pkg_vita_4[] = { 0xaf, 0x07, 0xfd, 0x59, 0x65, 0x25, 0x27, // http://vitadevwiki.com/vita/System_File_Object_(SFO)_(PSF)#Internal_Structure // https://github.com/TheOfficialFloW/VitaShell/blob/1.74/sfo.h#L29 -static void parse_sfo_content(const uint8_t* sfo, uint32_t sfo_size, int* patch, char* title, char* content, char* min_version, char* pkg_version) +static void parse_sfo_content(const uint8_t* sfo, uint32_t sfo_size, char* category, char* title, char* content, char* min_version, char* pkg_version) { if (get32le(sfo) != 0x46535000) @@ -109,7 +109,6 @@ static void parse_sfo_content(const uint8_t* sfo, uint32_t sfo_size, int* patch, if (content_index >= 0 && content) { - value = (char*)sfo + values + get32le(sfo + content_index * 16 + 20 + 12); while (*value) { @@ -118,19 +117,15 @@ static void parse_sfo_content(const uint8_t* sfo, uint32_t sfo_size, int* patch, *content = 0; } - if (category_index >= 0 && patch) + if (category_index >= 0) { - char* category = value = (char*)sfo + values + get32le(sfo + category_index * 16 + 20 + 12); - while (*value++) + value = (char*)sfo + values + get32le(sfo + category_index * 16 + 20 + 12); + while (*value) { - } - *value = 0; - - if (strcmp(category, "gp") == 0) - { - *patch = 1; + *category++ = *value++; } } + *category = 0; if (minver_index >= 0 && min_version) { @@ -168,7 +163,7 @@ static void parse_sfo_content(const uint8_t* sfo, uint32_t sfo_size, int* patch, } } -static void parse_sfo(sys_file f, uint64_t sfo_offset, uint32_t sfo_size, int* patch, char* title, char* content, char* min_version, char* pkg_version) +static void parse_sfo(sys_file f, uint64_t sfo_offset, uint32_t sfo_size, char* category, char* title, char* content, char* min_version, char* pkg_version) { uint8_t sfo[16 * 1024]; if (sfo_size < 16) @@ -181,10 +176,10 @@ static void parse_sfo(sys_file f, uint64_t sfo_offset, uint32_t sfo_size, int* p } sys_read(f, sfo_offset, sfo, sfo_size); - parse_sfo_content(sfo, sfo_size, patch, title, content, min_version, pkg_version); + parse_sfo_content(sfo, sfo_size, category, title, content, min_version, pkg_version); } -static void find_psp_sfo(const aes128_key* key, const aes128_key* ps3_key, const uint8_t* iv, sys_file pkg, uint64_t pkg_size, uint64_t enc_offset, uint64_t items_offset, uint32_t item_count, char* title) +static void find_psp_sfo(const aes128_key* key, const aes128_key* ps3_key, const uint8_t* iv, sys_file pkg, uint64_t pkg_size, uint64_t enc_offset, uint64_t items_offset, uint32_t item_count, char* category, char* title) { for (uint32_t item_index = 0; item_index < item_count; item_index++) { @@ -230,7 +225,7 @@ static void find_psp_sfo(const aes128_key* key, const aes128_key* ps3_key, const sys_read(pkg, enc_offset + data_offset, sfo, (uint32_t)data_size); aes128_ctr_xor(item_key, iv, data_offset / 16, sfo, (uint32_t)data_size); - parse_sfo_content(sfo, (uint32_t)data_size, NULL, title, NULL, NULL, NULL); + parse_sfo_content(sfo, (uint32_t)data_size, category, title, NULL, NULL, NULL); return; } } @@ -381,7 +376,7 @@ int main(int argc, char* argv[]) } else if (content_type == 7 || content_type == 0xe || content_type == 0xf || content_type == 0x10) { - // PSP / PSP-Go / PSP-Mini / PSP-NeoGeo + // PSP & PSP-PCEngine / PSP-Go / PSP-Mini / PSP-NeoGeo type = PKG_TYPE_PSP; } else if (content_type == 0x15) @@ -432,6 +427,7 @@ int main(int argc, char* argv[]) char content[256]; char title[256]; + char category[256]; char min_version[256]; char pkg_version[256]; const char* id = content + 7; @@ -444,7 +440,7 @@ int main(int argc, char* argv[]) if (type == PKG_TYPE_PSP || type == PKG_TYPE_PSX) { - find_psp_sfo(&key, &ps3_key, iv, pkg, pkg_size, enc_offset, items_offset, item_count, title); + find_psp_sfo(&key, &ps3_key, iv, pkg, pkg_size, enc_offset, items_offset, item_count, category, title); id = (char*)pkg_header + 0x37; } else // Vita @@ -456,11 +452,10 @@ int main(int argc, char* argv[]) } else // Vita APP, DLC or PATCH { - int patch = 0; - parse_sfo(pkg, sfo_offset, sfo_size, &patch, title, content, min_version, pkg_version); + parse_sfo(pkg, sfo_offset, sfo_size, category, title, content, min_version, pkg_version); rif_size = 512; - if (patch && type == PKG_TYPE_VITA_APP) + if (type == PKG_TYPE_VITA_APP && strcmp(category, "gp") == 0) { type = PKG_TYPE_VITA_PATCH; } @@ -482,7 +477,15 @@ int main(int argc, char* argv[]) char root[1024]; if (type == PKG_TYPE_PSP) { - const char* type_str = content_type == 7 ? "PSP" : content_type == 0xe ? "PSP-Go" : content_type == 0xf ? "PSP-Mini" : "PSP-NeoGeo"; + const char* type_str; + if (content_type == 7) + { + type_str = (strcmp(category, "HG") == 0) ? "PSP-PCEngine" : "PSP"; + } + else + { + type_str = content_type == 0xe ? "PSP-Go" : content_type == 0xf ? "PSP-Mini" : "PSP-NeoGeo"; + } snprintf(root, sizeof(root), "%s [%.9s] [%s]%s", title, id, type_str, ext); printf("[*] unpacking %s\n", type_str); } @@ -527,11 +530,17 @@ int main(int argc, char* argv[]) if (type == PKG_TYPE_PSP) { - sys_vstrncat(root, sizeof(root), "pspemu"); + snprintf(root, sizeof(root), "pspemu/ISO"); out_add_folder(root); - sys_vstrncat(root, sizeof(root), "/ISO"); - out_add_folder(root); + if (strcmp(category, "HG") == 0) + { + snprintf(root, sizeof(root), "pspemu/GAME"); + out_add_folder(root); + + sys_vstrncat(root, sizeof(root), "/%.9s", id); + out_add_folder(root); + } } else if (type == PKG_TYPE_PSX) { @@ -697,10 +706,24 @@ int main(int argc, char* argv[]) { if (strcmp("USRDIR/CONTENT/EBOOT.PBP", name) == 0) { - snprintf(path, sizeof(path), "%s/%s [%.9s].iso", root, title, id); + snprintf(path, sizeof(path), "pspemu/ISO/%s [%.9s].iso", title, id); unpack_psp_eboot(path, item_key, iv, pkg, enc_offset, data_offset, data_size); + continue; + } + else if (strcmp("USRDIR/CONTENT/PSP-KEY.EDAT", name) == 0) + { + snprintf(path, sizeof(path), "pspemu/GAME/%.9s/PSP-KEY.EDAT", id); + unpack_psp_key(path, item_key, iv, pkg, enc_offset, data_offset, data_size); + continue; + } + else if (strcmp("USRDIR/CONTENT/CONTENT.DAT", name) == 0) + { + snprintf(path, sizeof(path), "pspemu/GAME/%.9s/CONTENT.DAT", id); + } + else + { + continue; } - continue; } else if (type == PKG_TYPE_VITA_PSM) { diff --git a/pkg2zip_psp.c b/pkg2zip_psp.c index 210707e..bd8deb3 100644 --- a/pkg2zip_psp.c +++ b/pkg2zip_psp.c @@ -278,14 +278,18 @@ static int lzrc_decompress(void* out, int out_len, const void* in, int in_len) } } -static void init_psp_decrypt(aes128_key* key, uint8_t* iv, const uint8_t* header) +static void init_psp_decrypt(aes128_key* key, uint8_t* iv, int eboot, const uint8_t* mac, const uint8_t* header, uint32_t offset1, uint32_t offset2) { - uint8_t mac[16]; - aes128_cmac(kirk7_key38, header, 0xc0, mac); - uint8_t tmp[16]; aes128_init_dec(key, kirk7_key63); - aes128_ecb_decrypt(key, header + 0xc0, tmp); + if (eboot) + { + aes128_ecb_decrypt(key, header + offset1, tmp); + } + else + { + memcpy(tmp, header + offset1, 16); + } aes128_key aes; aes128_init_dec(&aes, kirk7_key38); @@ -293,9 +297,8 @@ static void init_psp_decrypt(aes128_key* key, uint8_t* iv, const uint8_t* header for (size_t i = 0; i < 16; i++) { - iv[i] = mac[i] ^ tmp[i] ^ header[0xa0 + i] ^ amctl_hashkey_3[i] ^ amctl_hashkey_5[i]; + iv[i] = mac[i] ^ tmp[i] ^ header[offset2 + i] ^ amctl_hashkey_3[i] ^ amctl_hashkey_5[i]; } - aes128_init_dec(&aes, kirk7_key39); aes128_ecb_decrypt(&aes, iv, iv); @@ -343,9 +346,12 @@ void unpack_psp_eboot(const char* path, const aes128_key* pkg_key, const uint8_t fatal("ERROR: unsupported data.psar block size %u, only %u supported!", iso_block, PSP_ISO_BLOCK_SIZE); } + uint8_t mac[16]; + aes128_cmac(kirk7_key38, psar_header, 0xc0, mac); + aes128_key psp_key; uint8_t psp_iv[16]; - init_psp_decrypt(&psp_key, psp_iv, psar_header); + init_psp_decrypt(&psp_key, psp_iv, 1, mac, psar_header, 0xc0, 0xa0); aes128_psp_decrypt(&psp_key, psp_iv, 0, psar_header + 0x40, 0x60); uint32_t iso_start = get32le(psar_header + 0x54); @@ -414,3 +420,50 @@ void unpack_psp_eboot(const char* path, const aes128_key* pkg_key, const uint8_t out_end_file(); } + +void unpack_psp_key(const char* path, const aes128_key* pkg_key, const uint8_t* pkg_iv, sys_file* pkg, uint64_t enc_offset, uint64_t item_offset, uint64_t item_size) +{ + if (item_size < 0x90 + 0xa0) + { + fatal("ERROR: PSP-KEY.EDAT file is to short!"); + } + + uint8_t key_header[0xa0]; + sys_read(pkg, enc_offset + item_offset + 0x90, key_header, sizeof(key_header)); + aes128_ctr_xor(pkg_key, pkg_iv, (item_offset + 0x90) / 16, key_header, sizeof(key_header)); + + if (memcmp(key_header, "\x00PGD", 4) != 0) + { + fatal("ERROR: wrong PSP-KEY.EDAT header signature!"); + } + + uint32_t key_index = get32le(key_header + 4); + uint32_t drm_type = get32le(key_header + 8); + if (key_index != 1 || drm_type != 1) + { + fatal("ERROR: unsupported PSP-KEY.EDAT file, key/drm type is wrong!"); + } + + uint8_t mac[16]; + aes128_cmac(kirk7_key38, key_header, 0x70, mac); + + aes128_key psp_key; + uint8_t psp_iv[16]; + init_psp_decrypt(&psp_key, psp_iv, 0, mac, key_header, 0x70, 0x10); + aes128_psp_decrypt(&psp_key, psp_iv, 0, key_header + 0x30, 0x30); + + uint32_t data_size = get32le(key_header + 0x44); + uint32_t data_offset = get32le(key_header + 0x4c); + + if (data_size != 0x10 || data_offset != 0x90) + { + fatal("ERROR: unsupported PSP-KEY.EDAT file, data/offset is wrong!"); + } + + init_psp_decrypt(&psp_key, psp_iv, 0, mac, key_header, 0x70, 0x30); + aes128_psp_decrypt(&psp_key, psp_iv, 0, key_header + 0x90, 0x10); + + out_begin_file(path); + out_write(key_header + 0x90, 0x10); + out_end_file(); +} diff --git a/pkg2zip_psp.h b/pkg2zip_psp.h index 09a4a2d..d6d14a1 100644 --- a/pkg2zip_psp.h +++ b/pkg2zip_psp.h @@ -2,3 +2,4 @@ #include "pkg2zip_sys.h" void unpack_psp_eboot(const char* path, const aes128_key* pkg_key, const uint8_t* pkg_iv, sys_file* pkg, uint64_t enc_offset, uint64_t item_offset, uint64_t item_size); +void unpack_psp_key(const char* path, const aes128_key* pkg_key, const uint8_t* pkg_iv, sys_file* pkg, uint64_t enc_offset, uint64_t item_offset, uint64_t item_size);