H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HW/AES: add common key loading and selecting

Browse Source
This commit is contained in:
Weiyi Wang 2018-09-04 12:27:48 -04:00
parent d1a576eb14
commit b70e2bce58
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/core/hw/aes/key.cpp
View File

@ -25,26 +25,26 @@ struct KeySlot {
boost::optional<AESKey> y; boost::optional<AESKey> y;
boost::optional<AESKey> normal; boost::optional<AESKey> normal;
void SetKeyX(const AESKey& key) { void SetKeyX(boost::optional<AESKey> key) {
x = key; x = key;
if (y && generator_constant) { GenerateNormalKey();
GenerateNormalKey();
}
} }
void SetKeyY(const AESKey& key) { void SetKeyY(boost::optional<AESKey> key) {
y = key; y = key;
if (x && generator_constant) { GenerateNormalKey();
GenerateNormalKey();
}
} }
void SetNormalKey(const AESKey& key) { void SetNormalKey(boost::optional<AESKey> key) {
normal = key; normal = key;
} }
void GenerateNormalKey() { void GenerateNormalKey() {
normal = Lrot128(Add128(Xor128(Lrot128(*x, 2), *y), *generator_constant), 87); if (x && y && generator_constant) {
normal = Lrot128(Add128(Xor128(Lrot128(*x, 2), *y), *generator_constant), 87);
} else {
normal = boost::none;
}
} }
void Clear() { void Clear() {
@ -55,6 +55,7 @@ struct KeySlot {
}; };
std::array<KeySlot, KeySlotID::MaxKeySlotID> key_slots; std::array<KeySlot, KeySlotID::MaxKeySlotID> key_slots;
std::array<boost::optional<AESKey>, 6> common_key_y_slots;
AESKey HexToKey(const std::string& hex) { AESKey HexToKey(const std::string& hex) {
if (hex.size() < 32) { if (hex.size() < 32) {
@ -102,6 +103,16 @@ void LoadPresetKeys() {
continue; continue;
} }
std::size_t common_key_index;
if (std::sscanf(name.c_str(), "common%zd", &common_key_index) == 1) {
if (common_key_index >= common_key_y_slots.size()) {
LOG_ERROR(HW_AES, "Invalid common key index {}", common_key_index);
} else {
common_key_y_slots[common_key_index] = key;
}
continue;
}
std::size_t slot_id; std::size_t slot_id;
char key_type; char key_type;
if (std::sscanf(name.c_str(), "slot0x%zXKey%c", &slot_id, &key_type) != 2) { if (std::sscanf(name.c_str(), "slot0x%zXKey%c", &slot_id, &key_type) != 2) {
@ -165,5 +176,9 @@ AESKey GetNormalKey(std::size_t slot_id) {
return key_slots.at(slot_id).normal.value_or(AESKey{}); return key_slots.at(slot_id).normal.value_or(AESKey{});
} }
void SelectCommonKeyIndex(u8 index) {
key_slots[KeySlotID::TicketCommonKey].SetKeyY(common_key_y_slots.at(index));
}
} // namespace AES } // namespace AES
} // namespace HW } // namespace HW

5
src/core/hw/aes/key.h
View File

@ -28,6 +28,9 @@ enum KeySlotID : std::size_t {
// AES keyslot used for APT:Wrap/Unwrap functions // AES keyslot used for APT:Wrap/Unwrap functions
APTWrap = 0x31, APTWrap = 0x31,
// AES keyslot used for decrypting ticket title key
TicketCommonKey = 0x3D,
MaxKeySlotID = 0x40, MaxKeySlotID = 0x40,
}; };
@ -45,5 +48,7 @@ void SetNormalKey(std::size_t slot_id, const AESKey& key);
bool IsNormalKeyAvailable(std::size_t slot_id); bool IsNormalKeyAvailable(std::size_t slot_id);
AESKey GetNormalKey(std::size_t slot_id); AESKey GetNormalKey(std::size_t slot_id);
void SelectCommonKeyIndex(u8 index);
} // namespace AES } // namespace AES
} // namespace HW } // namespace HW