Skip to content

Commit

Permalink
VolumeVerifier: Don't read data multiple times
Browse files Browse the repository at this point in the history
  • Loading branch information
@JosJuice
JosJuice committed Aug 6, 2019
1 parent 24718c1 commit f754a1a
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 23 deletions.
11 changes: 11 additions & 0 deletions Source/Core/DiscIO/Volume.h
View file
Expand Up @@ -76,6 +76,12 @@ class Volume
}
virtual std::vector<u8> GetContent(u16 index) const { return {}; }
virtual std::vector<u64> GetContentOffsets() const { return {}; }
virtual bool CheckContentIntegrity(const IOS::ES::Content& content,
const std::vector<u8>& encrypted_data,
const IOS::ES::TicketReader& ticket) const
{
return false;
}
virtual bool CheckContentIntegrity(const IOS::ES::Content& content, u64 content_offset,
const IOS::ES::TicketReader& ticket) const
{
Expand Down Expand Up @@ -109,6 +115,11 @@ class Volume
virtual Platform GetVolumeType() const = 0;
virtual bool SupportsIntegrityCheck() const { return false; }
virtual bool CheckH3TableIntegrity(const Partition& partition) const { return false; }
virtual bool CheckBlockIntegrity(u64 block_index, const std::vector<u8>& encrypted_data,
const Partition& partition) const
{
return false;
}
virtual bool CheckBlockIntegrity(u64 block_index, const Partition& partition) const
{
return false;
Expand Down
36 changes: 27 additions & 9 deletions Source/Core/DiscIO/VolumeVerifier.cpp
View file
Expand Up @@ -691,8 +691,9 @@ void VolumeVerifier::Process()
if (m_progress == m_max_progress)
return;

IOS::ES::Content content;
IOS::ES::Content content{};
bool content_read = false;
bool block_read = false;
u64 bytes_to_read = BLOCK_SIZE;
if (m_content_index < m_content_offsets.size() &&
m_content_offsets[m_content_index] == m_progress)
Expand All @@ -709,17 +710,25 @@ void VolumeVerifier::Process()
else if (m_block_index < m_blocks.size() && m_blocks[m_block_index].offset == m_progress)
{
bytes_to_read = VolumeWii::BLOCK_TOTAL_SIZE;
block_read = true;
}
else if (m_block_index < m_blocks.size() && m_blocks[m_block_index].offset > m_progress)
{
bytes_to_read = std::min(bytes_to_read, m_blocks[m_block_index].offset - m_progress);
}
bytes_to_read = std::min(bytes_to_read, m_max_progress - m_progress);

bool read_succeeded = false;
std::vector<u8> data(bytes_to_read);
if (m_calculating_any_hash || content_read || block_read)
{
if (m_volume.Read(m_progress, bytes_to_read, data.data(), PARTITION_NONE))
read_succeeded = true;
}

if (m_calculating_any_hash)
{
std::vector<u8> data(bytes_to_read);
if (!m_volume.Read(m_progress, bytes_to_read, data.data(), PARTITION_NONE))
if (!read_succeeded)
{
m_calculating_any_hash = false;
}
Expand All @@ -740,11 +749,9 @@ void VolumeVerifier::Process()
}
}

m_progress += bytes_to_read;

if (content_read)
{
if (!m_volume.CheckContentIntegrity(content, m_content_offsets[m_content_index], m_ticket))
if (!read_succeeded || !m_volume.CheckContentIntegrity(content, data, m_ticket))
{
AddProblem(
Severity::High,
Expand All @@ -754,10 +761,16 @@ void VolumeVerifier::Process()
m_content_index++;
}

while (m_block_index < m_blocks.size() && m_blocks[m_block_index].offset < m_progress)
while (m_block_index < m_blocks.size() &&
m_blocks[m_block_index].offset < m_progress + bytes_to_read)
{
if (!m_volume.CheckBlockIntegrity(m_blocks[m_block_index].block_index,
m_blocks[m_block_index].partition))
const bool success = m_blocks[m_block_index].offset == m_progress ?
read_succeeded && m_volume.CheckBlockIntegrity(
m_blocks[m_block_index].block_index, data,
m_blocks[m_block_index].partition) :
m_volume.CheckBlockIntegrity(m_blocks[m_block_index].block_index,
m_blocks[m_block_index].partition);
if (!success)
{
const u64 offset = m_blocks[m_block_index].offset;
if (m_scrubber.CanBlockBeScrubbed(offset))
Expand All @@ -773,6 +786,8 @@ void VolumeVerifier::Process()
}
m_block_index++;
}

m_progress += bytes_to_read;
}

u64 VolumeVerifier::GetBytesProcessed() const
Expand All @@ -791,6 +806,9 @@ void VolumeVerifier::Finish()
return;
m_done = true;

ASSERT(m_content_index == m_content_offsets.size());
ASSERT(m_block_index == m_blocks.size());

if (m_calculating_any_hash)
{
if (m_hashes_to_calculate.crc32)
Expand Down
3 changes: 3 additions & 0 deletions Source/Core/DiscIO/VolumeWad.cpp
View file
Expand Up @@ -156,6 +156,9 @@ bool VolumeWAD::CheckContentIntegrity(const IOS::ES::Content& content,
const std::vector<u8>& encrypted_data,
const IOS::ES::TicketReader& ticket) const
{
if (encrypted_data.size() != Common::AlignUp(content.size, 0x40))
return false;

mbedtls_aes_context context;
const std::array<u8, 16> key = ticket.GetTitleKey();
mbedtls_aes_setkey_dec(&context, key.data(), 128);
Expand Down
5 changes: 2 additions & 3 deletions Source/Core/DiscIO/VolumeWad.h
View file
Expand Up @@ -39,6 +39,8 @@ class VolumeWAD : public Volume
GetCertificateChain(const Partition& partition = PARTITION_NONE) const override;
std::vector<u8> GetContent(u16 index) const override;
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;
Expand Down Expand Up @@ -66,9 +68,6 @@ class VolumeWAD : public Volume
u64 GetRawSize() const override;

private:
bool CheckContentIntegrity(const IOS::ES::Content& content, const std::vector<u8>& encrypted_data,
const IOS::ES::TicketReader& ticket) const;

std::unique_ptr<BlobReader> m_reader;
IOS::ES::TicketReader m_ticket;
IOS::ES::TMDReader m_tmd;
Expand Down
35 changes: 24 additions & 11 deletions Source/Core/DiscIO/VolumeWii.cpp
View file
Expand Up @@ -447,8 +447,12 @@ bool VolumeWii::CheckH3TableIntegrity(const Partition& partition) const
return h3_table_sha1 == contents[0].sha1;
}

bool VolumeWii::CheckBlockIntegrity(u64 block_index, const Partition& partition) const
bool VolumeWii::CheckBlockIntegrity(u64 block_index, const std::vector<u8>& encrypted_data,
const Partition& partition) const
{
if (encrypted_data.size() != BLOCK_TOTAL_SIZE)
return false;

auto it = m_partitions.find(partition);
if (it == m_partitions.end())
return false;
Expand All @@ -462,21 +466,15 @@ bool VolumeWii::CheckBlockIntegrity(u64 block_index, const Partition& partition)
if (!aes_context)
return false;

const u64 cluster_offset =
partition.offset + *partition_details.data_offset + block_index * BLOCK_TOTAL_SIZE;

// Read and decrypt the cluster metadata
u8 cluster_metadata_crypted[BLOCK_HEADER_SIZE];
u8 cluster_metadata[BLOCK_HEADER_SIZE];
u8 iv[16] = {0};
if (!m_reader->Read(cluster_offset, BLOCK_HEADER_SIZE, cluster_metadata_crypted))
return false;
mbedtls_aes_crypt_cbc(aes_context, MBEDTLS_AES_DECRYPT, BLOCK_HEADER_SIZE, iv,
cluster_metadata_crypted, cluster_metadata);
encrypted_data.data(), cluster_metadata);

u8 cluster_data[BLOCK_DATA_SIZE];
if (!Read(block_index * BLOCK_DATA_SIZE, BLOCK_DATA_SIZE, cluster_data, partition))
return false;
std::memcpy(iv, encrypted_data.data() + 0x3D0, 16);
mbedtls_aes_crypt_cbc(aes_context, MBEDTLS_AES_DECRYPT, BLOCK_DATA_SIZE, iv,
encrypted_data.data() + BLOCK_HEADER_SIZE, cluster_data);

for (u32 hash_index = 0; hash_index < 31; ++hash_index)
{
Expand Down Expand Up @@ -504,4 +502,19 @@ bool VolumeWii::CheckBlockIntegrity(u64 block_index, const Partition& partition)
return true;
}

bool VolumeWii::CheckBlockIntegrity(u64 block_index, const Partition& partition) const
{
auto it = m_partitions.find(partition);
if (it == m_partitions.end())
return false;
const PartitionDetails& partition_details = it->second;
const u64 cluster_offset =
partition.offset + *partition_details.data_offset + block_index * BLOCK_TOTAL_SIZE;

std::vector<u8> cluster(BLOCK_TOTAL_SIZE);
if (!m_reader->Read(cluster_offset, cluster.size(), cluster.data()))
return false;
return CheckBlockIntegrity(block_index, cluster, partition);
}

} // namespace DiscIO
2 changes: 2 additions & 0 deletions Source/Core/DiscIO/VolumeWii.h
View file
Expand Up @@ -58,6 +58,8 @@ class VolumeWii : public VolumeDisc
Platform GetVolumeType() const override;
bool SupportsIntegrityCheck() const override { return m_encrypted; }
bool CheckH3TableIntegrity(const Partition& partition) const override;
bool CheckBlockIntegrity(u64 block_index, const std::vector<u8>& encrypted_data,
const Partition& partition) const override;
bool CheckBlockIntegrity(u64 block_index, const Partition& partition) const override;

Region GetRegion() const override;
Expand Down

0 comments on commit f754a1a

Please sign in to comment.