mirrors/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2024-11-14 10:49:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do initial bktr section validation

Browse source
This commit is contained in:
Alex Barney 2018-07-10 17:16:25 -05:00
parent 1b595ebffd
commit 14da035273
2 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libhac/Nca.cs
View file

@ -1,6 +1,7 @@
using System;
using System.IO;
using System.Linq;
using System.Runtime.Serialization.Json;
using System.Security.Cryptography;
using System.Text;
using libhac.XTSSharp;
@ -63,6 +64,8 @@ namespace libhac
if (Sections[index] == null) throw new ArgumentOutOfRangeException(nameof(index));
var sect = Sections[index];
if (sect.SuperblockHashValidity == Validity.Invalid) return null;
long offset = sect.Offset;
long size = sect.Size;
@ -200,11 +203,26 @@ namespace libhac
}
}
private void CheckBktrKey(NcaSection sect)
{
var offset = sect.Header.Bktr.SubsectionHeader.Offset;
using (var streamDec = new RandomAccessSectorStream(new AesCtrStream(Stream, DecryptedKeys[2], sect.Offset, sect.Size, sect.Offset, sect.Header.Ctr)))
{
var reader = new BinaryReader(streamDec);
streamDec.Position = offset + 8;
var size = reader.ReadInt64();
if (size != offset)
{
sect.SuperblockHashValidity = Validity.Invalid;
}
}
}
private void ValidateSuperblockHash(int index)
{
if (Sections[index] == null) throw new ArgumentOutOfRangeException(nameof(index));
var sect = Sections[index];
var stream = OpenSection(index, true);
byte[] expected = null;
byte[] actual;
@ -228,13 +246,12 @@ namespace libhac
size = 1 << ivfc.LevelHeaders[0].BlockSize;
break;
case SectionType.Bktr:
var ivfcBktr = sect.Header.Bktr.IvfcHeader;
expected = ivfcBktr.MasterHash;
offset = ivfcBktr.LevelHeaders[0].LogicalOffset;
size = 1 << ivfcBktr.LevelHeaders[0].BlockSize;
break;
CheckBktrKey(sect);
return;
}
var stream = OpenSection(index, true);
if (stream == null) return;
if (expected == null) return;
var hashTable = new byte[size];

5
libhac/SdFs.cs
View file

@ -31,6 +31,11 @@ namespace libhac
ContentsDir = Path.Combine(rootDir, "Contents");
}
if (ContentsDir == null)
{
throw new DirectoryNotFoundException("Could not find \"Contents\" directory");
}
OpenAllNcas();
ReadTitles();
ReadControls();