The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-08 21:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12804 from Tilka/drop_unused_overload

Browse Source 
DiscIO: drop unused Volume::CheckContentIntegrity() overload
This commit is contained in:
Tilka 2024-05-26 17:17:49 +01:00 committed by GitHub
commit 14e68a0f4b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DiscIO/Volume.h
View File

@ -91,11 +91,6 @@ public:
{
return false;
}
virtual bool CheckContentIntegrity(const IOS::ES::Content& content, u64 content_offset,
const IOS::ES::TicketReader& ticket) const
{
return false;
}
virtual IOS::ES::TicketReader GetTicketWithFixedCommonKey() const { return {}; }
// Returns a non-owning pointer. Returns nullptr if the file system couldn't be read.
virtual const FileSystem* GetFileSystem(const Partition& partition) const = 0;

9
Source/Core/DiscIO/VolumeWad.cpp
View File

@ -170,15 +170,6 @@ bool VolumeWAD::CheckContentIntegrity(const IOS::ES::Content& content,
return Common::SHA1::CalculateDigest(decrypted_data.data(), content.size) == content.sha1;
}
bool VolumeWAD::CheckContentIntegrity(const IOS::ES::Content& content, u64 content_offset,
const IOS::ES::TicketReader& ticket) const
{
std::vector<u8> encrypted_data(Common::AlignUp(content.size, 0x40));
if (!m_reader->Read(content_offset, encrypted_data.size(), encrypted_data.data()))
return false;
return CheckContentIntegrity(content, encrypted_data, ticket);
}
IOS::ES::TicketReader VolumeWAD::GetTicketWithFixedCommonKey() const
{
if (!m_ticket.IsValid() || !m_tmd.IsValid())

2
Source/Core/DiscIO/VolumeWad.h
View File

@ -40,8 +40,6 @@ public:
std::vector<u64> GetContentOffsets() const override;
bool CheckContentIntegrity(const IOS::ES::Content& content, const std::vector<u8>& encrypted_data,
const IOS::ES::TicketReader& ticket) const override;
bool CheckContentIntegrity(const IOS::ES::Content& content, u64 content_offset,
const IOS::ES::TicketReader& ticket) const override;
IOS::ES::TicketReader GetTicketWithFixedCommonKey() const override;
std::string GetGameID(const Partition& partition = PARTITION_NONE) const override;
std::string GetGameTDBID(const Partition& partition = PARTITION_NONE) const override;