From 063446c46ff743d458b43025056bd01988b57ff6 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Thu, 24 Sep 2015 00:39:34 +0200 Subject: mbedTLS: run rename.pl script and fix errors --- Source/Core/DiscIO/VolumeWiiCrypted.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/Core/DiscIO/VolumeWiiCrypted.cpp') diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index aa7f36da64..a4b71e49c9 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include #include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" @@ -30,13 +30,13 @@ namespace DiscIO CVolumeWiiCrypted::CVolumeWiiCrypted(std::unique_ptr reader, u64 _VolumeOffset, const unsigned char* _pVolumeKey) : m_pReader(std::move(reader)), - m_AES_ctx(new aes_context), + m_AES_ctx(new mbedtls_aes_context), m_pBuffer(nullptr), m_VolumeOffset(_VolumeOffset), m_dataOffset(0x20000), m_LastDecryptedBlockOffset(-1) { - aes_setkey_dec(m_AES_ctx.get(), _pVolumeKey, 128); + mbedtls_aes_setkey_dec(m_AES_ctx.get(), _pVolumeKey, 128); m_pBuffer = new u8[s_block_total_size]; } @@ -47,7 +47,7 @@ bool CVolumeWiiCrypted::ChangePartition(u64 offset) u8 volume_key[16]; DiscIO::VolumeKeyForPartition(*m_pReader, offset, volume_key); - aes_setkey_dec(m_AES_ctx.get(), volume_key, 128); + mbedtls_aes_setkey_dec(m_AES_ctx.get(), volume_key, 128); return true; } @@ -83,7 +83,7 @@ bool CVolumeWiiCrypted::Read(u64 _ReadOffset, u64 _Length, u8* _pBuffer, bool de // 0x3D0 - 0x3DF in m_pBuffer will be overwritten, // but that won't affect anything, because we won't // use the content of m_pBuffer anymore after this - aes_crypt_cbc(m_AES_ctx.get(), AES_DECRYPT, s_block_data_size, m_pBuffer + 0x3D0, + mbedtls_aes_crypt_cbc(m_AES_ctx.get(), MBEDTLS_AES_DECRYPT, s_block_data_size, m_pBuffer + 0x3D0, m_pBuffer + s_block_header_size, m_LastDecryptedBlock); m_LastDecryptedBlockOffset = Block; @@ -287,7 +287,7 @@ bool CVolumeWiiCrypted::CheckIntegrity() const NOTICE_LOG(DISCIO, "Integrity Check: fail at cluster %d: could not read metadata", clusterID); return false; } - aes_crypt_cbc(m_AES_ctx.get(), AES_DECRYPT, 0x400, IV, clusterMDCrypted, clusterMD); + mbedtls_aes_crypt_cbc(m_AES_ctx.get(), MBEDTLS_AES_DECRYPT, 0x400, IV, clusterMDCrypted, clusterMD); // Some clusters have invalid data and metadata because they aren't @@ -317,7 +317,7 @@ bool CVolumeWiiCrypted::CheckIntegrity() const { u8 hash[20]; - sha1(clusterData + hashID * 0x400, 0x400, hash); + mbedtls_sha1(clusterData + hashID * 0x400, 0x400, hash); // Note that we do not use strncmp here if (memcmp(hash, clusterMD + hashID * 20, 20)) -- cgit v1.2.3