Merge pull request #5598 from leoetlino/iosc-fixes

IOSC additions and fixes

Source/Core/Core/IOS/ES/Formats.cpp

@@ -307,8 +307,8 @@ std::vector<u8> TicketReader::GetRawTicketView(u32 ticket_num) const
 std::string TicketReader::GetIssuer() const
 {
   const char* bytes =
-      reinterpret_cast<const char*>(m_bytes.data() + offsetof(Ticket, signature_issuer));
+      reinterpret_cast<const char*>(m_bytes.data() + offsetof(Ticket, signature.issuer));
-  return std::string(bytes, strnlen(bytes, sizeof(Ticket::signature_issuer)));
+  return std::string(bytes, strnlen(bytes, sizeof(Ticket::signature.issuer)));
 }
 
 u32 TicketReader::GetDeviceId() const
@@ -375,7 +375,7 @@ s32 TicketReader::Unpersonalise()
     return ret;
 
   const auto public_key_iter = ticket_begin + offsetof(Ticket, server_public_key);
-  ret = iosc.ImportPublicKey(public_handle, &*public_key_iter, PID_ES);
+  ret = iosc.ImportPublicKey(public_handle, &*public_key_iter, nullptr, PID_ES);
   if (ret != IPC_SUCCESS)
     return ret;
 

Source/Core/Core/IOS/ES/Formats.h

@@ -16,6 +16,7 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/NandPaths.h"
+#include "Core/IOS/IOSC.h"
 #include "DiscIO/Enums.h"
 
 class PointerWrap;
