diff options
| author | 2020-04-23 02:18:52 -0400 | |
|---|---|---|
| committer | 2020-04-23 02:18:52 -0400 | |
| commit | 2409fedacfeb36dd36f1d815f58a5834eb6f0504 (patch) | |
| tree | b9253bfc4098fc9c366c6c82f3d2a0bb73fe0b85 /src/core/crypto | |
| parent | Merge pull request #3677 from FernandoS27/better-sync (diff) | |
| parent | CMakeLists: Make missing declarations a compile-time error (diff) | |
| download | yuzu-2409fedacfeb36dd36f1d815f58a5834eb6f0504.tar.gz yuzu-2409fedacfeb36dd36f1d815f58a5834eb6f0504.tar.xz yuzu-2409fedacfeb36dd36f1d815f58a5834eb6f0504.zip | |
Merge pull request #3697 from lioncash/declarations
CMakeLists: Enable -Wmissing-declarations on Linux builds
Diffstat (limited to 'src/core/crypto')
| -rw-r--r-- | src/core/crypto/partition_data_manager.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/crypto/partition_data_manager.cpp b/src/core/crypto/partition_data_manager.cpp index d64302f2e..7ed71ac3a 100644 --- a/src/core/crypto/partition_data_manager.cpp +++ b/src/core/crypto/partition_data_manager.cpp | |||
| @@ -202,8 +202,8 @@ static std::array<Key128, 0x20> FindEncryptedMasterKeyFromHex(const std::vector< | |||
| 202 | return out; | 202 | return out; |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | FileSys::VirtualFile FindFileInDirWithNames(const FileSys::VirtualDir& dir, | 205 | static FileSys::VirtualFile FindFileInDirWithNames(const FileSys::VirtualDir& dir, |
| 206 | const std::string& name) { | 206 | const std::string& name) { |
| 207 | const auto upper = Common::ToUpper(name); | 207 | const auto upper = Common::ToUpper(name); |
| 208 | 208 | ||
| 209 | for (const auto& fname : {name, name + ".bin", upper, upper + ".BIN"}) { | 209 | for (const auto& fname : {name, name + ".bin", upper, upper + ".BIN"}) { |
| @@ -345,8 +345,7 @@ FileSys::VirtualFile PartitionDataManager::GetPackage2Raw(Package2Type type) con | |||
| 345 | return package2.at(static_cast<size_t>(type)); | 345 | return package2.at(static_cast<size_t>(type)); |
| 346 | } | 346 | } |
| 347 | 347 | ||
| 348 | bool AttemptDecrypt(const std::array<u8, 16>& key, Package2Header& header) { | 348 | static bool AttemptDecrypt(const std::array<u8, 16>& key, Package2Header& header) { |
| 349 | |||
| 350 | const std::vector<u8> iv(header.header_ctr.begin(), header.header_ctr.end()); | 349 | const std::vector<u8> iv(header.header_ctr.begin(), header.header_ctr.end()); |
| 351 | Package2Header temp = header; | 350 | Package2Header temp = header; |
| 352 | AESCipher<Key128> cipher(key, Mode::CTR); | 351 | AESCipher<Key128> cipher(key, Mode::CTR); |