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

ec_wii: Move implementation details into cpp file 

Gets rid of the need for an include in the header file.
This commit is contained in:
Lioncash 2017-01-28 17:58:22 -05:00
parent 66160c2781
commit 5b998ee9b0
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,15 +7,17 @@
// Licensed under the terms of the GNU GPL, version 2 // Licensed under the terms of the GNU GPL, version 2
// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt // http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
#include "Core/ec_wii.h"
#include <cstdio> #include <cstdio>
#include <string.h> #include <string.h>
#include <mbedtls/sha1.h> #include <mbedtls/sha1.h>
#include "Common/CommonFuncs.h"
#include "Common/Crypto/ec.h" #include "Common/Crypto/ec.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Core/ec_wii.h"
static u32 default_NG_id = 0x0403AC68; static u32 default_NG_id = 0x0403AC68;
static u32 default_NG_key_id = 0x6AAB8C59; static u32 default_NG_key_id = 0x6AAB8C59;
@ -158,6 +160,26 @@ EcWii::~EcWii()
{ {
} }
u32 EcWii::getNgId()
{
return Common::swap32(BootMiiKeysBin.ng_id);
}
u32 EcWii::getNgKeyId()
{
return Common::swap32(BootMiiKeysBin.ng_key_id);
}
const u8* EcWii::getNgPriv()
{
return BootMiiKeysBin.ng_priv;
}
const u8* EcWii::getNgSig()
{
return BootMiiKeysBin.ng_sig;
}
void EcWii::InitDefaults() void EcWii::InitDefaults()
{ {
memset(&BootMiiKeysBin, 0, sizeof(BootMiiKeysBin)); memset(&BootMiiKeysBin, 0, sizeof(BootMiiKeysBin));

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

@ -24,7 +24,6 @@
#pragma once #pragma once
#include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
void get_ng_cert(u8* ng_cert_out, u32 NG_id, u32 NG_key_id, const u8* NG_priv, const u8* NG_sig); void get_ng_cert(u8* ng_cert_out, u32 NG_id, u32 NG_key_id, const u8* NG_priv, const u8* NG_sig);
@ -40,10 +39,11 @@ public:
EcWii(); EcWii();
~EcWii(); ~EcWii();
static EcWii& GetInstance(); static EcWii& GetInstance();
u32 getNgId() { return Common::swap32(BootMiiKeysBin.ng_id); } u32 getNgId();
u32 getNgKeyId() { return Common::swap32(BootMiiKeysBin.ng_key_id); } u32 getNgKeyId();
const u8* getNgPriv() { return BootMiiKeysBin.ng_priv; } const u8* getNgPriv();
const u8* getNgSig() { return BootMiiKeysBin.ng_sig; } const u8* getNgSig();
private: private:
void InitDefaults(); void InitDefaults();