ssl: Implement SSL connectivity (#2961)
* implement certain servicessl functions * ssl: Implement more of SSL connection and abstract it This adds support to non blocking SSL operations and unlink the SSL implementation from the IPC logic. * Rename SslDefaultSocketConnection to SslManagedSocketConnection * Fix regression on Pokemon TV * Address gdkchan's comment * Simplify value read from previous commit * ssl: some changes - Implement builtin certificates parsing and retrieving - Fix issues with SSL version handling - Improve managed SSL socket error handling - Ensure to only return a certificate on DoHandshake when actually requested * Add missing BuiltInCertificateManager initialization call * Address gdkchan's comment * Address Ack's comment Co-authored-by: InvoxiPlayGames <webmaster@invoxiplaygames.uk>
This commit is contained in:
parent
366fe2dbb2
commit
3fa7ef21b4
12 changed files with 1138 additions and 34 deletions
|
@ -1,6 +1,11 @@
|
|||
using Ryujinx.Common.Logging;
|
||||
using Ryujinx.HLE.Exceptions;
|
||||
using Ryujinx.HLE.HOS.Services.Ssl.SslService;
|
||||
using Ryujinx.HLE.HOS.Services.Ssl.Types;
|
||||
using Ryujinx.Memory;
|
||||
using System;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace Ryujinx.HLE.HOS.Services.Ssl
|
||||
{
|
||||
|
@ -18,13 +23,85 @@ namespace Ryujinx.HLE.HOS.Services.Ssl
|
|||
SslVersion sslVersion = (SslVersion)context.RequestData.ReadUInt32();
|
||||
ulong pidPlaceholder = context.RequestData.ReadUInt64();
|
||||
|
||||
MakeObject(context, new ISslContext(context));
|
||||
MakeObject(context, new ISslContext(context.Request.HandleDesc.PId, sslVersion));
|
||||
|
||||
Logger.Stub?.PrintStub(LogClass.ServiceSsl, new { sslVersion });
|
||||
|
||||
return ResultCode.Success;
|
||||
}
|
||||
|
||||
private uint ComputeCertificateBufferSizeRequired(ReadOnlySpan<BuiltInCertificateManager.CertStoreEntry> entries)
|
||||
{
|
||||
uint totalSize = 0;
|
||||
|
||||
for (int i = 0; i < entries.Length; i++)
|
||||
{
|
||||
totalSize += (uint)Unsafe.SizeOf<BuiltInCertificateInfo>();
|
||||
totalSize += (uint)entries[i].Data.Length;
|
||||
}
|
||||
|
||||
return totalSize;
|
||||
}
|
||||
|
||||
[CommandHipc(2)]
|
||||
// GetCertificates(buffer<CaCertificateId, 5> ids) -> (u32 certificates_count, buffer<bytes, 6> certificates)
|
||||
public ResultCode GetCertificates(ServiceCtx context)
|
||||
{
|
||||
ReadOnlySpan<CaCertificateId> ids = MemoryMarshal.Cast<byte, CaCertificateId>(context.Memory.GetSpan(context.Request.SendBuff[0].Position, (int)context.Request.SendBuff[0].Size));
|
||||
|
||||
if (!BuiltInCertificateManager.Instance.TryGetCertificates(ids, out BuiltInCertificateManager.CertStoreEntry[] entries))
|
||||
{
|
||||
throw new InvalidOperationException();
|
||||
}
|
||||
|
||||
if (ComputeCertificateBufferSizeRequired(entries) > context.Request.ReceiveBuff[0].Size)
|
||||
{
|
||||
return ResultCode.InvalidCertBufSize;
|
||||
}
|
||||
|
||||
using (WritableRegion region = context.Memory.GetWritableRegion(context.Request.ReceiveBuff[0].Position, (int)context.Request.ReceiveBuff[0].Size))
|
||||
{
|
||||
Span<byte> rawData = region.Memory.Span;
|
||||
Span<BuiltInCertificateInfo> infos = MemoryMarshal.Cast<byte, BuiltInCertificateInfo>(rawData)[..entries.Length];
|
||||
Span<byte> certificatesData = rawData[(Unsafe.SizeOf<BuiltInCertificateInfo>() * entries.Length)..];
|
||||
|
||||
for (int i = 0; i < infos.Length; i++)
|
||||
{
|
||||
entries[i].Data.CopyTo(certificatesData);
|
||||
|
||||
infos[i] = new BuiltInCertificateInfo
|
||||
{
|
||||
Id = entries[i].Id,
|
||||
Status = entries[i].Status,
|
||||
CertificateDataSize = (ulong)entries[i].Data.Length,
|
||||
CertificateDataOffset = (ulong)(rawData.Length - certificatesData.Length)
|
||||
};
|
||||
|
||||
certificatesData = certificatesData[entries[i].Data.Length..];
|
||||
}
|
||||
}
|
||||
|
||||
context.ResponseData.Write(entries.Length);
|
||||
|
||||
return ResultCode.Success;
|
||||
}
|
||||
|
||||
[CommandHipc(3)]
|
||||
// GetCertificateBufSize(buffer<CaCertificateId, 5> ids) -> u32 buffer_size;
|
||||
public ResultCode GetCertificateBufSize(ServiceCtx context)
|
||||
{
|
||||
ReadOnlySpan<CaCertificateId> ids = MemoryMarshal.Cast<byte, CaCertificateId>(context.Memory.GetSpan(context.Request.SendBuff[0].Position, (int)context.Request.SendBuff[0].Size));
|
||||
|
||||
if (!BuiltInCertificateManager.Instance.TryGetCertificates(ids, out BuiltInCertificateManager.CertStoreEntry[] entries))
|
||||
{
|
||||
throw new InvalidOperationException();
|
||||
}
|
||||
|
||||
context.ResponseData.Write(ComputeCertificateBufferSizeRequired(entries));
|
||||
|
||||
return ResultCode.Success;
|
||||
}
|
||||
|
||||
[CommandHipc(5)]
|
||||
// SetInterfaceVersion(u32)
|
||||
public ResultCode SetInterfaceVersion(ServiceCtx context)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue