diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-05-13 05:01:29 +0200 |
|---|---|---|
| committer | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-05-15 20:41:05 +0200 |
| commit | 6a339cbdb3004f2526ccd1fedc43185727a5ac7c (patch) | |
| tree | c544ce1ed4741316087e7ab6614bf0288c0742e6 /Source/Core/DiscIO/VolumeVerifier.cpp | |
| parent | 361a8b2c8ea5cdb142b3e3f84b83c6f09ccdd8e0 (diff) | |
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.
Diffstat (limited to 'Source/Core/DiscIO/VolumeVerifier.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeVerifier.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
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<u8>& 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<u8>& 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, |