diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2024-05-25 20:13:11 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2024-05-26 00:10:26 +0100 |
| commit | 4619db2ae9b72ec2ab4faa32f53b9c985e94ba85 (patch) | |
| tree | 2ef910538aa2527e9df5ae5ae9786a519646a36d /Source/Core/DiscIO | |
| parent | 8167a046ef763d25e6bce91ef07abb99659dc39f (diff) | |
DiscIO: drop unused Volume::CheckContentIntegrity() overload
The offset-based overload hasn't been in use since
f754a1a548f2e599e4cc2d1d799f2d21b520076f.
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/Volume.h | 5 | ||||
| -rw-r--r-- | Source/Core/DiscIO/VolumeWad.cpp | 9 | ||||
| -rw-r--r-- | Source/Core/DiscIO/VolumeWad.h | 2 |
3 files changed, 0 insertions, 16 deletions
diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h index 3747c4c250..e97762ab96 100644 --- a/Source/Core/DiscIO/Volume.h +++ b/Source/Core/DiscIO/Volume.h @@ -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; diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index 4058497546..bc75e71b88 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -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()) diff --git a/Source/Core/DiscIO/VolumeWad.h b/Source/Core/DiscIO/VolumeWad.h index 3b723b7ce9..91e8c5aba0 100644 --- a/Source/Core/DiscIO/VolumeWad.h +++ b/Source/Core/DiscIO/VolumeWad.h @@ -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; |