deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove a bit of unsafety around

Browse source
This commit is contained in:
Mary 2021-10-26 23:09:24 +02:00
parent 5c66a36ed6
commit 791ccb7444
4 changed files with 29 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs
View file

@ -24,7 +24,7 @@ namespace Ryujinx.HLE.HOS.Applets
_system = system; _system = system;
} }
unsafe public ResultCode Start(AppletSession normalSession, public ResultCode Start(AppletSession normalSession,
AppletSession interactiveSession) AppletSession interactiveSession)
{ {
_normalSession = normalSession; _normalSession = normalSession;

12
Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs
View file

@ -59,23 +59,23 @@ namespace Ryujinx.HLE.HOS.Services.Ro
{ {
return ResultCode.InvalidNrr; return ResultCode.InvalidNrr;
} }
else if (header.NrrSize != nrrSize) else if (header.Size != nrrSize)
{ {
return ResultCode.InvalidSize; return ResultCode.InvalidSize;
} }
List<byte[]> hashes = new List<byte[]>(); List<byte[]> hashes = new List<byte[]>();
for (int i = 0; i < header.HashCount; i++) for (int i = 0; i < header.HashesCount; i++)
{ {
byte[] temp = new byte[0x20]; byte[] hash = new byte[0x20];
_owner.CpuMemory.Read(nrrAddress + header.HashOffset + (uint)(i * 0x20), temp); _owner.CpuMemory.Read(nrrAddress + header.HashesOffset + (uint)(i * 0x20), hash);
hashes.Add(temp); hashes.Add(hash);
} }
nrrInfo = new NrrInfo((ulong)nrrAddress, header, hashes); nrrInfo = new NrrInfo(nrrAddress, header, hashes);
return ResultCode.Success; return ResultCode.Success;
} }

14
Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs
View file

@ -1,23 +1,15 @@
using Ryujinx.Common.Memory;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Ro namespace Ryujinx.HLE.HOS.Services.Ro
{ {
[StructLayout(LayoutKind.Explicit, Size = 0x220)] [StructLayout(LayoutKind.Sequential, Size = 0x220)]
unsafe struct NRRCertification unsafe struct NRRCertification
{ {
[FieldOffset(0)]
public ulong ApplicationIdMask; public ulong ApplicationIdMask;
[FieldOffset(0x8)]
public ulong ApplicationIdPattern; public ulong ApplicationIdPattern;
private Array16<byte> _reserved;
[FieldOffset(0x10)]
public fixed byte Reserved[0x10];
[FieldOffset(0x20)]
public fixed byte Modulus[0x100]; public fixed byte Modulus[0x100];
[FieldOffset(0x120)]
public fixed byte Signature[0x100]; public fixed byte Signature[0x100];
} }
} }

50
Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs
View file

@ -1,44 +1,32 @@
using Ryujinx.Common.Memory;
using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Ro namespace Ryujinx.HLE.HOS.Services.Ro
{ {
[StructLayout(LayoutKind.Explicit, Size = 0x350)] [StructLayout(LayoutKind.Sequential, Size = 0x350)]
unsafe struct NrrHeader struct NrrHeader
{ {
[FieldOffset(0)]
public uint Magic; public uint Magic;
public uint KeyGeneration; // 9.0.0+
[FieldOffset(0x4)] private Array8<byte> _reserved;
public uint CertificationSignatureKeyGeneration; // 9.0.0+
[FieldOffset(0x8)]
public ulong Reserved;
[FieldOffset(0x10)]
public NRRCertification Certification; public NRRCertification Certification;
public NrrSignature Signature;
[FieldOffset(0x230)]
public fixed byte NrrSignature[0x100];
[FieldOffset(0x330)]
public ulong TitleId; public ulong TitleId;
public uint Size;
public byte Kind; // 7.0.0+
private Array3<byte> _reserved2;
public uint HashesOffset;
public uint HashesCount;
private Array8<byte> _reserved3;
[FieldOffset(0x338)]
public uint NrrSize;
[FieldOffset(0x33C)] [StructLayout(LayoutKind.Sequential, Size = 0x100)]
public byte Type; // 7.0.0+ public struct NrrSignature
{
private byte element;
[FieldOffset(0x33D)] public Span<byte> ToSpan() => MemoryMarshal.CreateSpan(ref element, 0x100);
public fixed byte Reserved2[0x3]; }
[FieldOffset(0x340)]
public uint HashOffset;
[FieldOffset(0x344)]
public uint HashCount;
[FieldOffset(0x348)]
public ulong Reserved3;
} }
} }