diff options
Diffstat (limited to 'src/core/crypto')
| -rw-r--r-- | src/core/crypto/ctr_encryption_layer.cpp | 4 | ||||
| -rw-r--r-- | src/core/crypto/ctr_encryption_layer.h | 2 | ||||
| -rw-r--r-- | src/core/crypto/key_manager.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/crypto/ctr_encryption_layer.cpp b/src/core/crypto/ctr_encryption_layer.cpp index 5c84bb0a4..1231da8e3 100644 --- a/src/core/crypto/ctr_encryption_layer.cpp +++ b/src/core/crypto/ctr_encryption_layer.cpp | |||
| @@ -10,8 +10,8 @@ | |||
| 10 | namespace Core::Crypto { | 10 | namespace Core::Crypto { |
| 11 | 11 | ||
| 12 | CTREncryptionLayer::CTREncryptionLayer(FileSys::VirtualFile base_, Key128 key_, | 12 | CTREncryptionLayer::CTREncryptionLayer(FileSys::VirtualFile base_, Key128 key_, |
| 13 | std::size_t base_offset) | 13 | std::size_t base_offset_) |
| 14 | : EncryptionLayer(std::move(base_)), base_offset(base_offset), cipher(key_, Mode::CTR) {} | 14 | : EncryptionLayer(std::move(base_)), base_offset(base_offset_), cipher(key_, Mode::CTR) {} |
| 15 | 15 | ||
| 16 | std::size_t CTREncryptionLayer::Read(u8* data, std::size_t length, std::size_t offset) const { | 16 | std::size_t CTREncryptionLayer::Read(u8* data, std::size_t length, std::size_t offset) const { |
| 17 | if (length == 0) | 17 | if (length == 0) |
diff --git a/src/core/crypto/ctr_encryption_layer.h b/src/core/crypto/ctr_encryption_layer.h index a2429f001..f86f01b6f 100644 --- a/src/core/crypto/ctr_encryption_layer.h +++ b/src/core/crypto/ctr_encryption_layer.h | |||
| @@ -17,7 +17,7 @@ class CTREncryptionLayer : public EncryptionLayer { | |||
| 17 | public: | 17 | public: |
| 18 | using IVData = std::array<u8, 16>; | 18 | using IVData = std::array<u8, 16>; |
| 19 | 19 | ||
| 20 | CTREncryptionLayer(FileSys::VirtualFile base, Key128 key, std::size_t base_offset); | 20 | CTREncryptionLayer(FileSys::VirtualFile base_, Key128 key_, std::size_t base_offset_); |
| 21 | 21 | ||
| 22 | std::size_t Read(u8* data, std::size_t length, std::size_t offset) const override; | 22 | std::size_t Read(u8* data, std::size_t length, std::size_t offset) const override; |
| 23 | 23 | ||
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index 070ed439e..a4b739c63 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp | |||
| @@ -458,7 +458,7 @@ static std::array<u8, size> operator^(const std::array<u8, size>& lhs, | |||
| 458 | const std::array<u8, size>& rhs) { | 458 | const std::array<u8, size>& rhs) { |
| 459 | std::array<u8, size> out; | 459 | std::array<u8, size> out; |
| 460 | std::transform(lhs.begin(), lhs.end(), rhs.begin(), out.begin(), | 460 | std::transform(lhs.begin(), lhs.end(), rhs.begin(), out.begin(), |
| 461 | [](u8 lhs, u8 rhs) { return u8(lhs ^ rhs); }); | 461 | [](u8 lhs_elem, u8 rhs_elem) { return u8(lhs_elem ^ rhs_elem); }); |
| 462 | return out; | 462 | return out; |
| 463 | } | 463 | } |
| 464 | 464 | ||