diff options
author | Zach Hilman <DarkLordZach@users.noreply.github.com> | 2019-06-15 16:47:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-15 16:47:13 -0400 |
commit | c140b6ae2ca6bc318f47b74a6946ddb10d282dbe (patch) | |
tree | 6407b0465b93a7cfc0a5733e0d8dd3bb26742a15 /src/core/crypto | |
parent | 0360c40e90eda9ad0cf9db3a3ee638d68d16d5bd (diff) | |
parent | 969cd6dc1d60acd98c89815dd53c11bf4dac2518 (diff) |
Merge pull request #2581 from lioncash/hex
common/hex_util: Combine HexVectorToString() and HexArrayToString()
Diffstat (limited to 'src/core/crypto')
-rw-r--r-- | src/core/crypto/key_manager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index dc006e2bb..6dd633363 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp @@ -572,7 +572,7 @@ void KeyManager::WriteKeyToFile(KeyCategory category, std::string_view keyname, << "# If you are experiencing issues involving keys, it may help to delete this file\n"; } - file << fmt::format("\n{} = {}", keyname, Common::HexArrayToString(key)); + file << fmt::format("\n{} = {}", keyname, Common::HexToString(key)); AttemptLoadKeyFile(yuzu_keys_dir, yuzu_keys_dir, filename, category == KeyCategory::Title); } @@ -583,7 +583,7 @@ void KeyManager::SetKey(S128KeyType id, Key128 key, u64 field1, u64 field2) { Key128 rights_id; std::memcpy(rights_id.data(), &field2, sizeof(u64)); std::memcpy(rights_id.data() + sizeof(u64), &field1, sizeof(u64)); - WriteKeyToFile(KeyCategory::Title, Common::HexArrayToString(rights_id), key); + WriteKeyToFile(KeyCategory::Title, Common::HexToString(rights_id), key); } auto category = KeyCategory::Standard; |