From 6a339cbdb3004f2526ccd1fedc43185727a5ac7c Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sat, 13 May 2023 05:01:29 +0200 Subject: IOS/ES: Split ESDevice into ESCore and ESDevice. ESCore implements the core functionality that can also be used outside of emulation. ESDevice implements the IOS device and is only available during emulation. --- Source/Core/DiscIO/VolumeVerifier.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'Source/Core/DiscIO') diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp index 855142143f..66e7d00dc4 100644 --- a/Source/Core/DiscIO/VolumeVerifier.cpp +++ b/Source/Core/DiscIO/VolumeVerifier.cpp @@ -578,17 +578,17 @@ bool VolumeVerifier::CheckPartition(const Partition& partition) const auto console_type = IsDebugSigned() ? IOS::HLE::IOSC::ConsoleType::RVT : IOS::HLE::IOSC::ConsoleType::Retail; IOS::HLE::Kernel ios(console_type); - const auto es = ios.GetES(); + auto& es = ios.GetESCore(); const std::vector& cert_chain = m_volume.GetCertificateChain(partition); if (IOS::HLE::IPC_SUCCESS != - es->VerifyContainer(IOS::HLE::ESDevice::VerifyContainerType::Ticket, - IOS::HLE::ESDevice::VerifyMode::DoNotUpdateCertStore, - m_volume.GetTicket(partition), cert_chain) || + es.VerifyContainer(IOS::HLE::ESCore::VerifyContainerType::Ticket, + IOS::HLE::ESCore::VerifyMode::DoNotUpdateCertStore, + m_volume.GetTicket(partition), cert_chain) || IOS::HLE::IPC_SUCCESS != - es->VerifyContainer(IOS::HLE::ESDevice::VerifyContainerType::TMD, - IOS::HLE::ESDevice::VerifyMode::DoNotUpdateCertStore, - m_volume.GetTMD(partition), cert_chain)) + es.VerifyContainer(IOS::HLE::ESCore::VerifyContainerType::TMD, + IOS::HLE::ESCore::VerifyMode::DoNotUpdateCertStore, + m_volume.GetTMD(partition), cert_chain)) { AddProblem(Severity::Low, Common::FmtFormatT("The {0} partition is not correctly signed.", name)); @@ -982,21 +982,21 @@ void VolumeVerifier::CheckMisc() if (m_volume.GetVolumeType() == Platform::WiiWAD) { IOS::HLE::Kernel ios(m_ticket.GetConsoleType()); - const auto es = ios.GetES(); + auto& es = ios.GetESCore(); const std::vector& cert_chain = m_volume.GetCertificateChain(PARTITION_NONE); if (IOS::HLE::IPC_SUCCESS != - es->VerifyContainer(IOS::HLE::ESDevice::VerifyContainerType::Ticket, - IOS::HLE::ESDevice::VerifyMode::DoNotUpdateCertStore, m_ticket, - cert_chain)) + es.VerifyContainer(IOS::HLE::ESCore::VerifyContainerType::Ticket, + IOS::HLE::ESCore::VerifyMode::DoNotUpdateCertStore, m_ticket, + cert_chain)) { // i18n: "Ticket" here is a kind of digital authorization to use a certain title (e.g. a game) AddProblem(Severity::Low, Common::GetStringT("The ticket is not correctly signed.")); } if (IOS::HLE::IPC_SUCCESS != - es->VerifyContainer(IOS::HLE::ESDevice::VerifyContainerType::TMD, - IOS::HLE::ESDevice::VerifyMode::DoNotUpdateCertStore, tmd, cert_chain)) + es.VerifyContainer(IOS::HLE::ESCore::VerifyContainerType::TMD, + IOS::HLE::ESCore::VerifyMode::DoNotUpdateCertStore, tmd, cert_chain)) { AddProblem( Severity::Medium, -- cgit v1.2.3