Mirrors/hactool
2
0
Fork 0
mirror of https://github.com/SciresM/hactool synced 2024-11-10 06:34:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

nca: fix parsing CNMT NCA0s (#106)

Browse source 
* nca: fix parsing NCA0 cmnts

* nca: make sure we don't try parsing small non-NCA0s

* nca: resolve feedback on NCA0 fix

Now checks read size, error message was returned to what it was before.
This commit is contained in:
substanc3 2021-04-27 05:31:28 +02:00 committed by GitHub
parent 043f883b3f
commit a4f49bfeac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nca.c
View file

@ -584,7 +584,10 @@ void nca_process(nca_ctx_t *ctx) {
/* Decrypt NCA header. */
int nca_decrypt_header(nca_ctx_t *ctx) {
fseeko64(ctx->file, 0, SEEK_SET);
if (fread(&ctx->header, 1, 0xC00, ctx->file) != 0xC00) {
size_t read_size = fread(&ctx->header, 1, 0xC00, ctx->file);
if (read_size != 0xC00 && read_size != 0xA00) {
fprintf(stderr, "Failed to read NCA header!\n");
return 0;
}
@ -611,7 +614,11 @@ int nca_decrypt_header(nca_ctx_t *ctx) {
aes_ctx_t *hdr_aes_ctx = new_aes_ctx(ctx->tool_ctx->settings.keyset.header_key, 32, AES_MODE_XTS);
aes_xts_decrypt(hdr_aes_ctx, &dec_header, &ctx->header, 0x400, 0, 0x200);
if(read_size == 0xA00 && dec_header.magic != MAGIC_NCA0) {
fprintf(stderr, "Failed to read NCA header!\n");
return 0;
}
if (dec_header.magic == MAGIC_NCA3) {
ctx->format_version = NCAVERSION_NCA3;
aes_xts_decrypt(hdr_aes_ctx, &dec_header, &ctx->header, 0xC00, 0, 0x200);