MirrorBackup/SafeA9LHInstaller
1
0
Fork 0
forked from gnmmarechal/SafeA9LHInstaller
Code Pull Requests Activity

Added warning about stage2-only updates, added possibility to go back to menu after a successful stage2 update, now the installer reports which operation was successful

Browse Source
This commit is contained in:
Aurora 2016-03-20 16:55:49 +01:00
parent 4174e65183
commit a051420edd
5 changed files with 56 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
source/installer.c
View File

@ -21,17 +21,21 @@ static const u8 firm1Hash[0x20] = {
0x2D, 0x3D, 0x56, 0x6C, 0x6A, 0x1A, 0x8E, 0x52, 0x54, 0xE3, 0x89, 0xC2, 0x95, 0x06, 0x23, 0xE5 0x2D, 0x3D, 0x56, 0x6C, 0x6A, 0x1A, 0x8E, 0x52, 0x54, 0xE3, 0x89, 0xC2, 0x95, 0x06, 0x23, 0xE5
}; };
static void installStage2(u32 mode, int pos_y){ static const char *path;
static u32 size;
int pos_y;
static void installStage2(u32 mode){
//Read stage2 //Read stage2
char *path = "a9lh/payload_stage2.bin"; path = "a9lh/payload_stage2.bin";
u32 size = fileSize(path); size = fileSize(path);
if(!size || size > MAXSTAGE2SIZE) if(!size || size > MAXSTAGE2SIZE)
shutdown(1, pos_y, "Error: stage2.bin doesn't exist or exceeds\nmax size"); shutdown(1, "Error: stage2.bin doesn't exist or exceeds\nmax size");
memset((u8 *)STAGE2OFFSET, 0, MAXSTAGE2SIZE); memset((u8 *)STAGE2OFFSET, 0, MAXSTAGE2SIZE);
fileRead((u8 *)STAGE2OFFSET, path, size); fileRead((u8 *)STAGE2OFFSET, path, size);
if(mode) return; if(mode) return;
sdmmc_nand_writesectors(0x5C000, 0x20, (vu8 *)STAGE2OFFSET); sdmmc_nand_writesectors(0x5C000, 0x20, (vu8 *)STAGE2OFFSET);
shutdown(1, pos_y, "Success!"); shutdown(2, "Stage2 update: success!");
} }
void installer(void){ void installer(void){
@ -40,24 +44,27 @@ void installer(void){
//Detect the console being used //Detect the console being used
u32 console = (PDN_MPCORE_CFG == 1) ? 0 : 1; u32 console = (PDN_MPCORE_CFG == 1) ? 0 : 1;
drawString("Safe A9LH Installer v1.2.1", 10, 10, 0x0000FF); while(1){
int pos_y = drawString("Thanks to delebile, #cakey and StandardBus", 10, 40, 0xFFFFFF); clearScreens();
pos_y = drawString("Press SELECT for a full install", 10, pos_y + SPACING_VERT, 0xFFFFFF); drawString("Safe A9LH Installer v1.3", 10, 10, 0xff9900);
if(a9lhBoot) pos_y = drawString("Press START to only update stage2", 10, pos_y, 0xFFFFFF); pos_y = drawString("Thanks to delebile, #cakey and StandardBus", 10, 40, 0xFFFFFF);
pos_y = drawString("Press any other button to shutdown", 10, pos_y, 0xFFFFFF); pos_y = drawString("Press SELECT for a full install", 10, pos_y + SPACING_VERT, 0xFFFFFF);
if(a9lhBoot){ pos_y = drawString("Press START to only update stage2", 10, pos_y, 0xFFFFFF);
pos_y = drawString("(Only do stage2 updates from the fork you use!)", 10, pos_y, 0x0000FF); }
pos_y = drawString("Press any other button to shutdown", 10, pos_y, 0xFFFFFF);
u16 pressed = waitInput(); u16 pressed = waitInput();
if(a9lhBoot && pressed == BUTTON_START) installStage2(0, pos_y); if(a9lhBoot && pressed == BUTTON_START) installStage2(0);
if(pressed != BUTTON_SELECT) shutdown(0, 0, NULL); else if(pressed == BUTTON_SELECT) break;
else shutdown(0, NULL);
const char *path; }
//If making a first install, we need the OTP //If making a first install, we need the OTP
if(!a9lhBoot){ if(!a9lhBoot){
//Read OTP //Read OTP
path = "a9lh/otp.bin"; path = "a9lh/otp.bin";
if(fileSize(path) != 256) if(fileSize(path) != 256)
shutdown(1, pos_y, "Error: otp.bin doesn't exist or has a wrong size"); shutdown(1, "Error: otp.bin doesn't exist or has a wrong size");
fileRead((u8 *)OTPOFFSET, path, 256); fileRead((u8 *)OTPOFFSET, path, 256);
} }
@ -65,10 +72,10 @@ void installer(void){
setupKeyslot0x11(a9lhBoot, (u8 *)OTPOFFSET); setupKeyslot0x11(a9lhBoot, (u8 *)OTPOFFSET);
if(a9lhBoot && !testOtp(a9lhBoot)) if(a9lhBoot && !testOtp(a9lhBoot))
shutdown(1, pos_y, "Error: the OTP hash is invalid"); shutdown(1, "Error: the OTP hash is invalid");
if(!a9lhBoot && console && !testOtp(a9lhBoot)) if(!a9lhBoot && console && !testOtp(a9lhBoot))
shutdown(1, pos_y, "Error: otp.bin is invalid or corrupted"); shutdown(1, "Error: otp.bin is invalid or corrupted");
//Calculate the CTR for the 3DS partitions //Calculate the CTR for the 3DS partitions
getNandCTR(); getNandCTR();
@ -76,15 +83,15 @@ void installer(void){
//Test that the CTR is correct //Test that the CTR is correct
readFirm0((u8 *)TEMPOFFSET, 0x200); readFirm0((u8 *)TEMPOFFSET, 0x200);
if(memcmp((void *)TEMPOFFSET, "FIRM", 4) != 0) if(memcmp((void *)TEMPOFFSET, "FIRM", 4) != 0)
shutdown(1, pos_y, "Error: failed to setup FIRM encryption"); shutdown(1, "Error: failed to setup FIRM encryption");
//Read decrypted key sector //Read decrypted key sector
path = "a9lh/secret_sector.bin"; path = "a9lh/secret_sector.bin";
if(fileSize(path) != 0x200) if(fileSize(path) != 0x200)
shutdown(1, pos_y, "Error: secret_sector.bin doesn't exist or has\na wrong size"); shutdown(1, "Error: secret_sector.bin doesn't exist or has\na wrong size");
fileRead((u8 *)SECTOROFFSET, path, 0x200); fileRead((u8 *)SECTOROFFSET, path, 0x200);
if(!verifyHash((u8 *)SECTOROFFSET, 0x200, sectorHash)) if(!verifyHash((u8 *)SECTOROFFSET, 0x200, sectorHash))
shutdown(1, pos_y, "Error: secret_sector is invalid"); shutdown(1, "Error: secret_sector.bin is invalid or corrupted");
//Generate and encrypt a per-console A9LH key sector //Generate and encrypt a per-console A9LH key sector
generateSector((void *)SECTOROFFSET); generateSector((void *)SECTOROFFSET);
@ -93,28 +100,28 @@ void installer(void){
path = "a9lh/firm0.bin"; path = "a9lh/firm0.bin";
u32 firm0Size = fileSize(path); u32 firm0Size = fileSize(path);
if(!firm0Size) if(!firm0Size)
shutdown(1, pos_y, "Error: firm0.bin doesn't exist"); shutdown(1, "Error: firm0.bin doesn't exist");
fileRead((u8 *)FIRM0OFFSET, path, firm0Size); fileRead((u8 *)FIRM0OFFSET, path, firm0Size);
if(!verifyHash((u8 *)FIRM0OFFSET, firm0Size, firm0Hash)) if(!verifyHash((u8 *)FIRM0OFFSET, firm0Size, firm0Hash))
shutdown(1, pos_y, "Error: firm0.bin is invalid or corrupted"); shutdown(1, "Error: firm0.bin is invalid or corrupted");
//Read FIRM1 //Read FIRM1
path = "a9lh/firm1.bin"; path = "a9lh/firm1.bin";
u32 firm1Size = fileSize(path); u32 firm1Size = fileSize(path);
if(!firm1Size) if(!firm1Size)
shutdown(1, pos_y, "Error: firm1.bin doesn't exist"); shutdown(1, "Error: firm1.bin doesn't exist");
fileRead((u8 *)FIRM1OFFSET, path, firm1Size); fileRead((u8 *)FIRM1OFFSET, path, firm1Size);
if(!verifyHash((u8 *)FIRM1OFFSET, firm1Size, firm1Hash)) if(!verifyHash((u8 *)FIRM1OFFSET, firm1Size, firm1Hash))
shutdown(1, pos_y, "Error: firm1.bin is invalid or corrupted"); shutdown(1, "Error: firm1.bin is invalid or corrupted");
//Inject stage1 //Inject stage1
path = "a9lh/payload_stage1.bin"; path = "a9lh/payload_stage1.bin";
u32 size = fileSize(path); size = fileSize(path);
if(!size || size > MAXSTAGE1SIZE) if(!size || size > MAXSTAGE1SIZE)
shutdown(1, pos_y, "Error: stage1.bin doesn't exist or exceeds\nmax size"); shutdown(1, "Error: stage1.bin doesn't exist or exceeds\nmax size");
fileRead((u8 *)STAGE1OFFSET, path, size); fileRead((u8 *)STAGE1OFFSET, path, size);
installStage2(1, pos_y); installStage2(1);
pos_y = drawString("All checks passed, installing...", 10, pos_y + SPACING_VERT, 0xFFFFFF); pos_y = drawString("All checks passed, installing...", 10, pos_y + SPACING_VERT, 0xFFFFFF);
@ -124,5 +131,5 @@ void installer(void){
writeFirm((u8 *)FIRM0OFFSET, 0, firm0Size); writeFirm((u8 *)FIRM0OFFSET, 0, firm0Size);
sdmmc_nand_writesectors(0x96, 0x1, (vu8 *)SECTOROFFSET); sdmmc_nand_writesectors(0x96, 0x1, (vu8 *)SECTOROFFSET);
shutdown(1, pos_y, "Success!"); shutdown(1, "Full install: success!");
} }

6
source/installer.h
View File

@ -1,11 +1,9 @@
#include "types.h"
#pragma once #pragma once
#include "types.h"
#define PDN_MPCORE_CFG (*(vu8 *)0x10140FFC) #define PDN_MPCORE_CFG (*(vu8 *)0x10140FFC)
#define PDN_SPI_CNT (*(vu8 *)0x101401C0) #define PDN_SPI_CNT (*(vu8 *)0x101401C0)
#define BUTTON_SELECT (1 << 2)
#define BUTTON_START (1 << 3)
#define OTPOFFSET 0x24000000 #define OTPOFFSET 0x24000000
#define SECTOROFFSET 0x24100000 #define SECTOROFFSET 0x24100000

3
source/main.c
View File

@ -12,11 +12,10 @@
#include "draw.h" #include "draw.h"
#include "types.h" #include "types.h"
#define PDN_GPU_CNT (*(vu8 *)0x10141200) #define PDN_GPU_CNT (*(vu8 *)0x10141200)
void main(void){ void main(void){
mountSD(); mountSD();
if(PDN_GPU_CNT == 0x1) initLCD(); if(PDN_GPU_CNT == 0x1) initLCD();
clearScreens();
installer(); installer();
} }

13
source/utils.c
View File

@ -15,7 +15,7 @@ u16 waitInput(void){
key = HID_PAD; key = HID_PAD;
//Make sure it's pressed //Make sure it's pressed
for(u32 i = 0xFEE7; i; i--){ for(u32 i = 0x13000; i; i--){
if (key != HID_PAD) if (key != HID_PAD)
break; break;
if(i==1) pressedkey = 1; if(i==1) pressedkey = 1;
@ -25,11 +25,16 @@ u16 waitInput(void){
return key; return key;
} }
void shutdown(u32 mode, int pos_y, char *message){ void shutdown(u32 mode, char *message){
if(mode){ if(mode){
pos_y = drawString(message, 10, pos_y + SPACING_VERT, 0xFFFFFF); pos_y = drawString(message, 10, pos_y + SPACING_VERT, 0xFFFFFF);
drawString("Press any button to shutdown", 10, pos_y, 0xFFFFFF); if(mode == 1) drawString("Press any button to shutdown", 10, pos_y, 0xFFFFFF);
waitInput(); else {
pos_y = drawString("Press START or SELECT to return to menu", 10, pos_y, 0x0000FF);
pos_y = drawString("Press any other button to shutdown", 10, pos_y, 0xFFFFFF);
}
u16 pressed = waitInput();
if(mode == 2 && (pressed & (BUTTON_START | BUTTON_SELECT))) return;
} }
i2cWriteRegister(I2C_DEV_MCU, 0x20, 1); i2cWriteRegister(I2C_DEV_MCU, 0x20, 1);
while(1); while(1);

12
source/utils.h
View File

@ -1,8 +1,12 @@
#include "types.h"
#pragma once #pragma once
#define HID_PAD ((~*(vu16 *)0x10146000) & 0xFFF) #include "types.h"
#define HID_PAD ((~*(vu16 *)0x10146000) & 0xFFF)
#define BUTTON_START (1 << 3)
#define BUTTON_SELECT (1 << 2)
extern int pos_y;
u16 waitInput(void); u16 waitInput(void);
void shutdown(u32 mode, int pos_y, char *message); void shutdown(u32 mode, char *message);