diff options
author | bunnei <bunneidev@gmail.com> | 2020-07-11 04:45:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-11 04:45:18 +0200 |
commit | a45a57641fc224dd9b7aa3a248b74689f0b35089 (patch) | |
tree | 5c3dc791811163746a4b91b0b0d045097a9f96a2 | |
parent | Merge pull request #4221 from jbeich/unused-qt-opengl (diff) | |
parent | KeyManager: Prevent writing of invalid keys (diff) | |
download | yuzu-a45a57641fc224dd9b7aa3a248b74689f0b35089.tar yuzu-a45a57641fc224dd9b7aa3a248b74689f0b35089.tar.gz yuzu-a45a57641fc224dd9b7aa3a248b74689f0b35089.tar.bz2 yuzu-a45a57641fc224dd9b7aa3a248b74689f0b35089.tar.lz yuzu-a45a57641fc224dd9b7aa3a248b74689f0b35089.tar.xz yuzu-a45a57641fc224dd9b7aa3a248b74689f0b35089.tar.zst yuzu-a45a57641fc224dd9b7aa3a248b74689f0b35089.zip |
-rw-r--r-- | src/core/crypto/key_manager.cpp | 12 |
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; } |