summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2020-07-05 22:10:51 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2020-07-10 06:39:00 +0200
commit7351ca8c75b7c4d3a7101f0e2f8659b73c4a64c6 (patch)
tree2a5287c2af385738a0baf307a3f807061518507b /src
parentMerge pull request #4285 from ogniK5377/fmt-fix (diff)
downloadyuzu-7351ca8c75b7c4d3a7101f0e2f8659b73c4a64c6.tar
yuzu-7351ca8c75b7c4d3a7101f0e2f8659b73c4a64c6.tar.gz
yuzu-7351ca8c75b7c4d3a7101f0e2f8659b73c4a64c6.tar.bz2
yuzu-7351ca8c75b7c4d3a7101f0e2f8659b73c4a64c6.tar.lz
yuzu-7351ca8c75b7c4d3a7101f0e2f8659b73c4a64c6.tar.xz
yuzu-7351ca8c75b7c4d3a7101f0e2f8659b73c4a64c6.tar.zst
yuzu-7351ca8c75b7c4d3a7101f0e2f8659b73c4a64c6.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/crypto/key_manager.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp
index 8997c7082..f87fe0abc 100644
--- a/src/core/crypto/key_manager.cpp
+++ b/src/core/crypto/key_manager.cpp
@@ -695,8 +695,9 @@ void KeyManager::WriteKeyToFile(KeyCategory category, std::string_view keyname,
}
void KeyManager::SetKey(S128KeyType id, Key128 key, u64 field1, u64 field2) {
- if (s128_keys.find({id, field1, field2}) != s128_keys.end())
+ if (s128_keys.find({id, field1, field2}) != s128_keys.end() || key == Key128{}) {
return;
+ }
if (id == S128KeyType::Titlekey) {
Key128 rights_id;
std::memcpy(rights_id.data(), &field2, sizeof(u64));
@@ -716,8 +717,9 @@ void KeyManager::SetKey(S128KeyType id, Key128 key, u64 field1, u64 field2) {
return std::tie(elem.second.type, elem.second.field1, elem.second.field2) ==
std::tie(id, field1, field2);
});
- if (iter2 != s128_file_id.end())
+ if (iter2 != s128_file_id.end()) {
WriteKeyToFile(category, iter2->first, key);
+ }
// Variable cases
if (id == S128KeyType::KeyArea) {
@@ -745,16 +747,18 @@ void KeyManager::SetKey(S128KeyType id, Key128 key, u64 field1, u64 field2) {
}
void KeyManager::SetKey(S256KeyType id, Key256 key, u64 field1, u64 field2) {
- if (s256_keys.find({id, field1, field2}) != s256_keys.end())
+ if (s256_keys.find({id, field1, field2}) != s256_keys.end() || key == Key256{}) {
return;
+ }
const auto iter = std::find_if(
s256_file_id.begin(), s256_file_id.end(),
[&id, &field1, &field2](const std::pair<std::string, KeyIndex<S256KeyType>> elem) {
return std::tie(elem.second.type, elem.second.field1, elem.second.field2) ==
std::tie(id, field1, field2);
});
- if (iter != s256_file_id.end())
+ if (iter != s256_file_id.end()) {
WriteKeyToFile(KeyCategory::Standard, iter->first, key);
+ }
s256_keys[{id, field1, field2}] = key;
}