IOSC additions and fixes #5598

leoetlino · 2017-06-12T08:22:59Z

A set of additions and fixes to IOSC that will be used in a follow-up PR. Split from a branch to make reviewing easier.

Add structures for certificates and signatures.
Clearer handle checks.
Add support for the root key handle.
Implement VerifyPublicKeySign and ImportCertificate.
Fix ImportPublicKey to work with RSA public keys.

Source/Core/Core/IOS/IOSC.cpp

+  }
+  case SUBTYPE_ECC233:
+    ERROR_LOG(IOS, "VerifyPublicKeySign: SUBTYPE_ECC233 is unimplemented");
+  // Fallthrough intended.


Source/Core/Core/IOS/IOSC.cpp

+
+    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 = (mbedtls_mpi_bitlen(&rsa.N) + 7) >> 3;


Source/Core/Core/IOS/IOSC.h

@@ -171,8 +171,9 @@ class IOSC final
  // 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.
-  ReturnCode ImportPublicKey(Handle dest_handle, const u8* public_key, u32 pid);
+  // Import a public key. public_key_exponent should be passed for RSA keys.


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

-      reinterpret_cast<const char*>(m_bytes.data() + offsetof(Ticket, signature_issuer));
-  return std::string(bytes, strnlen(bytes, sizeof(Ticket::signature_issuer)));
+      reinterpret_cast<const char*>(m_bytes.data() + offsetof(Ticket, signature.issuer));
+  return std::string(bytes, strnlen(bytes, sizeof(Ticket::signature.issuer)));


Source/Core/Core/IOS/IOSC.h

+  SignatureRSA4096 signature;
+  CertHeader header;
+  // 0x100, not 0x200 bytes.
+  u8 public_key[0x100];


Source/Core/Core/IOS/IOSC.h

+  SignatureType type;
+  u8 sig[0x200];
+  u8 fill[60];
+  char issuer[0x40];


Makes it slightly less likely to forget a check and end up doing an out-of-bounds access. Also makes it obvious that we *are* indeed checking whether the handle is valid, instead of hiding it in HasOwnership (which won't handle the root key handle case properly).

Will be used to store the exponent for RSA keys.

It contains a RSA4096 public key used to validate all other Nintendo certificates.

Partial implementation which doesn't support ECC stuff, but good enough for our purposes.

Source/Core/Core/IOS/IOSC.h

+};
+static_assert(sizeof(CertRSA2048) == 0x300, "Wrong size for CertRSA2048");
+
+union Cert


Source/Core/Core/IOS/IOSC.cpp

@@ -22,6 +26,23 @@ namespace IOS
 {
 namespace HLE
 {
+const std::map<std::pair<IOSC::ObjectType, IOSC::ObjectSubType>, size_t> s_type_to_size_map = {{


Avoids duplicating sizes everywhere.

Same as VerifyPublicKeySign, we currently only support RSA keys (which is all we need right now).

BhaaLseN reviewed Jun 12, 2017

View reviewed changes

leoetlino added 5 commits June 12, 2017 18:24

IOSC: Add structures for certificates and signatures

acf150d

IOSC: Add storage for key misc data

8859bc9

Will be used to store the exponent for RSA keys.

IOSC: Add entry for the root key handle

a0392db

It contains a RSA4096 public key used to validate all other Nintendo certificates.

IOSC: Implement VerifyPublicKeySign

965773b

Partial implementation which doesn't support ECC stuff, but good enough for our purposes.

leoetlino force-pushed the iosc-fixes branch from 31d6773 to e1b0ec7 Compare June 12, 2017 16:30

BhaaLseN approved these changes Jun 12, 2017

View reviewed changes

lioncash reviewed Jun 12, 2017

View reviewed changes

leoetlino added 3 commits June 12, 2017 20:33

IOSC: Implement GetSizeForType

2eccd45

Avoids duplicating sizes everywhere.

IOSC: Fix ImportPublicKey to work with other public key types

1a8144c

IOSC: Implement ImportCertificate

4a35372

Same as VerifyPublicKeySign, we currently only support RSA keys (which is all we need right now).

leoetlino force-pushed the iosc-fixes branch from e1b0ec7 to 4a35372 Compare June 12, 2017 18:33

leoetlino merged commit 9b8feb8 into dolphin-emu:master Jun 12, 2017

leoetlino deleted the iosc-fixes branch June 12, 2017 19:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

IOSC additions and fixes #5598

IOSC additions and fixes #5598

leoetlino commented Jun 12, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

IOSC additions and fixes #5598

IOSC additions and fixes #5598

Conversation

leoetlino commented Jun 12, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.