Merge branch 'DarkMatterCore-master'

This commit is contained in:
Christopher Roy Bratusek 2015-07-11 16:29:05 +02:00
commit 508db8e375
4 changed files with 158 additions and 4 deletions

132
libruntimeiospatch/API Normal file
View File

@ -0,0 +1,132 @@
libruntimeiospatch function overview
====================================
>>>>>>>> libruntimeiospatch 1.3: <<<<<<<<
===================== ===================
=== ERROR_AHBPROT === === ERROR_PATCH ===
===================== ===================
Use those to catch occuring errors
******
if (IosPatch_AHBPROT(false) == ERROR_AHBPROT)
printf("AHBPROT is still enabled!");
if (IosPatch_RUNTIME(true, false, false, false) == ERROR_PATCH)
printf("Patching IOS failed!");
========================
=== AHBPROT_DISABLED ===
========================
Returns true when HW_AHBPROT access can be applied
******
If(AHBPROT_DISABLED) {
do_something
} else {
do_something_else
}
******
===================================
=== LIB_RUNTIMEIOSPATCH_VERSION ===
===================================
Stores printable version of libruntimeiospatch.
>>>>>>>> libruntimeiospatch 1.1: <<<<<<<<
=====================
=== IosPatch_FULL ===
=====================
This function combines IosPatch_AHBPROT + IOS_ReloadIOS + IosPatch_RUNTIME
>> Flags: [bool]wii (whether to apply Wii patches)
[bool]sciifii (whether to apply extra Sciifii patches)
[bool]vwii (whether to apply extra vWii patches)
[bool]verbose (whether to print messages on-screen)
[int]ios (which IOS to reload into)
>> Return:
-5: no HW_AHBPROT access
-7: patching HW_AHBPROT access failed
>0: success (return equals to number of applied patches)
******
If(AHBPROT_DISABLED) {
IosPatch_FULL(true, false, false, false, 58);
}
******
>>>>>>>> libruntimeiospatch 1.0: <<<<<<<<
========================
=== IosPatch_AHBPROT ===
========================
This function can be used to keep HW_AHBPROT access when going to reload IOS
>> Flags: [bool]verbose (whether to print messages on-screen)
>> Return:
-5: no HW_AHBPROT access
-7: patching HW_AHBPROT access failed
>0: success
******
if(AHBPROT_DISABLED) {
s32 ret;
ret = IosPatch_AHBPROT(false);
if (ret) {
IOS_ReloadIOS(36);
} else {
printf("IosPatch_AHBPROT failed.");
}
}
******
========================
=== IosPatch_RUNTIME ===
========================
This function applies patches on current IOS
>> Flags: [bool]wii (whether to apply Wii patches)
[bool]sciifii (whether to apply extra Sciifii patches)
[bool]vwii (whether to apply extra vWii patches)
[bool]verbose (whether to print messages on-screen)
>> Return:
-5: no HW_AHBPROT access
>0: success (return equals to number of applied patches)
<< Patchsets:
Wii:
* DI Readlimit
* ISFS Permissions
* ES SetUID
* ES SetIdentify
* Hash Check (aka Trucha)
* New Hash Check (aka New Trucha)
* SSL patches
Sciifii:
* MEM2 Prot
* ES OpenTitleContent 1 & 2
* ES ReadContent Prot
* ES CloseContent
* ES TitleVersionCheck
* ES TitleDeleteCheck
vWii:
* Kill Anti-SystemTitle-Install 1, 2, 3, 4 & 5
******
If(AHBPROT_DISABLED) {
IosPatch_RUNTIME(true, false, false, false);
}
******

View File

@ -1,3 +1,8 @@
1.5.2:
* added SSL module patches made by FIX94 to fix some certificate
errors that occur when attempting to connect to a host using a
secure connection (DarkMatterCore)
1.5.1:
* code clean-up (JoostinOnline)
* add typedef for s32 (JoostinOnline)

View File

