Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

key_manager: Add structure for Ticket parsing

Browse source
This commit is contained in:
Zach Hilman 2019-04-16 09:12:04 -04:00
parent b294b13584
commit f8718ae779
3 changed files with 194 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/core/hle/service/es/es.cpp
View file

@ -75,15 +75,15 @@ private:
const auto ticket = ctx.ReadBuffer();
const auto cert = ctx.ReadBuffer(1);
if (ticket.size() < sizeof(Core::Crypto::TicketRaw)) {
if (ticket.size() < sizeof(Core::Crypto::Ticket)) {
LOG_ERROR(Service_ETicket, "The input buffer is not large enough!");
IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ERROR_INVALID_ARGUMENT);
return;
}
Core::Crypto::TicketRaw raw;
std::memcpy(raw.data(), ticket.data(), sizeof(Core::Crypto::TicketRaw));
Core::Crypto::Ticket raw{};
std::memcpy(&raw, ticket.data(), sizeof(Core::Crypto::Ticket));
if (!keys.AddTicketPersonalized(raw)) {
LOG_ERROR(Service_ETicket, "The ticket could not be imported!");
@ -203,7 +203,7 @@ private:
IPC::ResponseBuilder rb{ctx, 4};
rb.Push(RESULT_SUCCESS);
rb.Push<u64>(ticket.size());
rb.Push<u64>(ticket.GetSize());
}
void GetPersonalizedTicketSize(Kernel::HLERequestContext& ctx) {
@ -219,7 +219,7 @@ private:
IPC::ResponseBuilder rb{ctx, 4};
rb.Push(RESULT_SUCCESS);
rb.Push<u64>(ticket.size());
rb.Push<u64>(ticket.GetSize());
}
void GetCommonTicketData(Kernel::HLERequestContext& ctx) {
@ -233,8 +233,8 @@ private:
const auto ticket = keys.GetCommonTickets().at(rights_id);
const auto write_size = std::min(ticket.size(), ctx.GetWriteBufferSize());
ctx.WriteBuffer(ticket.data(), write_size);
const auto write_size = std::min(ticket.GetSize(), ctx.GetWriteBufferSize());
ctx.WriteBuffer(&ticket, write_size);
IPC::ResponseBuilder rb{ctx, 4};
rb.Push(RESULT_SUCCESS);
@ -252,8 +252,8 @@ private:
const auto ticket = keys.GetPersonalizedTickets().at(rights_id);
const auto write_size = std::min(ticket.size(), ctx.GetWriteBufferSize());
ctx.WriteBuffer(ticket.data(), write_size);
const auto write_size = std::min(ticket.GetSize(), ctx.GetWriteBufferSize());
ctx.WriteBuffer(&ticket, write_size);
IPC::ResponseBuilder rb{ctx, 4};
rb.Push(RESULT_SUCCESS);