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

Don't init screens if the PIN file does not exist or is invalid

Browse Source
This commit is contained in:
Aurora 2016-09-12 18:58:10 +02:00
parent c739ed8e48
commit 050f58a3bb
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/config.c
View File

@ -66,11 +66,6 @@ void writeConfig(ConfigurationStatus needConfig, u32 configTemp)
void configMenu(bool oldPinStatus) void configMenu(bool oldPinStatus)
{ {
initScreens();
drawString(CONFIG_TITLE, 10, 10, COLOR_TITLE);
drawString("Press A to select, START to save", 10, 30, COLOR_WHITE);
const char *multiOptionsText[] = { "Default EmuNAND: 1( ) 2( ) 3( ) 4( )", const char *multiOptionsText[] = { "Default EmuNAND: 1( ) 2( ) 3( ) 4( )",
"Screen brightness: 4( ) 3( ) 2( ) 1( )", "Screen brightness: 4( ) 3( ) 2( ) 1( )",
"PIN lock: Off( ) 4( ) 6( ) 8( ) digits", "PIN lock: Off( ) 4( ) 6( ) 8( ) digits",
@ -122,6 +117,11 @@ void configMenu(bool oldPinStatus)
for(u32 i = 0; i < singleOptionsAmount; i++) for(u32 i = 0; i < singleOptionsAmount; i++)
singleOptions[i].enabled = CONFIG(i); singleOptions[i].enabled = CONFIG(i);
initScreens();
drawString(CONFIG_TITLE, 10, 10, COLOR_TITLE);
drawString("Press A to select, START to save", 10, 30, COLOR_WHITE);
//Character to display a selected option //Character to display a selected option
char selected = 'x'; char selected = 'x';

16
source/pin.c
View File

@ -48,19 +48,19 @@ void newPin(bool allowSkipping)
{ {
clearScreens(); clearScreens();
u8 length = 4 + 2 * (MULTICONFIG(PIN) - 1);
char *title = allowSkipping ? "Press START to skip or enter a new PIN" : "Enter a new PIN to proceed"; char *title = allowSkipping ? "Press START to skip or enter a new PIN" : "Enter a new PIN to proceed";
drawString(title, 10, 10, COLOR_TITLE); drawString(title, 10, 10, COLOR_TITLE);
drawString("PIN ( digits): ", 10, 10 + 2 * SPACING_Y, COLOR_WHITE); drawString("PIN ( digits): ", 10, 10 + 2 * SPACING_Y, COLOR_WHITE);
drawCharacter('0' + length, 10 + 5 * SPACING_X, 10 + 2 * SPACING_Y, COLOR_WHITE);
//Pad to AES block length with zeroes //Pad to AES block length with zeroes
u8 __attribute__((aligned(4))) enteredPassword[0x10] = {0}; u8 __attribute__((aligned(4))) enteredPassword[0x10] = {0};
u8 length = 4 + 2 * (MULTICONFIG(PIN) - 1), u8 cnt = 0;
cnt = 0;
int charDrawPos = 16 * SPACING_X; int charDrawPos = 16 * SPACING_X;
drawCharacter('0' + length, 10 + 5 * SPACING_X, 10 + 2 * SPACING_Y, COLOR_WHITE);
while(cnt < length) while(cnt < length)
{ {
u32 pressed; u32 pressed;
@ -106,8 +106,6 @@ void newPin(bool allowSkipping)
bool verifyPin(void) bool verifyPin(void)
{ {
initScreens();
PinData pin; PinData pin;
if(fileRead(&pin, PIN_PATH) != sizeof(PinData) || if(fileRead(&pin, PIN_PATH) != sizeof(PinData) ||
@ -125,11 +123,13 @@ bool verifyPin(void)
//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, sizeof(tmp)) != 0) return false; if(memcmp(pin.testHash, tmp, sizeof(tmp)) != 0) return false;
initScreens();
//Pad to AES block length with zeroes //Pad to AES block length with zeroes
u8 __attribute__((aligned(4))) enteredPassword[0x10] = {0}; u8 __attribute__((aligned(4))) enteredPassword[0x10] = {0};
u8 cnt = 0;
bool unlock = false; bool unlock = false;
u8 cnt = 0;
int charDrawPos = 16 * SPACING_X; int charDrawPos = 16 * SPACING_X;
while(!unlock) while(!unlock)
@ -165,7 +165,7 @@ bool verifyPin(void)
if(!unlock) if(!unlock)
{ {
charDrawPos = 5 * SPACING_X; charDrawPos = 16 * SPACING_X;
cnt = 0; cnt = 0;
clearScreens(); clearScreens();