@ -9,9 +9,10 @@
// Copyright (C) 2010 Joseph Jordan <joe.ftpii@psychlaw.com.au>
// Copyright (C) 2012-2013 damysteryman
// Copyright (C) 2012-2013 Christopher Bratusek <nano@tuxfamily.org>
// Copyright (C) 2012-2015 Christopher Bratusek <nano@jpberlin.de>
// Copyright (C) 2013 DarkMatterCore
// Copyright (C) 2014 megazig
// Copyright (C) 2015 FIX94
#include <gccore.h>
#include <ogc/machine/processor.h>
@ -50,6 +51,16 @@ static const u8 addticket_patch[] = { 0xE0 };
static const u8 es_set_ahbprot_old[] = { 0x68, 0x5B, 0x22, 0xEC, 0x00, 0x52, 0x18, 0x9B, 0x68, 0x1B, 0x46, 0x98, 0x07, 0xDB };
static const u8 es_set_ahbprot_patch[] = { 0x01 };
/* SSL patches made by FIX94 for Nintendont. Ported to libruntimeiospatch by DarkMatterCore */
static const u8 ssl_patch1_old[] = { 0xFE, 0x0E, 0xE3, 0x50, 0x00, 0x00, 0x05, 0x9F };
static const u8 ssl_patch1_new[] = { 0xFE, 0x0E, 0xE3, 0x28, 0xF1, 0x02, 0x05, 0x9F }; // Fixes SSL error -9 (wrong host)
static const u8 ssl_patch2_old[] = { 0x00, 0x00, 0x0A, 0x00, 0x00, 0x09, 0xEA, 0x00 };
static const u8 ssl_patch2_new[] = { 0x00, 0x00, 0xEA, 0x00, 0x00, 0x09, 0xEA, 0x00 }; // Fixes SSL error -10 (part 1) (wrong root cert)
static const u8 ssl_patch3_old[] = { 0x00, 0x00, 0x1A, 0x00, 0x00, 0x08, 0xE3, 0xE0 };
static const u8 ssl_patch3_new[] = { 0x00, 0x00, 0xEA, 0x00, 0x00, 0x08, 0xE3, 0xE0 }; // Fixes SSL error -10 (part 2) (wrong root cert)
static const u8 ssl_patch4_old[] = { 0x00, 0x00, 0xDA, 0x00, 0x00, 0x16, 0xE7, 0x96 };
static const u8 ssl_patch4_new[] = { 0x00, 0x00, 0xEA, 0x00, 0x00, 0x16, 0xE7, 0x96 }; // Fixes SSL error -11 (wrong client cert)
//Following patches added to iospatch.c by damysteryman, taken from sciifii v5
static const u8 MEM2_prot_old[] = { 0xB5, 0x00, 0x4B, 0x09, 0x22, 0x01, 0x80, 0x1A, 0x22, 0xF0 };
static const u8 MEM2_prot_patch[] = { 0xB5, 0x00, 0x4B, 0x09, 0x22, 0x00, 0x80, 0x1A, 0x22, 0xF0 };
@ -72,7 +83,6 @@ static const u8 ES_TitleVersionCheck_patch[] = { 0xE0, 0x01, 0x4E, 0x56 };
static const u8 ES_TitleDeleteCheck_old[] = { 0xD8, 0x00, 0x4A, 0x04 };
static const u8 ES_TitleDeleteCheck_patch[] = { 0xE0, 0x00, 0x4A, 0x04 };
//Following set of patches made by damysteryman for use with Wii U's vWii
static const u8 Kill_AntiSysTitleInstallv3_pt1_old[] = { 0x68, 0x1A, 0x2A, 0x01, 0xD0, 0x05 }; // Make sure that the pt1
static const u8 Kill_AntiSysTitleInstallv3_pt1_patch[] = { 0x68, 0x1A, 0x2A, 0x01, 0x46, 0xC0 }; // patch is applied twice. -dmm
@ -81,6 +91,7 @@ static const u8 Kill_AntiSysTitleInstallv3_pt2_patch[] = { 0x46, 0xC0, 0x33, 0x0
static const u8 Kill_AntiSysTitleInstallv3_pt3_old[] = { 0x68, 0xFB, 0x2B, 0x00, 0xDB, 0x01 };
static const u8 Kill_AntiSysTitleInstallv3_pt3_patch[] = { 0x68, 0xFB, 0x2B, 0x00, 0xDB, 0x10 };
/* ISFS_SetAttr patches made by megazig */
static const u8 isfs_setattr_pt1_old[] = { 0x42, 0xAB, 0xD0, 0x02, 0x20, 0x66 };
static const u8 isfs_setattr_pt1_patch[] = { 0x42, 0xAB, 0xE0, 0x02, 0x20, 0x66 };
static const u8 isfs_setattr_pt2_old[] = { 0x2D, 0x00, 0xD0, 0x02, 0x20, 0x66 };
@ -143,6 +154,10 @@ s32 IosPatch_RUNTIME(bool wii, bool sciifii, bool vwii, bool verbose) {
count += apply_patch("new_hash_check", new_hash_old, sizeof(new_hash_old), hash_patch, sizeof(hash_patch), 1, verbose);
count += apply_patch("isfs_setattr_pt1", isfs_setattr_pt1_old, sizeof(isfs_setattr_pt1_old), isfs_setattr_pt1_patch, sizeof(isfs_setattr_pt1_patch), 0, verbose);
count += apply_patch("isfs_setattr_pt2", isfs_setattr_pt2_old, sizeof(isfs_setattr_pt2_old), isfs_setattr_pt2_patch, sizeof(isfs_setattr_pt2_patch), 0, verbose);
count += apply_patch("ssl_patch1", ssl_patch1_old, sizeof(ssl_patch1_old), ssl_patch1_new, sizeof(ssl_patch1_new), 0, verbose);
count += apply_patch("ssl_patch2", ssl_patch2_old, sizeof(ssl_patch2_old), ssl_patch2_new, sizeof(ssl_patch2_new), 0, verbose);
count += apply_patch("ssl_patch3", ssl_patch3_old, sizeof(ssl_patch3_old), ssl_patch3_new, sizeof(ssl_patch3_new), 0, verbose);
count += apply_patch("ssl_patch4", ssl_patch4_old, sizeof(ssl_patch4_old), ssl_patch4_new, sizeof(ssl_patch4_new), 0, verbose);
}
if(sciifii)
{

View File

@ -9,9 +9,10 @@
// Copyright (C) 2010 Joseph Jordan <joe.ftpii@psychlaw.com.au>
// Copyright (C) 2012-2013 damysteryman
// Copyright (C) 2012-2013 Christopher Bratusek <nano@tuxfamily.org>
// Copyright (C) 2012-2015 Christopher Bratusek <nano@jpberlin.de>
// Copyright (C) 2013 DarkMatterCore
// Copyright (C) 2014 megazig
// Copyright (C) 2015 FIX94
#ifndef __RUNTIMEIOSPATCH_H__
#define __RUNTIMEIOSPATCH_H__
@ -19,7 +20,7 @@
/**
* Version information for Libruntimeiospatch.
*/
#define LIB_RUNTIMEIOSPATCH_VERSION "1.5.1"
#define LIB_RUNTIMEIOSPATCH_VERSION "1.5.2"
//==============================================================================
// HW_RVL header
@ -62,6 +63,7 @@ Wii:
* ES SetIdentify
* Hash Check (aka Trucha)
* New Hash Check (aka New Trucha)
* SSL patches
Sciifii:
* MEM2 Prot