Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

common/hex_util: Combine HexVectorToString() and HexArrayToString()

Browse source 
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.
This commit is contained in:
Lioncash 2019-06-12 17:27:06 -04:00
parent 7e2bcf04b4
commit a62088539e
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
11 changed files with 40 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/crypto/key_manager.cpp
View file

@ -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;