|
|
|
@ -406,9 +406,7 @@ std::optional<std::pair<Key128, Key128>> ParseTicket(const Ticket& ticket,
|
|
|
|
|
if (issuer == std::array<u8, 0x40>{})
|
|
|
|
|
return {};
|
|
|
|
|
if (issuer[0] != 'R' || issuer[1] != 'o' || issuer[2] != 'o' || issuer[3] != 't') {
|
|
|
|
|
LOG_INFO(Crypto,
|
|
|
|
|
"Attempting to parse ticket with non-standard certificate authority {:08X}.",
|
|
|
|
|
issuer);
|
|
|
|
|
LOG_INFO(Crypto, "Attempting to parse ticket with non-standard certificate authority.");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Key128 rights_id = ticket.GetData().rights_id;
|
|
|
|
@ -481,16 +479,6 @@ KeyManager::KeyManager() {
|
|
|
|
|
AttemptLoadKeyFile(yuzu_keys_dir, yuzu_keys_dir, "title.keys_autogenerated", true);
|
|
|
|
|
AttemptLoadKeyFile(yuzu_keys_dir, hactool_keys_dir, "console.keys", false);
|
|
|
|
|
AttemptLoadKeyFile(yuzu_keys_dir, yuzu_keys_dir, "console.keys_autogenerated", false);
|
|
|
|
|
|
|
|
|
|
for (const auto& key : s128_keys) {
|
|
|
|
|
if (key.first.type == S128KeyType::Titlekey) {
|
|
|
|
|
u128 rights_id{key.first.field1, key.first.field2};
|
|
|
|
|
Key128 rights_id_2;
|
|
|
|
|
std::memcpy(rights_id_2.data(), rights_id.data(), rights_id_2.size());
|
|
|
|
|
const auto ticket = Ticket::SynthesizeCommon(key.second, rights_id_2);
|
|
|
|
|
common_tickets.insert_or_assign(rights_id, ticket);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool ValidCryptoRevisionString(std::string_view base, size_t begin, size_t length) {
|
|
|
|
@ -1011,6 +999,18 @@ void KeyManager::PopulateTickets() {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void KeyManager::SynthesizeTickets() {
|
|
|
|
|
for (const auto& key : s128_keys) {
|
|
|
|
|
if (key.first.type == S128KeyType::Titlekey) {
|
|
|
|
|
u128 rights_id{key.first.field1, key.first.field2};
|
|
|
|
|
Key128 rights_id_2;
|
|
|
|
|
std::memcpy(rights_id_2.data(), rights_id.data(), rights_id_2.size());
|
|
|
|
|
const auto ticket = Ticket::SynthesizeCommon(key.second, rights_id_2);
|
|
|
|
|
common_tickets.insert_or_assign(rights_id, ticket);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void KeyManager::SetKeyWrapped(S128KeyType id, Key128 key, u64 field1, u64 field2) {
|
|
|
|
|
if (key == Key128{})
|
|
|
|
|
return;
|
|
|
|
|