diff options
| author | 2018-08-15 23:16:11 -0400 | |
|---|---|---|
| committer | 2018-08-15 23:24:00 -0400 | |
| commit | b39cd70cd4a78903506d987080fe5e4a0e990f2d (patch) | |
| tree | 64b90ace1c02e926a94d4b6dfa37377503dbca26 /src/core/crypto/key_manager.cpp | |
| parent | Merge pull request #1005 from DarkLordZach/registered-fmt (diff) | |
| download | yuzu-b39cd70cd4a78903506d987080fe5e4a0e990f2d.tar.gz yuzu-b39cd70cd4a78903506d987080fe5e4a0e990f2d.tar.xz yuzu-b39cd70cd4a78903506d987080fe5e4a0e990f2d.zip | |
common: Namespace hex_util.h/.cpp
It's in the common code, so it should be under the Common namespace like
everything else.
Diffstat (limited to 'src/core/crypto/key_manager.cpp')
| -rw-r--r-- | src/core/crypto/key_manager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index 94d92579f..db8b22c85 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp | |||
| @@ -52,20 +52,20 @@ void KeyManager::LoadFromFile(const std::string& filename, bool is_title_keys) { | |||
| 52 | out[1].erase(std::remove(out[1].begin(), out[1].end(), ' '), out[1].end()); | 52 | out[1].erase(std::remove(out[1].begin(), out[1].end(), ' '), out[1].end()); |
| 53 | 53 | ||
| 54 | if (is_title_keys) { | 54 | if (is_title_keys) { |
| 55 | auto rights_id_raw = HexStringToArray<16>(out[0]); | 55 | auto rights_id_raw = Common::HexStringToArray<16>(out[0]); |
| 56 | u128 rights_id{}; | 56 | u128 rights_id{}; |
| 57 | std::memcpy(rights_id.data(), rights_id_raw.data(), rights_id_raw.size()); | 57 | std::memcpy(rights_id.data(), rights_id_raw.data(), rights_id_raw.size()); |
| 58 | Key128 key = HexStringToArray<16>(out[1]); | 58 | Key128 key = Common::HexStringToArray<16>(out[1]); |
| 59 | SetKey(S128KeyType::Titlekey, key, rights_id[1], rights_id[0]); | 59 | SetKey(S128KeyType::Titlekey, key, rights_id[1], rights_id[0]); |
| 60 | } else { | 60 | } else { |
| 61 | std::transform(out[0].begin(), out[0].end(), out[0].begin(), ::tolower); | 61 | std::transform(out[0].begin(), out[0].end(), out[0].begin(), ::tolower); |
| 62 | if (s128_file_id.find(out[0]) != s128_file_id.end()) { | 62 | if (s128_file_id.find(out[0]) != s128_file_id.end()) { |
| 63 | const auto index = s128_file_id.at(out[0]); | 63 | const auto index = s128_file_id.at(out[0]); |
| 64 | Key128 key = HexStringToArray<16>(out[1]); | 64 | Key128 key = Common::HexStringToArray<16>(out[1]); |
| 65 | SetKey(index.type, key, index.field1, index.field2); | 65 | SetKey(index.type, key, index.field1, index.field2); |
| 66 | } else if (s256_file_id.find(out[0]) != s256_file_id.end()) { | 66 | } else if (s256_file_id.find(out[0]) != s256_file_id.end()) { |
| 67 | const auto index = s256_file_id.at(out[0]); | 67 | const auto index = s256_file_id.at(out[0]); |
| 68 | Key256 key = HexStringToArray<32>(out[1]); | 68 | Key256 key = Common::HexStringToArray<32>(out[1]); |
| 69 | SetKey(index.type, key, index.field1, index.field2); | 69 | SetKey(index.type, key, index.field1, index.field2); |
| 70 | } | 70 | } |
| 71 | } | 71 | } |