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

aes_util: Make use of std::span 

Allows us to simplify the interface quite a bit as it will handle
contiguous sequences for us.
This commit is contained in:
Lioncash 2021-04-23 09:58:38 -04:00
parent 607ff3489c
commit 9c5248d101
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