LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Revert "Skip PIN verification after a MCU reboot on A9LH"

Browse Source 
This reverts commit 18bd4bbcf6.
This commit is contained in:
Aurora 2016-08-29 16:04:17 +02:00
parent 18bd4bbcf6
commit 2ffe4a5451
3 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/firm.c
View File

@ -129,7 +129,7 @@ void main(void)
//Boot options aren't being forced //Boot options aren't being forced
if(needConfig != DONT_CONFIGURE) if(needConfig != DONT_CONFIGURE)
{ {
bool pinExists = CONFIG(8) && verifyPin(isA9lh && CFG_BOOTENV); bool pinExists = CONFIG(8) && verifyPin();
//If no configuration file exists or SELECT is held, load configuration menu //If no configuration file exists or SELECT is held, load configuration menu
bool shouldLoadConfigMenu = needConfig == CREATE_CONFIGURATION || ((pressed & BUTTON_SELECT) && !(pressed & BUTTON_L1)); bool shouldLoadConfigMenu = needConfig == CREATE_CONFIGURATION || ((pressed & BUTTON_SELECT) && !(pressed & BUTTON_L1));

5
source/pin.c
View File

@ -103,7 +103,7 @@ void newPin(bool allowSkipping)
} }
} }
bool verifyPin(bool skipVerification) bool verifyPin(void)
{ {
initScreens(); initScreens();
@ -123,8 +123,6 @@ bool verifyPin(bool skipVerification)
//Test vector verification (SD card has, or hasn't been used on another console) //Test vector verification (SD card has, or hasn't been used on another console)
if(memcmp(pin.testHash, tmp, 32) != 0) return false; if(memcmp(pin.testHash, tmp, 32) != 0) return false;
if(!skipVerification)
{
//Pad to AES block length with zeroes //Pad to AES block length with zeroes
u8 __attribute__((aligned(4))) enteredPassword[16 * ((PIN_LENGTH + 15) / 16)] = {0}; u8 __attribute__((aligned(4))) enteredPassword[16 * ((PIN_LENGTH + 15) / 16)] = {0};
@ -173,7 +171,6 @@ bool verifyPin(bool skipVerification)
} }
} }
} }
}
return true; return true;
} }

2
source/pin.h
View File

@ -44,4 +44,4 @@ typedef struct __attribute__((packed))
} PINData; } PINData;
void newPin(bool allowSkipping); void newPin(bool allowSkipping);
bool verifyPin(bool skipVerification); bool verifyPin(void);