franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aes_util: Make Transcode() a const member function

Browse Source 
This doesn't modify member state, so it can be made const.
This commit is contained in:
Lioncash 2018-08-04 16:49:39 -04:00
parent 8da651ac4d
commit b25468b498
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/crypto/aes_util.cpp
View File

@ -58,29 +58,30 @@ void AESCipher<Key, KeySize>::SetIV(std::vector<u8> iv) {
} }
template <typename Key, size_t KeySize> template <typename Key, size_t KeySize>
void AESCipher<Key, KeySize>::Transcode(const u8* src, size_t size, u8* dest, Op op) { void AESCipher<Key, KeySize>::Transcode(const u8* src, size_t size, u8* dest, Op op) const {
size_t written = 0; auto* const context = op == Op::Encrypt ? &ctx->encryption_context : &ctx->decryption_context;
const auto context = op == Op::Encrypt ? &ctx->encryption_context : &ctx->decryption_context;
mbedtls_cipher_reset(context); mbedtls_cipher_reset(context);
size_t written = 0;
if (mbedtls_cipher_get_cipher_mode(context) == MBEDTLS_MODE_XTS) { if (mbedtls_cipher_get_cipher_mode(context) == MBEDTLS_MODE_XTS) {
mbedtls_cipher_update(context, src, size, dest, &written); mbedtls_cipher_update(context, src, size, dest, &written);
if (written != size) if (written != size) {
LOG_WARNING(Crypto, "Not all data was decrypted requested={:016X}, actual={:016X}.", LOG_WARNING(Crypto, "Not all data was decrypted requested={:016X}, actual={:016X}.",
size, written); size, written);
}
} else { } else {
const auto block_size = mbedtls_cipher_get_block_size(context); const auto block_size = mbedtls_cipher_get_block_size(context);
for (size_t offset = 0; offset < size; offset += block_size) { for (size_t offset = 0; offset < size; offset += block_size) {
auto length = std::min<size_t>(block_size, size - offset); auto length = std::min<size_t>(block_size, size - offset);
mbedtls_cipher_update(context, src + offset, length, dest + offset, &written); mbedtls_cipher_update(context, src + offset, length, dest + offset, &written);
if (written != length) if (written != length) {
LOG_WARNING(Crypto, "Not all data was decrypted requested={:016X}, actual={:016X}.", LOG_WARNING(Crypto, "Not all data was decrypted requested={:016X}, actual={:016X}.",
length, written); length, written);
} }
} }
}
mbedtls_cipher_finish(context, nullptr, nullptr); mbedtls_cipher_finish(context, nullptr, nullptr);
} }

4
src/core/crypto/aes_util.h
View File

@ -38,11 +38,11 @@ public:
void SetIV(std::vector<u8> iv); void SetIV(std::vector<u8> iv);
template <typename Source, typename Dest> template <typename Source, typename Dest>
void Transcode(const Source* src, size_t size, Dest* dest, Op op) { void Transcode(const Source* src, size_t size, Dest* dest, Op op) const {
Transcode(reinterpret_cast<const u8*>(src), size, reinterpret_cast<u8*>(dest), op); Transcode(reinterpret_cast<const u8*>(src), size, reinterpret_cast<u8*>(dest), op);
} }
void Transcode(const u8* src, size_t size, u8* dest, Op op); void Transcode(const u8* src, size_t size, u8* dest, Op op) const;
template <typename Source, typename Dest> template <typename Source, typename Dest>
void XTSTranscode(const Source* src, size_t size, Dest* dest, size_t sector_id, void XTSTranscode(const Source* src, size_t size, Dest* dest, size_t sector_id,