diff options
| author | bunnei <bunneidev@gmail.com> | 2019-11-15 18:08:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-15 18:08:50 +0100 |
| commit | 3e0e4f146b3f2ad7f1935a61141c38cdce87e04f (patch) | |
| tree | 75f29ce4bb9d84f9d9722b7aa86d71e805cac8cc /src/core/crypto/partition_data_manager.cpp | |
| parent | Merge pull request #3113 from lioncash/semi (diff) | |
| parent | externals: Update httplib (diff) | |
| download | yuzu-3e0e4f146b3f2ad7f1935a61141c38cdce87e04f.tar yuzu-3e0e4f146b3f2ad7f1935a61141c38cdce87e04f.tar.gz yuzu-3e0e4f146b3f2ad7f1935a61141c38cdce87e04f.tar.bz2 yuzu-3e0e4f146b3f2ad7f1935a61141c38cdce87e04f.tar.lz yuzu-3e0e4f146b3f2ad7f1935a61141c38cdce87e04f.tar.xz yuzu-3e0e4f146b3f2ad7f1935a61141c38cdce87e04f.tar.zst yuzu-3e0e4f146b3f2ad7f1935a61141c38cdce87e04f.zip | |
Diffstat (limited to 'src/core/crypto/partition_data_manager.cpp')
| -rw-r--r-- | src/core/crypto/partition_data_manager.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/crypto/partition_data_manager.cpp b/src/core/crypto/partition_data_manager.cpp index a4b09fd12..d64302f2e 100644 --- a/src/core/crypto/partition_data_manager.cpp +++ b/src/core/crypto/partition_data_manager.cpp @@ -204,11 +204,12 @@ static std::array<Key128, 0x20> FindEncryptedMasterKeyFromHex(const std::vector< FileSys::VirtualFile FindFileInDirWithNames(const FileSys::VirtualDir& dir, const std::string& name) { - auto upper = name; - std::transform(upper.begin(), upper.end(), upper.begin(), [](u8 c) { return std::toupper(c); }); + const auto upper = Common::ToUpper(name); + for (const auto& fname : {name, name + ".bin", upper, upper + ".BIN"}) { - if (dir->GetFile(fname) != nullptr) + if (dir->GetFile(fname) != nullptr) { return dir->GetFile(fname); + } } return nullptr; |