summaryrefslogtreecommitdiff
path: root/src/core/crypto/key_manager.cpp
diff options
context:
space:
mode:
authorGravatar Zach Hilman2018-08-18 21:16:20 -0400
committerGravatar Zach Hilman2018-08-23 11:53:30 -0400
commita7e8d10969f280cd5a869b3525c3339357a958a6 (patch)
tree59e34b73d627cffab8cdbdf7e52ffdd6168c54fc /src/core/crypto/key_manager.cpp
parentcrypto: Eliminate magic constants (diff)
downloadyuzu-a7e8d10969f280cd5a869b3525c3339357a958a6.tar.gz
yuzu-a7e8d10969f280cd5a869b3525c3339357a958a6.tar.xz
yuzu-a7e8d10969f280cd5a869b3525c3339357a958a6.zip
file_sys: Cut down on includes and copies
Diffstat (limited to 'src/core/crypto/key_manager.cpp')
-rw-r--r--src/core/crypto/key_manager.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp
index acf635a65..1cb3fce00 100644
--- a/src/core/crypto/key_manager.cpp
+++ b/src/core/crypto/key_manager.cpp
@@ -199,7 +199,7 @@ Key256 KeyManager::GetKey(S256KeyType id, u64 field1, u64 field2) const {
199 199
200template <size_t Size> 200template <size_t Size>
201void KeyManager::WriteKeyToFile(bool title_key, std::string_view keyname, 201void KeyManager::WriteKeyToFile(bool title_key, std::string_view keyname,
202 std::array<u8, Size> key) { 202 const std::array<u8, Size>& key) {
203 const std::string yuzu_keys_dir = FileUtil::GetUserPath(FileUtil::UserPath::KeysDir); 203 const std::string yuzu_keys_dir = FileUtil::GetUserPath(FileUtil::UserPath::KeysDir);
204 std::string filename = "title.keys_autogenerated"; 204 std::string filename = "title.keys_autogenerated";
205 if (!title_key) 205 if (!title_key)
@@ -209,11 +209,10 @@ void KeyManager::WriteKeyToFile(bool title_key, std::string_view keyname,
209 if (!file.is_open()) 209 if (!file.is_open())
210 return; 210 return;
211 if (add_info_text) { 211 if (add_info_text) {
212 file << "# This file is autogenerated by Yuzu" << std::endl 212 file
213 << "# It serves to store keys that were automatically generated from the normal keys" 213 << "# This file is autogenerated by Yuzu\n"
214 << std::endl 214 << "# It serves to store keys that were automatically generated from the normal keys\n"
215 << "# If you are experiencing issues involving keys, it may help to delete this file" 215 << "# If you are experiencing issues involving keys, it may help to delete this file\n";
216 << std::endl;
217 } 216 }
218 217
219 file << std::endl 218 file << std::endl
@@ -263,11 +262,12 @@ bool KeyManager::KeyFileExists(bool title) {
263} 262}
264 263
265void KeyManager::DeriveSDSeedLazy() { 264void KeyManager::DeriveSDSeedLazy() {
266 if (!HasKey(S128KeyType::SDSeed)) { 265 if (HasKey(S128KeyType::SDSeed))
267 const auto res = DeriveSDSeed(); 266 return;
268 if (res != boost::none) 267
269 SetKey(S128KeyType::SDSeed, res.get()); 268 const auto res = DeriveSDSeed();
270 } 269 if (res != boost::none)
270 SetKey(S128KeyType::SDSeed, res.get());
271} 271}
272 272
273const boost::container::flat_map<std::string, KeyIndex<S128KeyType>> KeyManager::s128_file_id = { 273const boost::container::flat_map<std::string, KeyIndex<S128KeyType>> KeyManager::s128_file_id = {