diff options
author | bunnei <bunneidev@gmail.com> | 2018-08-16 17:54:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-16 17:54:42 +0200 |
commit | 3fd78f4d24118091d6e75e950a78d5b24d50dc53 (patch) | |
tree | 837ef068281d70eb9b5d9b1d760a59794d5f1672 /src/core/crypto | |
parent | Merge pull request #1075 from lioncash/include (diff) | |
parent | common: Namespace hex_util.h/.cpp (diff) | |
download | yuzu-3fd78f4d24118091d6e75e950a78d5b24d50dc53.tar yuzu-3fd78f4d24118091d6e75e950a78d5b24d50dc53.tar.gz yuzu-3fd78f4d24118091d6e75e950a78d5b24d50dc53.tar.bz2 yuzu-3fd78f4d24118091d6e75e950a78d5b24d50dc53.tar.lz yuzu-3fd78f4d24118091d6e75e950a78d5b24d50dc53.tar.xz yuzu-3fd78f4d24118091d6e75e950a78d5b24d50dc53.tar.zst yuzu-3fd78f4d24118091d6e75e950a78d5b24d50dc53.zip |
Diffstat (limited to 'src/core/crypto')
-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) { out[1].erase(std::remove(out[1].begin(), out[1].end(), ' '), out[1].end()); if (is_title_keys) { - auto rights_id_raw = HexStringToArray<16>(out[0]); + auto rights_id_raw = Common::HexStringToArray<16>(out[0]); u128 rights_id{}; std::memcpy(rights_id.data(), rights_id_raw.data(), rights_id_raw.size()); - Key128 key = HexStringToArray<16>(out[1]); + Key128 key = Common::HexStringToArray<16>(out[1]); SetKey(S128KeyType::Titlekey, key, rights_id[1], rights_id[0]); } else { std::transform(out[0].begin(), out[0].end(), out[0].begin(), ::tolower); if (s128_file_id.find(out[0]) != s128_file_id.end()) { const auto index = s128_file_id.at(out[0]); - Key128 key = HexStringToArray<16>(out[1]); + Key128 key = Common::HexStringToArray<16>(out[1]); SetKey(index.type, key, index.field1, index.field2); } else if (s256_file_id.find(out[0]) != s256_file_id.end()) { const auto index = s256_file_id.at(out[0]); - Key256 key = HexStringToArray<32>(out[1]); + Key256 key = Common::HexStringToArray<32>(out[1]); SetKey(index.type, key, index.field1, index.field2); } } |