ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IOS: Remove ec_wii functions

This commit is contained in:
Léo Lam 2018-02-19 17:18:20 +01:00
parent 5e5c9e1772
commit f9445bb119
11 changed files with 13 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/CMakeLists.txt
View File

@ -7,7 +7,6 @@ set(SRCS
Core.cpp Core.cpp
CoreTiming.cpp CoreTiming.cpp
DSPEmulator.cpp DSPEmulator.cpp
ec_wii.cpp
GeckoCodeConfig.cpp GeckoCodeConfig.cpp
GeckoCode.cpp GeckoCode.cpp
HotkeyManager.cpp HotkeyManager.cpp

2
Source/Core/Core/Core.vcxproj
View File

@ -92,7 +92,6 @@
<ClCompile Include="DSP\Jit\DSPJitRegCache.cpp" /> <ClCompile Include="DSP\Jit\DSPJitRegCache.cpp" />
<ClCompile Include="DSP\Jit\DSPJitUtil.cpp" /> <ClCompile Include="DSP\Jit\DSPJitUtil.cpp" />
<ClCompile Include="DSP\LabelMap.cpp" /> <ClCompile Include="DSP\LabelMap.cpp" />
<ClCompile Include="ec_wii.cpp" />
<ClCompile Include="FifoPlayer\FifoAnalyzer.cpp" /> <ClCompile Include="FifoPlayer\FifoAnalyzer.cpp" />
<ClCompile Include="FifoPlayer\FifoDataFile.cpp" /> <ClCompile Include="FifoPlayer\FifoDataFile.cpp" />
<ClCompile Include="FifoPlayer\FifoPlaybackAnalyzer.cpp" /> <ClCompile Include="FifoPlayer\FifoPlaybackAnalyzer.cpp" />
@ -343,7 +342,6 @@
<ClInclude Include="DSP\Jit\DSPEmitter.h" /> <ClInclude Include="DSP\Jit\DSPEmitter.h" />
<ClInclude Include="DSP\Jit\DSPJitRegCache.h" /> <ClInclude Include="DSP\Jit\DSPJitRegCache.h" />
<ClInclude Include="DSP\LabelMap.h" /> <ClInclude Include="DSP\LabelMap.h" />
<ClInclude Include="ec_wii.h" />
<ClInclude Include="FifoPlayer\FifoAnalyzer.h" /> <ClInclude Include="FifoPlayer\FifoAnalyzer.h" />
<ClInclude Include="FifoPlayer\FifoDataFile.h" /> <ClInclude Include="FifoPlayer\FifoDataFile.h" />
<ClInclude Include="FifoPlayer\FifoPlaybackAnalyzer.h" /> <ClInclude Include="FifoPlayer\FifoPlaybackAnalyzer.h" />

2
Source/Core/Core/Core.vcxproj.filters
View File

@ -169,7 +169,6 @@
<ClCompile Include="ConfigManager.cpp" /> <ClCompile Include="ConfigManager.cpp" />
<ClCompile Include="Core.cpp" /> <ClCompile Include="Core.cpp" />
<ClCompile Include="CoreTiming.cpp" /> <ClCompile Include="CoreTiming.cpp" />
<ClCompile Include="ec_wii.cpp" />
<ClCompile Include="HotkeyManager.cpp" /> <ClCompile Include="HotkeyManager.cpp" />
<ClCompile Include="MemTools.cpp" /> <ClCompile Include="MemTools.cpp" />
<ClCompile Include="Movie.cpp" /> <ClCompile Include="Movie.cpp" />
@ -895,7 +894,6 @@
<ClInclude Include="ConfigManager.h" /> <ClInclude Include="ConfigManager.h" />
<ClInclude Include="Core.h" /> <ClInclude Include="Core.h" />
<ClInclude Include="CoreTiming.h" /> <ClInclude Include="CoreTiming.h" />
<ClInclude Include="ec_wii.h" />
<ClInclude Include="Host.h" /> <ClInclude Include="Host.h" />
<ClInclude Include="HotkeyManager.h" /> <ClInclude Include="HotkeyManager.h" />
<ClInclude Include="MemTools.h" /> <ClInclude Include="MemTools.h" />

5
Source/Core/Core/IOS/ES/ES.cpp
View File

@ -27,7 +27,6 @@
#include "Core/IOS/ES/Formats.h" #include "Core/IOS/ES/Formats.h"
#include "Core/IOS/IOSC.h" #include "Core/IOS/IOSC.h"
#include "Core/IOS/VersionInfo.h" #include "Core/IOS/VersionInfo.h"
#include "Core/ec_wii.h"
namespace IOS namespace IOS
{ {
@ -218,9 +217,7 @@ bool ES::LaunchTitle(u64 title_id, bool skip_reload)
NOTICE_LOG(IOS_ES, "Launching title %016" PRIx64 "...", title_id); NOTICE_LOG(IOS_ES, "Launching title %016" PRIx64 "...", title_id);
u32 device_id; if (title_id == Titles::SHOP && m_ios.GetIOSC().IsUsingDefaultId())
if (title_id == Titles::SHOP &&
(GetDeviceId(&device_id) != IPC_SUCCESS || device_id == DEFAULT_WII_DEVICE_ID))
{ {
ERROR_LOG(IOS_ES, "Refusing to launch the shop channel with default device credentials"); ERROR_LOG(IOS_ES, "Refusing to launch the shop channel with default device credentials");
CriticalAlertT("You cannot use the Wii Shop Channel without using your own device credentials." CriticalAlertT("You cannot use the Wii Shop Channel without using your own device credentials."

14
Source/Core/Core/IOS/ES/Identity.cpp
View File

@ -10,7 +10,6 @@
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IOS/ES/Formats.h" #include "Core/IOS/ES/Formats.h"
#include "Core/ec_wii.h"
namespace IOS namespace IOS
{ {
@ -20,8 +19,7 @@ namespace Device
{ {
ReturnCode ES::GetDeviceId(u32* device_id) const ReturnCode ES::GetDeviceId(u32* device_id) const
{ {
const EcWii& ec = EcWii::GetInstance(); *device_id = m_ios.GetIOSC().GetDeviceId();
*device_id = ec.GetNGID();
INFO_LOG(IOS_ES, "GetDeviceId: %08X", *device_id); INFO_LOG(IOS_ES, "GetDeviceId: %08X", *device_id);
return IPC_SUCCESS; return IPC_SUCCESS;
} }
@ -92,10 +90,9 @@ IPCCommandResult ES::GetDeviceCertificate(const IOCtlVRequest& request)
return GetDefaultReply(ES_EINVAL); return GetDefaultReply(ES_EINVAL);
INFO_LOG(IOS_ES, "IOCTL_ES_GETDEVICECERT"); INFO_LOG(IOS_ES, "IOCTL_ES_GETDEVICECERT");
u8* destination = Memory::GetPointer(request.io_vectors[0].address);
const EcWii& ec = EcWii::GetInstance(); const auto cert = m_ios.GetIOSC().GetDeviceCertificate();
MakeNGCert(destination, ec.GetNGID(), ec.GetNGKeyID(), ec.GetNGPriv(), ec.GetNGSig()); Memory::CopyToEmu(request.io_vectors[0].address, cert.data(), cert.size());
return GetDefaultReply(IPC_SUCCESS); return GetDefaultReply(IPC_SUCCESS);
} }
@ -113,10 +110,7 @@ IPCCommandResult ES::Sign(const IOCtlVRequest& request)
if (!m_title_context.active) if (!m_title_context.active)
return GetDefaultReply(ES_EINVAL); return GetDefaultReply(ES_EINVAL);
const EcWii& ec = EcWii::GetInstance(); m_ios.GetIOSC().Sign(sig_out, ap_cert_out, m_title_context.tmd.GetTitleId(), data, data_size);
MakeAPSigAndCert(sig_out, ap_cert_out, m_title_context.tmd.GetTitleId(), data, data_size,
ec.GetNGPriv(), ec.GetNGID());
return GetDefaultReply(IPC_SUCCESS); return GetDefaultReply(IPC_SUCCESS);
} }
} // namespace Device } // namespace Device

3
Source/Core/Core/IOS/ES/TitleManagement.cpp
View File

@ -21,7 +21,6 @@
#include "Core/CommonTitles.h" #include "Core/CommonTitles.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IOS/ES/Formats.h" #include "Core/IOS/ES/Formats.h"
#include "Core/ec_wii.h"
namespace IOS namespace IOS
{ {
@ -63,7 +62,7 @@ ReturnCode ES::ImportTicket(const std::vector<u8>& ticket_bytes, const std::vect
return ES_EINVAL; return ES_EINVAL;
const u32 ticket_device_id = ticket.GetDeviceId(); const u32 ticket_device_id = ticket.GetDeviceId();
const u32 device_id = EcWii::GetInstance().GetNGID(); const u32 device_id = m_ios.GetIOSC().GetDeviceId();
if (type == TicketImportType::PossiblyPersonalised && ticket_device_id != 0) if (type == TicketImportType::PossiblyPersonalised && ticket_device_id != 0)
{ {
if (device_id != ticket_device_id) if (device_id != ticket_device_id)

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

@ -27,7 +27,6 @@
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Common/Swap.h" #include "Common/Swap.h"
#include "Core/IOS/Device.h" #include "Core/IOS/Device.h"
#include "Core/ec_wii.h"
namespace namespace
{ {
@ -444,6 +443,11 @@ ReturnCode IOSC::SetOwnership(Handle handle, u32 new_owner, u32 pid)
return IPC_SUCCESS; return IPC_SUCCESS;
} }
bool IOSC::IsUsingDefaultId() const
{
return GetDeviceId() == DEFAULT_DEVICE_ID;
}
u32 IOSC::GetDeviceId() const u32 IOSC::GetDeviceId() const
{ {
return m_key_entries[HANDLE_CONSOLE_ID].misc_data; return m_key_entries[HANDLE_CONSOLE_ID].misc_data;

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

@ -200,6 +200,7 @@ public:
ReturnCode GetOwnership(Handle handle, u32* owner) const; ReturnCode GetOwnership(Handle handle, u32* owner) const;
ReturnCode SetOwnership(Handle handle, u32 owner, u32 pid); ReturnCode SetOwnership(Handle handle, u32 owner, u32 pid);
bool IsUsingDefaultId() const;
u32 GetDeviceId() const; u32 GetDeviceId() const;
Certificate GetDeviceCertificate() const; Certificate GetDeviceCertificate() const;
void Sign(u8* sig_out, u8* ap_cert_out, u64 title_id, const u8* data, u32 data_size) const; void Sign(u8* sig_out, u8* ap_cert_out, u64 title_id, const u8* data, u32 data_size) const;

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

@ -17,7 +17,6 @@
#include "Core/CommonTitles.h" #include "Core/CommonTitles.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/IOS/Network/Socket.h" #include "Core/IOS/Network/Socket.h"
#include "Core/ec_wii.h"
namespace IOS namespace IOS
{ {
@ -101,8 +100,7 @@ IPCCommandResult NetKDRequest::IOCtl(const IOCtlRequest& request)
u8 id_ctr = config.IdGen(); u8 id_ctr = config.IdGen();
u8 hardware_model = GetHardwareModel(model); u8 hardware_model = GetHardwareModel(model);
const EcWii& ec = EcWii::GetInstance(); u32 HollywoodID = m_ios.GetIOSC().GetDeviceId();
u32 HollywoodID = ec.GetNGID();
u64 UserID = 0; u64 UserID = 0;
s32 ret = NWC24MakeUserID(&UserID, HollywoodID, id_ctr, hardware_model, area_code); s32 ret = NWC24MakeUserID(&UserID, HollywoodID, id_ctr, hardware_model, area_code);

204
Source/Core/Core/ec_wii.cpp
View File

@ -1,204 +0,0 @@
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
// Based off of twintig http://git.infradead.org/?p=users/segher/wii.git
// Copyright 2007,2008 Segher Boessenkool <segher@kernel.crashing.org>
// Licensed under the terms of the GNU GPL, version 2
// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
#include "Core/ec_wii.h"
#include <cinttypes>
#include <cstdio>
#include <cstring>
#include <string>
#include <mbedtls/sha1.h>
#include "Common/CommonTypes.h"
#include "Common/Crypto/ec.h"
#include "Common/File.h"
#include "Common/FileUtil.h"
#include "Common/Logging/Log.h"
#include "Common/Swap.h"
constexpr u32 default_NG_key_id = 0x6AAB8C59;
constexpr u8 default_NG_priv[] = {
0x00, 0xAB, 0xEE, 0xC1, 0xDD, 0xB4, 0xA6, 0x16, 0x6B, 0x70, 0xFD, 0x7E, 0x56, 0x67, 0x70,
0x57, 0x55, 0x27, 0x38, 0xA3, 0x26, 0xC5, 0x46, 0x16, 0xF7, 0x62, 0xC9, 0xED, 0x73, 0xF2,
};
constexpr u8 default_NG_sig[] = {
// R
0x00, 0xD8, 0x81, 0x63, 0xB2, 0x00, 0x6B, 0x0B, 0x54, 0x82, 0x88, 0x63, 0x81, 0x1C, 0x00, 0x71,
0x12, 0xED, 0xB7, 0xFD, 0x21, 0xAB, 0x0E, 0x50, 0x0E, 0x1F, 0xBF, 0x78, 0xAD, 0x37,
// S
0x00, 0x71, 0x8D, 0x82, 0x41, 0xEE, 0x45, 0x11, 0xC7, 0x3B, 0xAC, 0x08, 0xB6, 0x83, 0xDC, 0x05,
0xB8, 0xA8, 0x90, 0x1F, 0xA8, 0x2A, 0x0E, 0x4E, 0x76, 0xEF, 0x44, 0x72, 0x99, 0xF8,
};
static void MakeBlankSigECCert(u8* cert_out, const char* signer, const char* name,
const u8* private_key, u32 key_id)
{
memset(cert_out, 0, 0x180);
*(u32*)cert_out = Common::swap32(0x10002);
strncpy((char*)cert_out + 0x80, signer, 0x40);
*(u32*)(cert_out + 0xc0) = Common::swap32(2);
strncpy((char*)cert_out + 0xc4, name, 0x40);
*(u32*)(cert_out + 0x104) = Common::swap32(key_id);
ec_priv_to_pub(private_key, cert_out + 0x108);
}
// ng_cert_out is a pointer to a 0x180 byte buffer that will contain the device-unique certificate
// NG_id is the device-unique id to use
// NG_key_id is the device-unique key_id to use
// NG_priv is the device-unique private key to use
// NG_sig is the device-unique signature blob (from issuer) to use
// if NG_priv iis nullptr or NG_sig is nullptr or NG_id is 0 or NG_key_id is 0, default values
// will be used for all of them
void MakeNGCert(u8* ng_cert_out, u32 NG_id, u32 NG_key_id, const u8* NG_priv, const u8* NG_sig)
{
char name[64];
if ((NG_id == 0) || (NG_key_id == 0) || (NG_priv == nullptr) || (NG_sig == nullptr))
{
NG_id = DEFAULT_WII_DEVICE_ID;
NG_key_id = default_NG_key_id;
NG_priv = default_NG_priv;
NG_sig = default_NG_sig;
}
sprintf(name, "NG%08x", NG_id);
MakeBlankSigECCert(ng_cert_out, "Root-CA00000001-MS00000002", name, NG_priv, NG_key_id);
memcpy(ng_cert_out + 4, NG_sig, 60);
}
// get_ap_sig_and_cert
// sig_out is a pointer to a 0x3c byte buffer which will be filled with the data payload's signature
// ap_cert_out is a pointer to a 0x180 byte buffer which will be filled with the temporal AP
// certificate
// title_id is the title responsible for the signing
// data is a pointer to the buffer of data to sign
// data_size is the length of the buffer
// NG_priv is the device-unique private key to use
// NG_id is the device-unique id to use
// if NG_priv is nullptr or NG_id is 0, it will use builtin defaults
void MakeAPSigAndCert(u8* sig_out, u8* ap_cert_out, u64 title_id, u8* data, u32 data_size,
const u8* NG_priv, u32 NG_id)
{
u8 hash[20];
u8 ap_priv[30];
char signer[64];
char name[64];
if ((NG_id == 0) || (NG_priv == nullptr))
{
NG_priv = default_NG_priv;
NG_id = DEFAULT_WII_DEVICE_ID;
}
memset(ap_priv, 0, 0x1e);
ap_priv[0x1d] = 1;
// setup random ap_priv here if desired
// get_rand_bytes(ap_priv, 0x1e);
// ap_priv[0] &= 1;
memset(ap_cert_out + 4, 0, 60);
sprintf(signer, "Root-CA00000001-MS00000002-NG%08x", NG_id);
sprintf(name, "AP%016" PRIx64, title_id);
MakeBlankSigECCert(ap_cert_out, signer, name, ap_priv, 0);
mbedtls_sha1(ap_cert_out + 0x80, 0x100, hash);
generate_ecdsa(ap_cert_out + 4, ap_cert_out + 34, NG_priv, hash);
mbedtls_sha1(data, data_size, hash);
generate_ecdsa(sig_out, sig_out + 30, ap_priv, hash);
}
EcWii::EcWii()
{
bool init = true;
std::string keys_path = File::GetUserPath(D_WIIROOT_IDX) + "/keys.bin";
if (File::Exists(keys_path))
{
File::IOFile keys_f(keys_path, "rb");
if (keys_f.IsOpen())
{
if (keys_f.ReadBytes(&BootMiiKeysBin, sizeof(BootMiiKeysBin)))
{
init = false;
INFO_LOG(IOS_ES, "Successfully loaded keys.bin created by: %s", BootMiiKeysBin.creator);
}
else
{
ERROR_LOG(IOS_ES, "Failed to read keys.bin, check it is the correct size of %08zX bytes.",
sizeof(BootMiiKeysBin));
}
}
else
{
ERROR_LOG(IOS_ES, "Failed to open keys.bin, maybe a permissions error or it is in use?");
}
}
else
{
ERROR_LOG(
IOS_ES,
"%s could not be found. Using default values. We recommend you grab keys.bin from BootMii.",
keys_path.c_str());
}
if (init)
InitDefaults();
}
EcWii::~EcWii()
{
}
u32 EcWii::GetNGID() const
{
return Common::swap32(BootMiiKeysBin.ng_id);
}
u32 EcWii::GetNGKeyID() const
{
return Common::swap32(BootMiiKeysBin.ng_key_id);
}
const u8* EcWii::GetNGPriv() const
{
return BootMiiKeysBin.ng_priv;
}
const u8* EcWii::GetNGSig() const
{
return BootMiiKeysBin.ng_sig;
}
const u8* EcWii::GetBackupKey() const
{
return BootMiiKeysBin.backup_key;
}
void EcWii::InitDefaults()
{
memset(&BootMiiKeysBin, 0, sizeof(BootMiiKeysBin));
BootMiiKeysBin.ng_id = Common::swap32(DEFAULT_WII_DEVICE_ID);
BootMiiKeysBin.ng_key_id = Common::swap32(default_NG_key_id);
memcpy(BootMiiKeysBin.ng_priv, default_NG_priv, sizeof(BootMiiKeysBin.ng_priv));
memcpy(BootMiiKeysBin.ng_sig, default_NG_sig, sizeof(BootMiiKeysBin.ng_sig));
}
EcWii& EcWii::GetInstance()
{
static EcWii m_Instance;
return (m_Instance);
}

113
Source/Core/Core/ec_wii.h
View File

@ -1,113 +0,0 @@
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
// Based off of twintig http://git.infradead.org/?p=users/segher/wii.git
// Copyright 2007,2008 Segher Boessenkool <segher@kernel.crashing.org>
// Licensed under the terms of the GNU GPL, version 2
// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
/*
*
* Structs for keys.bin taken from:
*
* mini - a Free Software replacement for the Nintendo/BroadOn IOS.
* crypto hardware support
*
* Copyright (C) 2008, 2009 Haxx Enterprises <bushing@gmail.com>
* Copyright (C) 2008, 2009 Sven Peter <svenpeter@gmail.com>
* Copyright (C) 2008, 2009 Hector Martin "marcan" <marcan@marcansoft.com>
*
* # This code is licensed to you under the terms of the GNU GPL, version 2;
* # see file COPYING or http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
*/
#pragma once
#include "Common/CommonTypes.h"
constexpr u32 DEFAULT_WII_DEVICE_ID = 0x0403AC68;
void MakeNGCert(u8* ng_cert_out, u32 NG_id, u32 NG_key_id, const u8* NG_priv, const u8* NG_sig);
void MakeAPSigAndCert(u8* sig_out, u8* ap_cert_out, u64 title_id, u8* data, u32 data_size,
const u8* NG_priv, u32 NG_id);
class EcWii
{
public:
EcWii();
~EcWii();
static EcWii& GetInstance();
u32 GetNGID() const;
u32 GetNGKeyID() const;
const u8* GetNGPriv() const;
const u8* GetNGSig() const;
const u8* GetBackupKey() const;
private:
void InitDefaults();
#pragma pack(push, 1)
typedef struct
{
u8 boot2version;
u8 unknown1;
u8 unknown2;
u8 pad;
u32 update_tag;
u16 checksum;
}
#ifndef _WIN32
__attribute__((packed))
#endif
eep_ctr_t;
struct
{
u8 creator[0x100]; // 0x000
u8 boot1_hash[0x14]; // 0x100
u8 common_key[0x10]; // 0x114
u32 ng_id; // 0x124
union
{
struct
{
u8 ng_priv[0x1e]; // 0x128
u8 pad1[0x12];
};
struct
{
u8 pad2[0x1c];
u8 nand_hmac[0x14]; // 0x144
};
};
u8 nand_key[0x10]; // 0x158
u8 backup_key[0x10]; // 0x168
u32 unk1; // 0x178
u32 unk2; // 0x17C
u8 eeprom_pad[0x80]; // 0x180
u32 ms_id; // 0x200
u32 ca_id; // 0x204
u32 ng_key_id; // 0x208
u8 ng_sig[0x3c]; // 0x20c
eep_ctr_t counters[0x02]; // 0x248
u8 fill[0x18]; // 0x25c
u8 korean_key[0x10]; // 0x274
u8 pad3[0x74]; // 0x284
u16 prng_seed[0x02]; // 0x2F8
u8 pad4[0x04]; // 0x2FC
u8 crack_pad[0x100]; // 0x300
}
#ifndef _WIN32
__attribute__((packed))
#endif
BootMiiKeysBin;
#pragma pack(pop)
};