PSVita/pkg2zip
1
0
Fork 0
mirror of https://github.com/mmozeiko/pkg2zip.git synced 2026-09-02 19:23:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

better error messages & buffer alignment

Browse Source
This commit is contained in:
Martins Mozeiko
2017-11-09 22:29:22 -08:00
parent 670724bd8f
commit dcec2ea31e
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg2zip.c
+5 -5
View File
@@ -526,7 +526,7 @@ int main(int argc, char* argv[])
else
{
assert(0);
fatal("ERROR: unsupported type");
fatal("ERROR: unsupported type\n");
}
if (zipped)
@@ -603,7 +603,7 @@ int main(int argc, char* argv[])
else
{
assert(0);
fatal("ERROR: unsupported type");
fatal("ERROR: unsupported type\n");
}
printf("[*] decrypting...\n");
@@ -749,7 +749,7 @@ int main(int argc, char* argv[])
out_begin_file(path, 0);
while (data_size != 0)
{
uint8_t buffer[1 << 16];
uint8_t PKG_ALIGN(16) buffer[1 << 16];
uint32_t size = (uint32_t)min64(data_size, sizeof(buffer));
sys_read(pkg, enc_offset + offset, buffer, size);
@@ -783,7 +783,7 @@ int main(int argc, char* argv[])
uint64_t head_offset = 0;
while (head_size != 0)
{
uint8_t buffer[1 << 16];
uint8_t PKG_ALIGN(16) buffer[1 << 16];
uint32_t size = (uint32_t)min64(head_size, sizeof(buffer));
sys_read(pkg, head_offset, buffer, size);
out_write(buffer, size);
@@ -799,7 +799,7 @@ int main(int argc, char* argv[])
uint64_t tail_offset = enc_offset + enc_size;
while (tail_offset != pkg_size)
{
uint8_t buffer[1 << 16];
uint8_t PKG_ALIGN(16) buffer[1 << 16];
uint32_t size = (uint32_t)min64(pkg_size - tail_offset, sizeof(buffer));
sys_read(pkg, tail_offset, buffer, size);
out_write(buffer, size);
pkg2zip_psp.c
+10 -10
View File
@@ -315,7 +315,7 @@ void unpack_psp_eboot(const char* path, const aes128_key* pkg_key, const uint8_t
{
if (item_size < 0x28)
{
fatal("ERROR: eboot.pbp file is to short!");
fatal("ERROR: eboot.pbp file is to short!\n");
}
uint8_t eboot_header[0x28];
@@ -324,13 +324,13 @@ void unpack_psp_eboot(const char* path, const aes128_key* pkg_key, const uint8_t
if (memcmp(eboot_header, "\x00PBP", 4) != 0)
{
fatal("ERROR: wrong eboot.pbp header signature!");
fatal("ERROR: wrong eboot.pbp header signature!\n");
}
uint32_t psar_offset = get32le(eboot_header + 0x24);
if (psar_offset + 256 > item_size)
{
fatal("ERROR: eboot.pbp file is to short!");
fatal("ERROR: eboot.pbp file is to short!\n");
}
assert(psar_offset % 16 == 0);
@@ -340,7 +340,7 @@ void unpack_psp_eboot(const char* path, const aes128_key* pkg_key, const uint8_t
if (memcmp(psar_header, "NPUMDIMG", 8) != 0)
{
fatal("ERROR: wrong data.psar header signature!");
fatal("ERROR: wrong data.psar header signature!\n");
}
uint32_t iso_block = get32le(psar_header + 0x0c);
@@ -411,10 +411,10 @@ void unpack_psp_eboot(const char* path, const aes128_key* pkg_key, const uint8_t
if (psar_offset + block_size > item_size)
{
fatal("ERROR: iso block size/offset is to large!");
fatal("ERROR: iso block size/offset is to large!\n");
}
uint8_t data[16 * ISO_SECTOR_SIZE];
uint8_t PKG_ALIGN(16) data[16 * ISO_SECTOR_SIZE];
uint64_t abs_offset = item_offset + psar_offset + block_offset;
sys_read(pkg, enc_offset + abs_offset, data, block_size);
@@ -541,7 +541,7 @@ void unpack_psp_key(const char* path, const aes128_key* pkg_key, const uint8_t*
{
if (item_size < 0x90 + 0xa0)
{
fatal("ERROR: PSP-KEY.EDAT file is to short!");
fatal("ERROR: PSP-KEY.EDAT file is to short!\n");
}
uint8_t key_header[0xa0];
@@ -550,14 +550,14 @@ void unpack_psp_key(const char* path, const aes128_key* pkg_key, const uint8_t*
if (memcmp(key_header, "\x00PGD", 4) != 0)
{
fatal("ERROR: wrong PSP-KEY.EDAT header signature!");
fatal("ERROR: wrong PSP-KEY.EDAT header signature!\n");
}
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!");
fatal("ERROR: unsupported PSP-KEY.EDAT file, key/drm type is wrong!\n");
}
uint8_t mac[16];
@@ -573,7 +573,7 @@ void unpack_psp_key(const char* path, const aes128_key* pkg_key, const uint8_t*
if (data_size != 0x10 || data_offset != 0x90)
{
fatal("ERROR: unsupported PSP-KEY.EDAT file, data/offset is wrong!");
fatal("ERROR: unsupported PSP-KEY.EDAT file, data/offset is wrong!\n");
}
init_psp_decrypt(&psp_key, psp_iv, 0, mac, key_header, 0x70, 0x30);
pkg2zip_sys.c
+2 -2
View File
@@ -201,12 +201,12 @@ void* sys_realloc(void* ptr, size_t size)
}
else
{
fatal("error using sys_realloc function");
fatal("ERROR: internal error, wrong sys_realloc usage\n");
}
if (!result)
{
fatal("out of memory");
fatal("ERROR: out of memory\n");
}
return result;
pkg2zip_sys.h
+1 -1
View File
@@ -18,4 +18,4 @@ void sys_write(sys_file file, uint64_t offset, const void* buffer, uint32_t size
// if ptr && size => realloc
void* sys_realloc(void* ptr, size_t size);
void sys_vstrncat(char* dst, size_t n, const char* format, ...);
void sys_vstrncat(char* dst, size_t n, const char* format, ...);