piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12149 from noahpistilli/no-response-header-rsa

Browse Source 
IOS/KD: Check if a file has an RSA signature
This commit is contained in:
Admiral H. Curtiss 2023-09-03 03:50:18 +02:00 committed by GitHub
commit f063fb31b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/IOS/Network/KD/NWC24DL.cpp
View File

@ -120,6 +120,11 @@ bool NWC24Dl::IsEncrypted(u16 entry_index) const
return !!Common::ExtractBit(Common::swap32(m_data.entries[entry_index].flags), 3); return !!Common::ExtractBit(Common::swap32(m_data.entries[entry_index].flags), 3);
} }
bool NWC24Dl::IsRSASigned(u16 entry_index) const
{
return !Common::ExtractBit(Common::swap32(m_data.entries[entry_index].flags), 2);
}
u32 NWC24Dl::Magic() const u32 NWC24Dl::Magic() const
{ {
return Common::swap32(m_data.header.magic); return Common::swap32(m_data.header.magic);

1
Source/Core/Core/IOS/Network/KD/NWC24DL.h
View File

@ -29,6 +29,7 @@ public:
bool DoesEntryExist(u16 entry_index); bool DoesEntryExist(u16 entry_index);
bool IsEncrypted(u16 entry_index) const; bool IsEncrypted(u16 entry_index) const;
bool IsRSASigned(u16 entry_index) const;
std::string GetVFFContentName(u16 entry_index, std::optional<u8> subtask_id) const; std::string GetVFFContentName(u16 entry_index, std::optional<u8> subtask_id) const;
std::string GetDownloadURL(u16 entry_index, std::optional<u8> subtask_id) const; std::string GetDownloadURL(u16 entry_index, std::optional<u8> subtask_id) const;
std::string GetVFFPath(u16 entry_index) const; std::string GetVFFPath(u16 entry_index) const;

58
Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp
View File

@ -255,32 +255,48 @@ NWC24::ErrorCode NetKDRequestDevice::KDDownload(const u16 entry_index,
return NWC24::WC24_ERR_SERVER; return NWC24::WC24_ERR_SERVER;
} }
// Check if the filesize is smaller than the header size. if (!m_dl_list.IsRSASigned(entry_index))
if (response->size() < sizeof(NWC24::WC24File))
{ {
ERROR_LOG_FMT(IOS_WC24, "File at {} is too small to be a valid file.", url); // Data that is not signed with an RSA key will not have the WC24 header or 320 bytes before the
LogError(ErrorType::KD_Download, NWC24::WC24_ERR_BROKEN); // actual data. We just have to make sure that the response is not empty.
return NWC24::WC24_ERR_BROKEN; if (response->empty())
} {
ERROR_LOG_FMT(IOS_WC24, "File at {} is empty.", url);
LogError(ErrorType::KD_Download, NWC24::WC24_ERR_BROKEN);
return NWC24::WC24_ERR_BROKEN;
}
// Now we read the file file_data = *response;
NWC24::WC24File wc24File;
std::memcpy(&wc24File, response->data(), sizeof(NWC24::WC24File));
std::vector<u8> temp_buffer(response->begin() + 320, response->end());
if (m_dl_list.IsEncrypted(entry_index))
{
NWC24::WC24PubkMod pubkMod = m_dl_list.GetWC24PubkMod(entry_index);
file_data = std::vector<u8>(response->size() - 320);
Common::AES::CryptOFB(pubkMod.aes_key, wc24File.iv, wc24File.iv, temp_buffer.data(),
file_data.data(), temp_buffer.size());
} }
else else
{ {
file_data = std::move(temp_buffer); // Check if the filesize is smaller than the header size.
if (response->size() < sizeof(NWC24::WC24File))
{
ERROR_LOG_FMT(IOS_WC24, "File at {} is too small to be a valid file.", url);
LogError(ErrorType::KD_Download, NWC24::WC24_ERR_BROKEN);
return NWC24::WC24_ERR_BROKEN;
}
// Now we read the file
NWC24::WC24File wc24_file;
std::memcpy(&wc24_file, response->data(), sizeof(NWC24::WC24File));
std::vector<u8> temp_buffer(response->begin() + 320, response->end());
if (m_dl_list.IsEncrypted(entry_index))
{
NWC24::WC24PubkMod pubk_mod = m_dl_list.GetWC24PubkMod(entry_index);
file_data = std::vector<u8>(response->size() - 320);
Common::AES::CryptOFB(pubk_mod.aes_key, wc24_file.iv, wc24_file.iv, temp_buffer.data(),
file_data.data(), temp_buffer.size());
}
else
{
file_data = std::move(temp_buffer);
}
} }
NWC24::ErrorCode reply = IOS::HLE::NWC24::OpenVFF(m_dl_list.GetVFFPath(entry_index), content_name, NWC24::ErrorCode reply = IOS::HLE::NWC24::OpenVFF(m_dl_list.GetVFFPath(entry_index), content_name,