mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-13 15:41:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IOSC: Fix ImportPublicKey to work with other public key types

Browse Source
This commit is contained in:
Léo Lam 2017-06-10 17:51:37 +02:00
parent 2eccd45f01
commit 1a8144c702
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/IOS/ES/Formats.cpp
View File

@ -375,7 +375,7 @@ s32 TicketReader::Unpersonalise()
return ret; return ret;
const auto public_key_iter = ticket_begin + offsetof(Ticket, server_public_key); 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) if (ret != IPC_SUCCESS)
return ret; return ret;

19
Source/Core/Core/IOS/IOSC.cpp
View File

@ -101,8 +101,8 @@ 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); 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)) if (!HasOwnership(dest_handle, pid) || IsDefaultHandle(dest_handle))
return IOSC_EACCES; return IOSC_EACCES;
@ -111,11 +111,20 @@ ReturnCode IOSC::ImportPublicKey(Handle dest_handle, const u8* public_key, u32 p
if (!dest_entry) if (!dest_entry)
return IOSC_EINVAL; return IOSC_EINVAL;
// TODO: allow other public key subtypes if (dest_entry->type != TYPE_PUBLIC_KEY)
if (dest_entry->type != TYPE_PUBLIC_KEY || dest_entry->subtype != SUBTYPE_ECC233)
return IOSC_INVALID_OBJTYPE; 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; return IPC_SUCCESS;
} }

5
Source/Core/Core/IOS/IOSC.h
View File

@ -172,8 +172,9 @@ public:
// Import a secret, encrypted key into dest_handle, which will be decrypted using decrypt_handle. // 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, ReturnCode ImportSecretKey(Handle dest_handle, Handle decrypt_handle, u8* iv,
const u8* encrypted_key, u32 pid); 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. // Compute an AES key from an ECDH shared secret.
ReturnCode ComputeSharedKey(Handle dest_handle, Handle private_handle, Handle public_handle, ReturnCode ComputeSharedKey(Handle dest_handle, Handle private_handle, Handle public_handle,
u32 pid); u32 pid);