gnmmarechal/SafeA9LHInstaller
1
0
Fork 1
mirror of https://github.com/AuroraWright/SafeA9LHInstaller.git synced 2025-06-26 13:42:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move magic to the payload again

Browse Source
This commit is contained in:
Aurora 2016-11-22 23:04:15 +01:00
parent 7067c6d0e8
commit 2be5a24262
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/installer.c
View File

@ -57,7 +57,6 @@ static const u8 sectorHashRetail[SHA_256_HASH_SIZE] = {
0xF2, 0x38, 0x14, 0x58, 0x10, 0x83, 0x56, 0x4F, 0x0D, 0x5A, 0xDB, 0x29, 0x12, 0xD8, 0xA9, 0x84 0xF2, 0x38, 0x14, 0x58, 0x10, 0x83, 0x56, 0x4F, 0x0D, 0x5A, 0xDB, 0x29, 0x12, 0xD8, 0xA9, 0x84
}; };
static vu32 *otplessOffset = (vu32 *)0x80FD0FC;
u32 posY; u32 posY;
static void drawTitle(void) static void drawTitle(void)
@ -70,7 +69,7 @@ static void drawTitle(void)
void main(void) void main(void)
{ {
bool isOtpless = ISA9LH && otplessOffset[0] == 0xEAFE4AA3 && otplessOffset[1] == 0xDEADCAFE; bool isOtpless = ISA9LH && *(vu32 *)0x80FD0FC == 0xEAFE4AA3 && magic == 0xDEADCAFE;
if(!isOtpless) drawTitle(); if(!isOtpless) drawTitle();
@ -205,8 +204,13 @@ static inline void installer(bool isOtpless)
shutdown(1, "Error: firm1.bin is invalid or corrupted"); shutdown(1, "Error: firm1.bin is invalid or corrupted");
} }
if(!ISA9LH && ISN3DS && !ISDEVUNIT && !fileWrite((void *)0x23F00000, "arm9loaderhax.bin", 0x10000)) if(!ISA9LH && ISN3DS && !ISDEVUNIT)
{
magic = 0xDEADCAFE;
if(!fileWrite((void *)0x23F00000, "arm9loaderhax.bin", 0x10000))
shutdown(1, "Error: couldn't write arm9loaderhax.bin"); shutdown(1, "Error: couldn't write arm9loaderhax.bin");
}
if(!isOtpless) if(!isOtpless)
{ {
@ -267,7 +271,7 @@ static inline void installer(bool isOtpless)
if(!isOtpless) writeFirm((u8 *)FIRM0_OFFSET, false, FIRM0_SIZE); if(!isOtpless) writeFirm((u8 *)FIRM0_OFFSET, false, FIRM0_SIZE);
else else
{ {
otplessOffset[0] = otplessOffset[1] = 0; *(vu32 *)0x80FD0FC = 0;
sdmmc_sdcard_init(true, false); sdmmc_sdcard_init(true, false);
mountFs(true); mountFs(true);
fileDelete("arm9loaderhax.bin"); fileDelete("arm9loaderhax.bin");
@ -276,8 +280,7 @@ static inline void installer(bool isOtpless)
if(!ISA9LH && ISN3DS && !ISDEVUNIT) if(!ISA9LH && ISN3DS && !ISDEVUNIT)
{ {
otplessOffset[0] = 0xEAFE4AA3; *(vu32 *)0x80FD0FC = 0xEAFE4AA3;
otplessOffset[1] = 0xDEADCAFE;
mcuReboot(); mcuReboot();
} }

2
source/installer.h
View File

@ -18,6 +18,8 @@
#define MAX_STAGE1_SIZE 0x1E70 #define MAX_STAGE1_SIZE 0x1E70
#define MAX_STAGE2_SIZE 0x89A00 #define MAX_STAGE2_SIZE 0x89A00
extern u32 magic;
extern const u8 key2s[5][AES_BLOCK_SIZE], extern const u8 key2s[5][AES_BLOCK_SIZE],
devKey2s[2][AES_BLOCK_SIZE]; devKey2s[2][AES_BLOCK_SIZE];

7
source/start.s
View File

@ -24,6 +24,13 @@
.align 4 .align 4
.global _start .global _start
_start: _start:
b start
.global magic
magic:
.word 0
start:
@ Disable interrupts @ Disable interrupts
mrs r0, cpsr mrs r0, cpsr
orr r0, #0x1C0 orr r0, #0x1C0