Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 13:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed encrypted CIA mounting

Browse Source 
Again, thanks @ihaveamac for pointing out the bug
This commit is contained in:
d0k3 2017-09-12 13:10:14 +02:00
parent 5dc2634183
commit e8b34a90be
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/virtual/vgame.c
View File

@ -109,10 +109,10 @@ int ReadCiaContentImageBlocks(void* buffer, u64 block, u64 count, u32 cia_cnt_id
if ((ret == 0) && (cia_cnt_idx <= 0xFFFF)) {
u8 ctr[AES_BLOCK_SIZE] = { 0 };
if (block == block0) {
ctr[0] = (cia_cnt_idx >> 0) & 0xFF;
ctr[1] = (cia_cnt_idx >> 8) & 0xFF;
ctr[0] = (cia_cnt_idx >> 8) & 0xFF;
ctr[1] = (cia_cnt_idx >> 0) & 0xFF;
} else {
if ((ret = ReadImageBytes(buffer, (block-1) * AES_BLOCK_SIZE, AES_BLOCK_SIZE)) != 0)
if ((ret = ReadImageBytes(ctr, (block-1) * AES_BLOCK_SIZE, AES_BLOCK_SIZE)) != 0)
return ret;
}
if (DecryptCiaContentSequential(buffer, count * AES_BLOCK_SIZE, ctr, cia_titlekey) != 0)
@ -959,7 +959,7 @@ int ReadVGameFile(const VirtualFile* vfile, void* buffer, u64 offset, u64 count)
if (vfile->flags & VFLAG_NO_CRYPTO)
return ReadImageBytes(buffer, vfoffset + offset, count);
else if (vfile->flags & VFLAG_CIA_CONTENT)
return ReadCiaContentImageBytes(buffer, vfoffset + offset, count, vfile->keyslot, offset);
return ReadCiaContentImageBytes(buffer, vfoffset + offset, count, vfile->keyslot, vfoffset);
else if (vfile->flags & VFLAG_NCCH_CRYPTO)
return ReadNcchImageBytes(buffer, vfoffset + offset, count);
else return ReadGameImageBytes(buffer, vfoffset + offset, count);