From 34f32898e63e7dd5d0251fd630f8d569432c9ac3 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 14 Jul 2019 18:00:14 +0200 Subject: DiscIO: Merge WiiWAD into VolumeWAD These two classes are very similar, so let's merge them. --- Source/Core/DiscIO/VolumeVerifier.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Source/Core/DiscIO/VolumeVerifier.cpp') diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp index 5e20803651..55da0d27c6 100644 --- a/Source/Core/DiscIO/VolumeVerifier.cpp +++ b/Source/Core/DiscIO/VolumeVerifier.cpp @@ -770,10 +770,7 @@ void VolumeVerifier::Process() bool VolumeVerifier::CheckContentIntegrity(const IOS::ES::Content& content) { - const u64 padded_size = Common::AlignUp(content.size, 0x40); - std::vector encrypted_data(padded_size); - m_volume.Read(m_content_offsets[m_content_index], padded_size, encrypted_data.data(), - PARTITION_NONE); + std::vector encrypted_data = m_volume.GetContent(content.index); mbedtls_aes_context context; const std::array key = m_volume.GetTicket(PARTITION_NONE).GetTitleKey(); @@ -783,8 +780,8 @@ bool VolumeVerifier::CheckContentIntegrity(const IOS::ES::Content& content) iv[0] = static_cast(content.index >> 8); iv[1] = static_cast(content.index & 0xFF); - std::vector decrypted_data(padded_size); - mbedtls_aes_crypt_cbc(&context, MBEDTLS_AES_DECRYPT, padded_size, iv.data(), + std::vector decrypted_data(Common::AlignUp(content.size, 0x40)); + mbedtls_aes_crypt_cbc(&context, MBEDTLS_AES_DECRYPT, decrypted_data.size(), iv.data(), encrypted_data.data(), decrypted_data.data()); std::array sha1; -- cgit v1.2.3