Mirrors/yuzu-fork
1
0
Fork 0
mirror of https://github.com/yuzu-mirror/yuzu.git synced 2024-11-03 07:40:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6231 from lioncash/aes

Browse source 
aes_util: Make use of std::span
This commit is contained in:
bunnei 2021-04-23 11:37:17 -07:00 committed by GitHub
commit 51c787bfc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/crypto/aes_util.cpp
View file

@ -119,9 +119,9 @@ void AESCipher<Key, KeySize>::XTSTranscode(const u8* src, std::size_t size, u8*
} }
template <typename Key, std::size_t KeySize> template <typename Key, std::size_t KeySize>
void AESCipher<Key, KeySize>::SetIVImpl(const u8* data, std::size_t size) { void AESCipher<Key, KeySize>::SetIV(std::span<const u8> data) {
ASSERT_MSG((mbedtls_cipher_set_iv(&ctx->encryption_context, data, size) || ASSERT_MSG((mbedtls_cipher_set_iv(&ctx->encryption_context, data.data(), data.size()) ||
mbedtls_cipher_set_iv(&ctx->decryption_context, data, size)) == 0, mbedtls_cipher_set_iv(&ctx->decryption_context, data.data(), data.size())) == 0,
"Failed to set IV on mbedtls ciphers."); "Failed to set IV on mbedtls ciphers.");
} }

8
src/core/crypto/aes_util.h
View file

@ -5,6 +5,7 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include <span>
#include <type_traits> #include <type_traits>
#include "common/common_types.h" #include "common/common_types.h"
#include "core/file_sys/vfs.h" #include "core/file_sys/vfs.h"
@ -33,10 +34,7 @@ public:
AESCipher(Key key, Mode mode); AESCipher(Key key, Mode mode);
~AESCipher(); ~AESCipher();
template <typename ContiguousContainer> void SetIV(std::span<const u8> data);
void SetIV(const ContiguousContainer& container) {
SetIVImpl(std::data(container), std::size(container));
}
template <typename Source, typename Dest> template <typename Source, typename Dest>
void Transcode(const Source* src, std::size_t size, Dest* dest, Op op) const { void Transcode(const Source* src, std::size_t size, Dest* dest, Op op) const {
@ -60,8 +58,6 @@ public:
std::size_t sector_size, Op op); std::size_t sector_size, Op op);
private: private:
void SetIVImpl(const u8* data, std::size_t size);
std::unique_ptr<CipherContext> ctx; std::unique_ptr<CipherContext> ctx;
}; };
} // namespace Core::Crypto } // namespace Core::Crypto