@@ -56,10 +57,7 @@ enum TitleFlags : u32
 #pragma pack(push, 4)
 struct TMDHeader
 {
-  u32 signature_type;
+  SignatureRSA2048 signature;
-  u8 rsa_2048_signature[256];
-  u8 fill[60];
-  u8 issuer[64];
   u8 tmd_version;
   u8 ca_crl_version;
   u8 signer_crl_version;
@@ -120,10 +118,7 @@ static_assert(sizeof(TicketView) == 0xd8, "TicketView has the wrong size");
 // the only ticket type that is supported by the Wii's IOS.
 struct Ticket
 {
-  u32 signature_type;
+  SignatureRSA2048 signature;
-  u8 signature[256];
-  u8 unused[60];
-  u8 signature_issuer[0x40];
   u8 server_public_key[0x3c];
   u8 version;
   u8 ca_crl_version;

Source/Core/Core/IOS/IOSC.cpp

@@ -6,14 +6,20 @@
 #include <array>
 #include <cstddef>
 #include <cstring>
+#include <map>
+#include <utility>
 #include <vector>
 
+#include <mbedtls/md.h>
+#include <mbedtls/rsa.h>
 #include <mbedtls/sha1.h>
 
 #include "Common/Assert.h"
 #include "Common/ChunkFile.h"
 #include "Common/Crypto/AES.h"
 #include "Common/Crypto/ec.h"
+#include "Common/ScopeGuard.h"
+#include "Common/Swap.h"
 #include "Core/IOS/Device.h"
 #include "Core/IOS/IOSC.h"
 #include "Core/ec_wii.h"
@@ -22,6 +28,23 @@ namespace IOS
 {
 namespace HLE
 {
+const std::map<std::pair<IOSC::ObjectType, IOSC::ObjectSubType>, size_t> s_type_to_size_map = {{
+    {{IOSC::TYPE_SECRET_KEY, IOSC::SUBTYPE_AES128}, 16},
+    {{IOSC::TYPE_SECRET_KEY, IOSC::SUBTYPE_MAC}, 20},
+    {{IOSC::TYPE_SECRET_KEY, IOSC::SUBTYPE_ECC233}, 30},
+    {{IOSC::TYPE_PUBLIC_KEY, IOSC::SUBTYPE_RSA2048}, 256},
+    {{IOSC::TYPE_PUBLIC_KEY, IOSC::SUBTYPE_RSA4096}, 512},
+    {{IOSC::TYPE_PUBLIC_KEY, IOSC::SUBTYPE_ECC233}, 60},
+    {{IOSC::TYPE_DATA, IOSC::SUBTYPE_DATA}, 0},
+    {{IOSC::TYPE_DATA, IOSC::SUBTYPE_VERSION}, 0},
+}};
+
+static size_t GetSizeForType(IOSC::ObjectType type, IOSC::ObjectSubType subtype)
+{
+  const auto iterator = s_type_to_size_map.find({type, subtype});
+  return iterator != s_type_to_size_map.end() ? iterator->second : 0;
+}
+
 IOSC::IOSC(ConsoleType console_type)
 {
   LoadDefaultEntries(console_type);
@@ -49,8 +72,11 @@ ReturnCode IOSC::DeleteObject(Handle handle, u32 pid)
   if (IsDefaultHandle(handle) || !HasOwnership(handle, pid))
     return IOSC_EACCES;
 
-  m_key_entries[handle].in_use = false;
+  KeyEntry* entry = FindEntry(handle);
-  m_key_entries[handle].data.clear();
+  if (!entry)
+    return IOSC_EINVAL;
+  entry->in_use = false;
+  entry->data.clear();
   return IPC_SUCCESS;
 }
 
@@ -64,7 +90,10 @@ ReturnCode IOSC::ImportSecretKey(Handle dest_handle, Handle decrypt_handle, u8*
     return IOSC_EACCES;
   }
 
-  auto* dest_entry = &m_key_entries[dest_handle];
+  KeyEntry* dest_entry = FindEntry(dest_handle);
+  if (!dest_entry)
+    return IOSC_EINVAL;
+
   // TODO: allow other secret key subtypes
   if (dest_entry->type != TYPE_SECRET_KEY || dest_entry->subtype != SUBTYPE_AES128)
     return IOSC_INVALID_OBJTYPE;
@@ -73,18 +102,30 @@ ReturnCode IOSC::ImportSecretKey(Handle dest_handle, Handle decrypt_handle, u8*
   return Decrypt(decrypt_handle, iv, encrypted_key, AES128_KEY_SIZE, dest_entry->data.data(), pid);
 }
 
-constexpr size_t ECC233_PUBLIC_KEY_SIZE = 0x3c;
+ReturnCode IOSC::ImportPublicKey(Handle dest_handle, const u8* public_key,
-ReturnCode IOSC::ImportPublicKey(Handle dest_handle, const u8* public_key, u32 pid)
+                                 const u8* public_key_exponent, u32 pid)
 {
   if (!HasOwnership(dest_handle, pid) || IsDefaultHandle(dest_handle))
     return IOSC_EACCES;
 
-  auto* dest_entry = &m_key_entries[dest_handle];
+  KeyEntry* dest_entry = FindEntry(dest_handle);
-  // TODO: allow other public key subtypes
+  if (!dest_entry)
-  if (dest_entry->type != TYPE_PUBLIC_KEY || dest_entry->subtype != SUBTYPE_ECC233)
+    return IOSC_EINVAL;
+
+  if (dest_entry->type != TYPE_PUBLIC_KEY)
     return IOSC_INVALID_OBJTYPE;
 
-  dest_entry->data.assign(public_key, public_key + ECC233_PUBLIC_KEY_SIZE);
+  const size_t size = GetSizeForType(dest_entry->type, dest_entry->subtype);
+  if (size == 0)
+    return IOSC_INVALID_OBJTYPE;
+
+  dest_entry->data.assign(public_key, public_key + size);
+
+  if (dest_entry->subtype == SUBTYPE_RSA2048 || dest_entry->subtype == SUBTYPE_RSA4096)
+  {
+    _assert_(public_key_exponent);
+    std::copy_n(public_key_exponent, 4, dest_entry->misc_data.begin());
+  }
   return IPC_SUCCESS;
 }
 
@@ -97,9 +138,11 @@ ReturnCode IOSC::ComputeSharedKey(Handle dest_handle, Handle private_handle, Han
     return IOSC_EACCES;
   }
 
-  auto* dest_entry = &m_key_entries[dest_handle];
+  KeyEntry* dest_entry = FindEntry(dest_handle);
-  const auto* private_entry = &m_key_entries[private_handle];
+  const KeyEntry* private_entry = FindEntry(private_handle);
-  const auto* public_entry = &m_key_entries[public_handle];
+  const KeyEntry* public_entry = FindEntry(public_handle);
+  if (!dest_entry || !private_entry || !public_entry)
+    return IOSC_EINVAL;
   if (dest_entry->type != TYPE_SECRET_KEY || dest_entry->subtype != SUBTYPE_AES128 ||
       private_entry->type != TYPE_SECRET_KEY || private_entry->subtype != SUBTYPE_ECC233 ||
       public_entry->type != TYPE_PUBLIC_KEY || public_entry->subtype != SUBTYPE_ECC233)
@@ -125,7 +168,9 @@ ReturnCode IOSC::DecryptEncrypt(Common::AES::Mode mode, Handle key_handle, u8* i
   if (!HasOwnership(key_handle, pid))
     return IOSC_EACCES;
 
-  const auto* entry = &m_key_entries[key_handle];
+  const KeyEntry* entry = FindEntry(key_handle);
+  if (!entry)
+    return IOSC_EINVAL;
   if (entry->type != TYPE_SECRET_KEY || entry->subtype != SUBTYPE_AES128)
     return IOSC_INVALID_OBJTYPE;
 
@@ -151,11 +196,137 @@ ReturnCode IOSC::Decrypt(Handle key_handle, u8* iv, const u8* input, size_t size
   return DecryptEncrypt(Common::AES::Mode::Decrypt, key_handle, iv, input, size, output, pid);
 }
 
+ReturnCode IOSC::VerifyPublicKeySign(const std::array<u8, 20>& sha1, Handle signer_handle,
+                                     const u8* signature, u32 pid) const
+{
+  if (!HasOwnership(signer_handle, pid))
+    return IOSC_EACCES;
+
+  const KeyEntry* entry = FindEntry(signer_handle, SearchMode::IncludeRootKey);
+  if (!entry)
+    return IOSC_EINVAL;
+
+  // TODO: add support for keypair entries.
+  if (entry->type != TYPE_PUBLIC_KEY)
+    return IOSC_INVALID_OBJTYPE;
+
+  switch (entry->subtype)
+  {
+  case SUBTYPE_RSA2048:
+  case SUBTYPE_RSA4096:
+  {
+    const size_t expected_key_size = entry->subtype == SUBTYPE_RSA2048 ? 0x100 : 0x200;
+    _assert_(entry->data.size() == expected_key_size);
+
+    mbedtls_rsa_context rsa;
+    mbedtls_rsa_init(&rsa, MBEDTLS_RSA_PKCS_V15, 0);
+    Common::ScopeGuard context_guard{[&rsa] { mbedtls_rsa_free(&rsa); }};
+
+    mbedtls_mpi_read_binary(&rsa.N, entry->data.data(), entry->data.size());
+    mbedtls_mpi_read_binary(&rsa.E, entry->misc_data.data(), entry->misc_data.size());
+    rsa.len = entry->data.size();
+
+    const int ret = mbedtls_rsa_pkcs1_verify(&rsa, nullptr, nullptr, MBEDTLS_RSA_PUBLIC,
+                                             MBEDTLS_MD_SHA1, 0, sha1.data(), signature);
+    if (ret != 0)
+    {
+      WARN_LOG(IOS, "VerifyPublicKeySign: RSA verification failed (error %d)", ret);
+      return IOSC_FAIL_CHECKVALUE;
+    }
+
+    return IPC_SUCCESS;
+  }
+  case SUBTYPE_ECC233:
+    ERROR_LOG(IOS, "VerifyPublicKeySign: SUBTYPE_ECC233 is unimplemented");
+  // [[fallthrough]]
+  default:
+    return IOSC_INVALID_OBJTYPE;
+  }
+}
+
+struct ImportCertParameters
+{
+  size_t offset;
+  size_t size;
+  size_t signature_offset;
+  size_t public_key_offset;
+  size_t public_key_exponent_offset;
+};
+
+static ReturnCode GetImportCertParameters(const u8* cert, ImportCertParameters* parameters)
+{
+  // TODO: Add support for ECC signature type.
+  const u32 signature_type = Common::swap32(cert + offsetof(Cert, type));
+  switch (static_cast<SignatureType>(signature_type))
+  {
+  case SignatureType::RSA2048:
+  {
+    const u32 key_type = Common::swap32(cert + offsetof(Cert, rsa2048.header.public_key_type));
+
+    // TODO: Add support for ECC public key type.
+    if (static_cast<PublicKeyType>(key_type) != PublicKeyType::RSA2048)
+      return IOSC_INVALID_FORMAT;
+
+    parameters->offset = offsetof(Cert, rsa2048.signature.issuer);
+    parameters->size = sizeof(Cert::rsa2048) - parameters->offset;
+    parameters->signature_offset = offsetof(Cert, rsa2048.signature.sig);
+    parameters->public_key_offset = offsetof(Cert, rsa2048.public_key);
+    parameters->public_key_exponent_offset = offsetof(Cert, rsa2048.exponent);
+    return IPC_SUCCESS;
+  }
+  case SignatureType::RSA4096:
+  {
+    parameters->offset = offsetof(Cert, rsa4096.signature.issuer);
+    parameters->size = sizeof(Cert::rsa4096) - parameters->offset;
+    parameters->signature_offset = offsetof(Cert, rsa4096.signature.sig);
+    parameters->public_key_offset = offsetof(Cert, rsa4096.public_key);
+    parameters->public_key_exponent_offset = offsetof(Cert, rsa4096.exponent);
+    return IPC_SUCCESS;
+  }
+  default:
+    WARN_LOG(IOS, "Unknown signature type: %08x", signature_type);
+    return IOSC_INVALID_FORMAT;
+  }
+}
+
+ReturnCode IOSC::ImportCertificate(const u8* cert, Handle signer_handle, Handle dest_handle,
+                                   u32 pid)
+{
+  if (!HasOwnership(signer_handle, pid) || !HasOwnership(dest_handle, pid))
+    return IOSC_EACCES;
+
+  const KeyEntry* signer_entry = FindEntry(signer_handle, SearchMode::IncludeRootKey);
+  const KeyEntry* dest_entry = FindEntry(dest_handle, SearchMode::IncludeRootKey);
+  if (!signer_entry || !dest_entry)
+    return IOSC_EINVAL;
+
+  if (signer_entry->type != TYPE_PUBLIC_KEY || dest_entry->type != TYPE_PUBLIC_KEY)
+    return IOSC_INVALID_OBJTYPE;
+
+  ImportCertParameters parameters;
+  const ReturnCode ret = GetImportCertParameters(cert, &parameters);
+  if (ret != IPC_SUCCESS)
+    return ret;
+
+  std::array<u8, 20> sha1;
+  mbedtls_sha1(cert + parameters.offset, parameters.size, sha1.data());
+
+  if (VerifyPublicKeySign(sha1, signer_handle, cert + parameters.signature_offset, pid) !=
+      IPC_SUCCESS)
+  {
+    return IOSC_FAIL_CHECKVALUE;
+  }
+
+  return ImportPublicKey(dest_handle, cert + parameters.public_key_offset,
+                         cert + parameters.public_key_exponent_offset, pid);
+}
+
 ReturnCode IOSC::GetOwnership(Handle handle, u32* owner) const
 {
-  if (handle < m_key_entries.size() && m_key_entries[handle].in_use)
+  const KeyEntry* entry = FindEntry(handle);
+  if (entry && entry->in_use)
   {
-    *owner = m_key_entries[handle].owner_mask;
+    *owner = entry->owner_mask;
     return IPC_SUCCESS;
   }
   return IOSC_EINVAL;
@@ -166,14 +337,55 @@ ReturnCode IOSC::SetOwnership(Handle handle, u32 new_owner, u32 pid)
   if (!HasOwnership(handle, pid))
     return IOSC_EACCES;
 
+  KeyEntry* entry = FindEntry(handle);
+  if (!entry)
+    return IOSC_EINVAL;
+
   const u32 mask_with_current_pid = 1 << pid;
-  const u32 mask = m_key_entries[handle].owner_mask | mask_with_current_pid;
+  const u32 mask = entry->owner_mask | mask_with_current_pid;
   if (mask != mask_with_current_pid)
     return IOSC_EACCES;
-  m_key_entries[handle].owner_mask = (new_owner & ~7) | mask;
+  entry->owner_mask = (new_owner & ~7) | mask;
   return IPC_SUCCESS;
 }
 
+constexpr std::array<u8, 512> ROOT_PUBLIC_KEY = {
+    {0xF8, 0x24, 0x6C, 0x58, 0xBA, 0xE7, 0x50, 0x03, 0x01, 0xFB, 0xB7, 0xC2, 0xEB, 0xE0, 0x01,
+     0x05, 0x71, 0xDA, 0x92, 0x23, 0x78, 0xF0, 0x51, 0x4E, 0xC0, 0x03, 0x1D, 0xD0, 0xD2, 0x1E,
+     0xD3, 0xD0, 0x7E, 0xFC, 0x85, 0x20, 0x69, 0xB5, 0xDE, 0x9B, 0xB9, 0x51, 0xA8, 0xBC, 0x90,
+     0xA2, 0x44, 0x92, 0x6D, 0x37, 0x92, 0x95, 0xAE, 0x94, 0x36, 0xAA, 0xA6, 0xA3, 0x02, 0x51,
+     0x0C, 0x7B, 0x1D, 0xED, 0xD5, 0xFB, 0x20, 0x86, 0x9D, 0x7F, 0x30, 0x16, 0xF6, 0xBE, 0x65,
+     0xD3, 0x83, 0xA1, 0x6D, 0xB3, 0x32, 0x1B, 0x95, 0x35, 0x18, 0x90, 0xB1, 0x70, 0x02, 0x93,
+     0x7E, 0xE1, 0x93, 0xF5, 0x7E, 0x99, 0xA2, 0x47, 0x4E, 0x9D, 0x38, 0x24, 0xC7, 0xAE, 0xE3,
+     0x85, 0x41, 0xF5, 0x67, 0xE7, 0x51, 0x8C, 0x7A, 0x0E, 0x38, 0xE7, 0xEB, 0xAF, 0x41, 0x19,
+     0x1B, 0xCF, 0xF1, 0x7B, 0x42, 0xA6, 0xB4, 0xED, 0xE6, 0xCE, 0x8D, 0xE7, 0x31, 0x8F, 0x7F,
+     0x52, 0x04, 0xB3, 0x99, 0x0E, 0x22, 0x67, 0x45, 0xAF, 0xD4, 0x85, 0xB2, 0x44, 0x93, 0x00,
+     0x8B, 0x08, 0xC7, 0xF6, 0xB7, 0xE5, 0x6B, 0x02, 0xB3, 0xE8, 0xFE, 0x0C, 0x9D, 0x85, 0x9C,
+     0xB8, 0xB6, 0x82, 0x23, 0xB8, 0xAB, 0x27, 0xEE, 0x5F, 0x65, 0x38, 0x07, 0x8B, 0x2D, 0xB9,
+     0x1E, 0x2A, 0x15, 0x3E, 0x85, 0x81, 0x80, 0x72, 0xA2, 0x3B, 0x6D, 0xD9, 0x32, 0x81, 0x05,
+     0x4F, 0x6F, 0xB0, 0xF6, 0xF5, 0xAD, 0x28, 0x3E, 0xCA, 0x0B, 0x7A, 0xF3, 0x54, 0x55, 0xE0,
+     0x3D, 0xA7, 0xB6, 0x83, 0x26, 0xF3, 0xEC, 0x83, 0x4A, 0xF3, 0x14, 0x04, 0x8A, 0xC6, 0xDF,
+     0x20, 0xD2, 0x85, 0x08, 0x67, 0x3C, 0xAB, 0x62, 0xA2, 0xC7, 0xBC, 0x13, 0x1A, 0x53, 0x3E,
+     0x0B, 0x66, 0x80, 0x6B, 0x1C, 0x30, 0x66, 0x4B, 0x37, 0x23, 0x31, 0xBD, 0xC4, 0xB0, 0xCA,
+     0xD8, 0xD1, 0x1E, 0xE7, 0xBB, 0xD9, 0x28, 0x55, 0x48, 0xAA, 0xEC, 0x1F, 0x66, 0xE8, 0x21,
+     0xB3, 0xC8, 0xA0, 0x47, 0x69, 0x00, 0xC5, 0xE6, 0x88, 0xE8, 0x0C, 0xCE, 0x3C, 0x61, 0xD6,
+     0x9C, 0xBB, 0xA1, 0x37, 0xC6, 0x60, 0x4F, 0x7A, 0x72, 0xDD, 0x8C, 0x7B, 0x3E, 0x3D, 0x51,
+     0x29, 0x0D, 0xAA, 0x6A, 0x59, 0x7B, 0x08, 0x1F, 0x9D, 0x36, 0x33, 0xA3, 0x46, 0x7A, 0x35,
+     0x61, 0x09, 0xAC, 0xA7, 0xDD, 0x7D, 0x2E, 0x2F, 0xB2, 0xC1, 0xAE, 0xB8, 0xE2, 0x0F, 0x48,
+     0x92, 0xD8, 0xB9, 0xF8, 0xB4, 0x6F, 0x4E, 0x3C, 0x11, 0xF4, 0xF4, 0x7D, 0x8B, 0x75, 0x7D,
+     0xFE, 0xFE, 0xA3, 0x89, 0x9C, 0x33, 0x59, 0x5C, 0x5E, 0xFD, 0xEB, 0xCB, 0xAB, 0xE8, 0x41,
+     0x3E, 0x3A, 0x9A, 0x80, 0x3C, 0x69, 0x35, 0x6E, 0xB2, 0xB2, 0xAD, 0x5C, 0xC4, 0xC8, 0x58,
+     0x45, 0x5E, 0xF5, 0xF7, 0xB3, 0x06, 0x44, 0xB4, 0x7C, 0x64, 0x06, 0x8C, 0xDF, 0x80, 0x9F,
+     0x76, 0x02, 0x5A, 0x2D, 0xB4, 0x46, 0xE0, 0x3D, 0x7C, 0xF6, 0x2F, 0x34, 0xE7, 0x02, 0x45,
+     0x7B, 0x02, 0xA4, 0xCF, 0x5D, 0x9D, 0xD5, 0x3C, 0xA5, 0x3A, 0x7C, 0xA6, 0x29, 0x78, 0x8C,
+     0x67, 0xCA, 0x08, 0xBF, 0xEC, 0xCA, 0x43, 0xA9, 0x57, 0xAD, 0x16, 0xC9, 0x4E, 0x1C, 0xD8,
+     0x75, 0xCA, 0x10, 0x7D, 0xCE, 0x7E, 0x01, 0x18, 0xF0, 0xDF, 0x6B, 0xFE, 0xE5, 0x1D, 0xDB,
+     0xD9, 0x91, 0xC2, 0x6E, 0x60, 0xCD, 0x48, 0x58, 0xAA, 0x59, 0x2C, 0x82, 0x00, 0x75, 0xF2,
+     0x9F, 0x52, 0x6C, 0x91, 0x7C, 0x6F, 0xE5, 0x40, 0x3E, 0xA7, 0xD4, 0xA5, 0x0C, 0xEC, 0x3B,
+     0x73, 0x84, 0xDE, 0x88, 0x6E, 0x82, 0xD2, 0xEB, 0x4D, 0x4E, 0x42, 0xB5, 0xF2, 0xB1, 0x49,
+     0xA8, 0x1E, 0xA7, 0xCE, 0x71, 0x44, 0xDC, 0x29, 0x94, 0xCF, 0xC4, 0x4E, 0x1F, 0x91, 0xCB,
+     0xD4, 0x95}};
+
 void IOSC::LoadDefaultEntries(ConsoleType console_type)
 {
   // TODO: add support for loading and writing to a BootMii / SEEPROM and OTP dump.
@@ -229,13 +441,25 @@ void IOSC::LoadDefaultEntries(ConsoleType console_type)
                                           {{0x63, 0xb8, 0x2b, 0xb4, 0xf4, 0x61, 0x4e, 0x2e, 0x13,
                                             0xf2, 0xfe, 0xfb, 0xba, 0x4c, 0x9b, 0x7e}},
                                           3};
+
+  std::array<u8, 4> root_exponent = {{0x0, 0x1, 0x0, 0x1}};
+  m_root_key_entry = {TYPE_PUBLIC_KEY, SUBTYPE_RSA4096,
+                      std::vector<u8>(ROOT_PUBLIC_KEY.begin(), ROOT_PUBLIC_KEY.end()),
+                      std::move(root_exponent), 0};
 }
 
 IOSC::KeyEntry::KeyEntry() = default;
 
+IOSC::KeyEntry::KeyEntry(ObjectType type_, ObjectSubType subtype_, std::vector<u8>&& data_,
+                         std::array<u8, 4>&& misc_data_, u32 owner_mask_)
+    : in_use(true), type(type_), subtype(subtype_), data(std::move(data_)),
+      misc_data(std::move(misc_data_)), owner_mask(owner_mask_)
+{
+}
+
 IOSC::KeyEntry::KeyEntry(ObjectType type_, ObjectSubType subtype_, std::vector<u8>&& data_,
                          u32 owner_mask_)
-    : in_use(true), type(type_), subtype(subtype_), data(std::move(data_)), owner_mask(owner_mask_)
+    : KeyEntry(type_, subtype_, std::move(data_), {}, owner_mask_)
 {
 }
 
@@ -245,6 +469,17 @@ IOSC::KeyEntries::iterator IOSC::FindFreeEntry()
                       [](const auto& entry) { return !entry.in_use; });
 }
 
+IOSC::KeyEntry* IOSC::FindEntry(Handle handle)
+{
+  return handle < m_key_entries.size() ? &m_key_entries[handle] : nullptr;
+}
+const IOSC::KeyEntry* IOSC::FindEntry(Handle handle, SearchMode mode) const
+{
+  if (mode == SearchMode::IncludeRootKey && handle == HANDLE_ROOT_KEY)
+    return &m_root_key_entry;
+  return handle < m_key_entries.size() ? &m_key_entries[handle] : nullptr;
+}
+
 IOSC::Handle IOSC::GetHandleFromIterator(IOSC::KeyEntries::iterator iterator) const
 {
   _assert_(iterator != m_key_entries.end());
@@ -254,13 +489,14 @@ IOSC::Handle IOSC::GetHandleFromIterator(IOSC::KeyEntries::iterator iterator) co
 bool IOSC::HasOwnership(Handle handle, u32 pid) const
 {
   u32 owner_mask;
-  return GetOwnership(handle, &owner_mask) == IPC_SUCCESS && ((1 << pid) & owner_mask) != 0;
+  return handle == HANDLE_ROOT_KEY ||
+         (GetOwnership(handle, &owner_mask) == IPC_SUCCESS && ((1 << pid) & owner_mask) != 0);
 }
 
 bool IOSC::IsDefaultHandle(Handle handle) const
 {
   constexpr Handle last_default_handle = HANDLE_NEW_COMMON_KEY;
-  return handle <= last_default_handle;
+  return handle <= last_default_handle || handle == HANDLE_ROOT_KEY;
 }
 
 void IOSC::DoState(PointerWrap& p)

Source/Core/Core/IOS/IOSC.h

@@ -17,6 +17,85 @@ class PointerWrap;
 
 namespace IOS
 {
+enum class SignatureType : u32
+{
+  RSA4096 = 0x00010000,
+  RSA2048 = 0x00010001,
+  // XXX: Add support for ECC (0x00010002).
+};
+
+enum class PublicKeyType : u32
+{
+  RSA4096 = 0,
+  RSA2048 = 1,
+};
+
+#pragma pack(push, 4)
+struct SignatureRSA4096
+{
+  SignatureType type;
+  u8 sig[0x200];
+  u8 fill[0x3c];
+  char issuer[0x40];
+};
+static_assert(sizeof(SignatureRSA4096) == 0x280, "Wrong size for SignatureRSA4096");
+
+struct SignatureRSA2048
+{
+  SignatureType type;
+  u8 sig[0x100];
+  u8 fill[0x3c];
+  char issuer[0x40];
+};
+static_assert(sizeof(SignatureRSA2048) == 0x180, "Wrong size for SignatureRSA2048");
+
+struct SignatureECC
+{
+  SignatureType type;
+  u8 sig[0x3c];
+  u8 fill[0x40];
+  char issuer[0x40];
+};
+static_assert(sizeof(SignatureECC) == 0xc0, "Wrong size for SignatureECC");
+
+// Source: https://wiibrew.org/wiki/Certificate_chain
+struct CertHeader
+{
+  PublicKeyType public_key_type;
+  char name[0x40];
+  u32 id;
+};
+
+struct CertRSA4096
+{
+  SignatureRSA4096 signature;
+  CertHeader header;
+  // The signature is RSA4096, but the key is a RSA2048 public key,
+  // so its size is 0x100, not 0x200, as one would expect from the name.
+  u8 public_key[0x100];
+  u8 exponent[0x4];
+  u8 pad[0x34];
+};
+static_assert(sizeof(CertRSA4096) == 0x400, "Wrong size for CertRSA4096");
+
+struct CertRSA2048
+{
+  SignatureRSA2048 signature;
+  CertHeader header;
+  u8 public_key[0x100];
+  u8 exponent[0x4];
+  u8 pad[0x34];
+};
+static_assert(sizeof(CertRSA2048) == 0x300, "Wrong size for CertRSA2048");
+
+union Cert
+{
+  SignatureType type;
+  CertRSA4096 rsa4096;
+  CertRSA2048 rsa2048;
+};
+#pragma pack(pop)
+
 namespace HLE
 {
 enum ReturnCode : s32;
@@ -61,6 +140,8 @@ public:
     HANDLE_FS_VERSION = 10,
     // New common key (aka Korean common key)
     HANDLE_NEW_COMMON_KEY = 11,
+
+    HANDLE_ROOT_KEY = 0xfffffff,
   };
 
   enum ObjectType : u8
@@ -74,6 +155,8 @@ public:
   {
     SUBTYPE_AES128 = 0,
     SUBTYPE_MAC = 1,
+    SUBTYPE_RSA2048 = 2,
+    SUBTYPE_RSA4096 = 3,
     SUBTYPE_ECC233 = 4,
     SUBTYPE_DATA = 5,
     SUBTYPE_VERSION = 6
@@ -89,8 +172,9 @@ public:
   // Import a secret, encrypted key into dest_handle, which will be decrypted using decrypt_handle.
   ReturnCode ImportSecretKey(Handle dest_handle, Handle decrypt_handle, u8* iv,
                              const u8* encrypted_key, u32 pid);
-  // Import a public key.
+  // Import a public key. public_key_exponent must be passed for RSA keys.
-  ReturnCode ImportPublicKey(Handle dest_handle, const u8* public_key, u32 pid);
+  ReturnCode ImportPublicKey(Handle dest_handle, const u8* public_key,
+                             const u8* public_key_exponent, u32 pid);
   // Compute an AES key from an ECDH shared secret.
   ReturnCode ComputeSharedKey(Handle dest_handle, Handle private_handle, Handle public_handle,
                               u32 pid);
@@ -101,6 +185,11 @@ public:
   ReturnCode Decrypt(Handle key_handle, u8* iv, const u8* input, size_t size, u8* output,
                      u32 pid) const;
 
+  ReturnCode VerifyPublicKeySign(const std::array<u8, 20>& sha1, Handle signer_handle,
+                                 const u8* signature, u32 pid) const;
+  // Import a certificate (signed by the certificate in signer_handle) into dest_handle.
+  ReturnCode ImportCertificate(const u8* cert, Handle signer_handle, Handle dest_handle, u32 pid);
+
   // Ownership
   ReturnCode GetOwnership(Handle handle, u32* owner) const;
   ReturnCode SetOwnership(Handle handle, u32 owner, u32 pid);
@@ -112,19 +201,32 @@ private:
   {
     KeyEntry();
     KeyEntry(ObjectType type_, ObjectSubType subtype_, std::vector<u8>&& data_, u32 owner_mask_);
+    KeyEntry(ObjectType type_, ObjectSubType subtype_, std::vector<u8>&& data_,
+             std::array<u8, 4>&& misc_data_, u32 owner_mask_);
     void DoState(PointerWrap& p);
 
     bool in_use = false;
     ObjectType type;
     ObjectSubType subtype;
     std::vector<u8> data;
+    std::array<u8, 4> misc_data{};
     u32 owner_mask = 0;
   };
   // The Wii's IOSC is limited to 32 entries, including 12 built-in entries.
   using KeyEntries = std::array<KeyEntry, 32>;
 
+  enum class SearchMode
+  {
+    IncludeRootKey,
+    ExcludeRootKey,
+  };
+
   void LoadDefaultEntries(ConsoleType console_type);
+
   KeyEntries::iterator FindFreeEntry();
+  KeyEntry* FindEntry(Handle handle);
+  const KeyEntry* FindEntry(Handle handle, SearchMode mode = SearchMode::ExcludeRootKey) const;
+
   Handle GetHandleFromIterator(KeyEntries::iterator iterator) const;
   bool HasOwnership(Handle handle, u32 pid) const;
   bool IsDefaultHandle(Handle handle) const;
@@ -132,6 +234,7 @@ private:
                             size_t size, u8* output, u32 pid) const;
 
   KeyEntries m_key_entries;
+  KeyEntry m_root_key_entry;
 };
 }  // namespace HLE
 }  // namespace IOS