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

Modify check for ExeFS NCA sections

Browse source
This commit is contained in:
Alex Barney 2018-10-12 21:28:05 -05:00
parent 75dafd9cbe
commit e9602d35da
4 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
LibHac/Nca.cs
View file

@ -61,19 +61,7 @@ namespace LibHac
NcaSection section = ParseSection(i); NcaSection section = ParseSection(i);
if (section == null) continue; if (section == null) continue;
Sections[i] = section; Sections[i] = section;
ValidateMasterHash(i);
} }
//foreach (NcaSection pfsSection in Sections.Where(x => x != null && x.Type == SectionType.Pfs0))
//{
// Stream sectionStream = OpenSection(pfsSection.SectionNum, false, false);
// if (sectionStream == null) continue;
// var pfs = new Pfs(sectionStream);
// if (!pfs.FileExists("main.npdm")) continue;
// pfsSection.IsExefs = true;
//}
} }
/// <summary> /// <summary>
@ -161,7 +149,7 @@ namespace LibHac
public Stream OpenSection(int index, bool raw, IntegrityCheckLevel integrityCheckLevel) public Stream OpenSection(int index, bool raw, IntegrityCheckLevel integrityCheckLevel)
{ {
Stream rawStream = OpenRawSection(index); Stream rawStream = OpenRawSection(index);
if (raw || rawStream == null) return rawStream; if (raw || rawStream == null) return rawStream;
NcaSection sect = Sections[index]; NcaSection sect = Sections[index];
@ -379,7 +367,7 @@ namespace LibHac
break; break;
case NcaHashType.Ivfc when sect.Header.EncryptionType == NcaEncryptionType.AesCtrEx: case NcaHashType.Ivfc when sect.Header.EncryptionType == NcaEncryptionType.AesCtrEx:
CheckBktrKey(sect); CheckBktrKey(sect);
break; return;
case NcaHashType.Ivfc: case NcaHashType.Ivfc:
offset = sect.Header.IvfcInfo.LevelHeaders[0].LogicalOffset; offset = sect.Header.IvfcInfo.LevelHeaders[0].LogicalOffset;
size = 1 << sect.Header.IvfcInfo.LevelHeaders[0].BlockSizePower; size = 1 << sect.Header.IvfcInfo.LevelHeaders[0].BlockSizePower;
@ -414,8 +402,6 @@ namespace LibHac
public long Size { get; set; } public long Size { get; set; }
public Validity MasterHashValidity { get; set; } public Validity MasterHashValidity { get; set; }
public bool IsExefs { get; internal set; }
public byte[] GetMasterHash() public byte[] GetMasterHash()
{ {
var hash = new byte[Crypto.Sha256DigestSize]; var hash = new byte[Crypto.Sha256DigestSize];

12
hactoolnet/ProcessNca.cs
View file

@ -80,7 +80,13 @@ namespace hactoolnet
if (ctx.Options.ExefsOutDir != null || ctx.Options.ExefsOut != null) if (ctx.Options.ExefsOutDir != null || ctx.Options.ExefsOut != null)
{ {
NcaSection section = nca.Sections.FirstOrDefault(x => x?.IsExefs == true); if (nca.Header.ContentType != ContentType.Program)
{
ctx.Logger.LogMessage("NCA's content type is not \"Program\"");
return;
}
NcaSection section = nca.Sections[(int)ProgramPartitionType.Code];
if (section == null) if (section == null)
{ {
@ -154,10 +160,12 @@ namespace hactoolnet
NcaSection sect = nca.Sections[i]; NcaSection sect = nca.Sections[i];
if (sect == null) continue; if (sect == null) continue;
bool isExefs = nca.Header.ContentType == ContentType.Program && i == (int)ProgramPartitionType.Code;
sb.AppendLine($" Section {i}:"); sb.AppendLine($" Section {i}:");
PrintItem(sb, colLen, " Offset:", $"0x{sect.Offset:x12}"); PrintItem(sb, colLen, " Offset:", $"0x{sect.Offset:x12}");
PrintItem(sb, colLen, " Size:", $"0x{sect.Size:x12}"); PrintItem(sb, colLen, " Size:", $"0x{sect.Size:x12}");
PrintItem(sb, colLen, " Partition Type:", sect.IsExefs ? "ExeFS" : sect.Type.ToString()); PrintItem(sb, colLen, " Partition Type:", isExefs ? "ExeFS" : sect.Type.ToString());
PrintItem(sb, colLen, " Section CTR:", sect.Header.Ctr); PrintItem(sb, colLen, " Section CTR:", sect.Header.Ctr);
switch (sect.Header.HashType) switch (sect.Header.HashType)

2
hactoolnet/ProcessSwitchFs.cs
View file

@ -45,7 +45,7 @@ namespace hactoolnet
return; return;
} }
NcaSection section = title.MainNca.Sections.FirstOrDefault(x => x.IsExefs); NcaSection section = title.MainNca.Sections[(int)ProgramPartitionType.Code];
if (section == null) if (section == null)
{ {

2
hactoolnet/ProcessXci.cs
View file

@ -69,7 +69,7 @@ namespace hactoolnet
return; return;
} }
NcaSection exefsSection = mainNca.Sections.FirstOrDefault(x => x.IsExefs); NcaSection exefsSection = mainNca.Sections[(int)ProgramPartitionType.Code];
if (exefsSection == null) if (exefsSection == null)
{ {