sneedmca/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu synced 2024-11-01 12:57:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #4250 from Morph1984/key-writing

Browse source 
KeyManager: Prevent writing of invalid keys
This commit is contained in:
bunnei 2020-07-10 22:45:18 -04:00 committed by GitHub
commit a45a57641f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -695,8 +695,9 @@ void KeyManager::WriteKeyToFile(KeyCategory category, std::string_view keyname,
} }
void KeyManager::SetKey(S128KeyType id, Key128 key, u64 field1, u64 field2) { 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; return;
}
if (id == S128KeyType::Titlekey) { if (id == S128KeyType::Titlekey) {
Key128 rights_id; Key128 rights_id;
std::memcpy(rights_id.data(), &field2, sizeof(u64)); 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) == return std::tie(elem.second.type, elem.second.field1, elem.second.field2) ==
std::tie(id, field1, field2); std::tie(id, field1, field2);
}); });
if (iter2 != s128_file_id.end()) if (iter2 != s128_file_id.end()) {
WriteKeyToFile(category, iter2->first, key); WriteKeyToFile(category, iter2->first, key);
}
// Variable cases // Variable cases
if (id == S128KeyType::KeyArea) { 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) { 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; return;
}
const auto iter = std::find_if( const auto iter = std::find_if(
s256_file_id.begin(), s256_file_id.end(), s256_file_id.begin(), s256_file_id.end(),
[&id, &field1, &field2](const std::pair<std::string, KeyIndex<S256KeyType>> elem) { [&id, &field1, &field2](const std::pair<std::string, KeyIndex<S256KeyType>> elem) {
return std::tie(elem.second.type, elem.second.field1, elem.second.field2) == return std::tie(elem.second.type, elem.second.field1, elem.second.field2) ==
std::tie(id, field1, field2); std::tie(id, field1, field2);
}); });
if (iter != s256_file_id.end()) if (iter != s256_file_id.end()) {
WriteKeyToFile(KeyCategory::Standard, iter->first, key); WriteKeyToFile(KeyCategory::Standard, iter->first, key);
}
s256_keys[{id, field1, field2}] = key; s256_keys[{id, field1, field2}] = key;
} }