summaryrefslogtreecommitdiff
path: root/src/core/crypto/key_manager.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2019-06-12 17:27:06 -0400
committerGravatar Lioncash2019-06-12 17:54:05 -0400
commita62088539ed02a8569814601b3b99b713c5d8a34 (patch)
tree03fe279e7651c55291f702f5a8b518cb07e35812 /src/core/crypto/key_manager.cpp
parentMerge pull request #2578 from lioncash/cnmt (diff)
downloadyuzu-a62088539ed02a8569814601b3b99b713c5d8a34.tar.gz
yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.tar.xz
yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.zip
common/hex_util: Combine HexVectorToString() and HexArrayToString()
These can be generified together by using a concept type to designate them. This also has the benefit of not making copies of potentially very large arrays.
Diffstat (limited to 'src/core/crypto/key_manager.cpp')
-rw-r--r--src/core/crypto/key_manager.cpp4
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,
572 << "# If you are experiencing issues involving keys, it may help to delete this file\n"; 572 << "# If you are experiencing issues involving keys, it may help to delete this file\n";
573 } 573 }
574 574
575 file << fmt::format("\n{} = {}", keyname, Common::HexArrayToString(key)); 575 file << fmt::format("\n{} = {}", keyname, Common::HexToString(key));
576 AttemptLoadKeyFile(yuzu_keys_dir, yuzu_keys_dir, filename, category == KeyCategory::Title); 576 AttemptLoadKeyFile(yuzu_keys_dir, yuzu_keys_dir, filename, category == KeyCategory::Title);
577} 577}
578 578
@@ -583,7 +583,7 @@ void KeyManager::SetKey(S128KeyType id, Key128 key, u64 field1, u64 field2) {
583 Key128 rights_id; 583 Key128 rights_id;
584 std::memcpy(rights_id.data(), &field2, sizeof(u64)); 584 std::memcpy(rights_id.data(), &field2, sizeof(u64));
585 std::memcpy(rights_id.data() + sizeof(u64), &field1, sizeof(u64)); 585 std::memcpy(rights_id.data() + sizeof(u64), &field1, sizeof(u64));
586 WriteKeyToFile(KeyCategory::Title, Common::HexArrayToString(rights_id), key); 586 WriteKeyToFile(KeyCategory::Title, Common::HexToString(rights_id), key);
587 } 587 }
588 588
589 auto category = KeyCategory::Standard; 589 auto category = KeyCategory::Standard;