flash savings

limpkin · Apr 22, 2015 · f056afc · f056afc
1 parent 68ab3ad
commit f056afc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/source_code/Mooltipass.atsuo b/source_code/Mooltipass.atsuo
diff --git a/source_code/elf_analysis/test.txt b/source_code/elf_analysis/test.txt
@@ -215,8 +215,6 @@
 00000048 T deleteUserIdFromSMCUIDLUT
 00000048 T oledScrollUp
 00000048 T oledSetRowAddr
-00000048 T setAuthenticatedReadWriteAccessToZone1
-00000048 T setAuthenticatedReadWriteAccessToZone2
 00000050 T writeSecurityCode
 00000052 T aes_shiftRows
 00000054 T __epilogue_restores__
@@ -225,8 +223,6 @@
 00000054 T initEncryptionHandling
 00000055 t oled_init
 00000056 T __prologue_saves__
-00000056 T checkAuthenticatedReadWriteAccessToZone1
-00000056 T checkAuthenticatedReadWriteAccessToZone2
 00000056 T findSmcUidLUTEmptySlot
 00000056 T guiDisplayLoginOrPasswordOnScreen
 00000056 T oledSetWindow
@@ -238,6 +234,7 @@
 00000062 T handleSmartcardRemoved
 00000062 T oledStrWidth
 00000062 T readDataFromTS
+00000062 T setAuthenticatedReadWriteAccessToZone1and2
 00000062 T setStartingParent
 00000062 T writeDataToTS
 00000063 T descriptor_list
@@ -276,9 +273,9 @@
 00000084 T initiateI2cRead
 00000084 T searchForLoginInGivenParent
 00000086 T aes256_init_ecb
+00000086 T eraseSmartCard
 00000088 T formatUserProfileMemory
 00000088 T oledClear
-00000090 T eraseSmartCard
 00000092 T activityDetectedRoutine
 00000092 T checkMooltipassPassword
 00000092 T guiCardUnlockingProcess
@@ -330,9 +327,9 @@
 00000134 T fillArrayWithRandomBytes
 00000136 t encrypt32bBlockOfDataAndClearCTVFlag
 00000136 T eraseApplicationZone1NZone2SMC
+00000136 T transformBlankCardIntoMooltipass
 00000140 T addNewContext
 00000140 T aes256_encrypt_ecb
-00000140 T transformBlankCardIntoMooltipass
 00000140 T usbKeybPutChar
 00000150 T updateChildNode
 00000152 T addNewUserAndNewSmartCard

diff --git a/source_code/src/GUI/gui_pin_functions.c b/source_code/src/GUI/gui_pin_functions.c
@@ -147,7 +147,6 @@ RET_TYPE guiGetPinFromUser(volatile uint16_t* pin_code, uint8_t stringID)
             }
             guiDisplayPinOnPinEnteringScreen(current_pin, selected_digit);
             oledBitmapDrawFlash(235, 23, BITMAP_RIGHT_ARROW, 0);
-            touchSensorInterruptLineDelay();
         }
         else if (temp_rettype & RETURN_RIGHT_PRESSED)
         {
@@ -167,7 +166,6 @@ RET_TYPE guiGetPinFromUser(volatile uint16_t* pin_code, uint8_t stringID)
             }
             guiDisplayPinOnPinEnteringScreen(current_pin, selected_digit);
             oledBitmapDrawFlash(0, 23, BITMAP_LEFT_ARROW, 0);
-            touchSensorInterruptLineDelay();
         }
     }
 

diff --git a/source_code/src/GUI/gui_screen_functions.c b/source_code/src/GUI/gui_screen_functions.c
@@ -343,19 +343,28 @@ void guiDisplayProcessingScreen(void)
     guiDisplayInformationOnScreen(ID_STRING_PROCESSING);
 }
 
-/*! \fn     guiDisplayInformationOnScreen(uint8_t stringID)
+/*! \fn     guiDisplayTextInformationOnScreen(char* text)
 *   \brief  Display text information on screen
-*   \param  stringID    String ID to display
+*   \param  text    Text to display
 */
-void guiDisplayInformationOnScreen(uint8_t stringID)
+void guiDisplayTextInformationOnScreen(char* text)
 {
     oledClear();
     touchDetectionRoutine(0xFF);
-    oledPutstrXY(10, 24, OLED_CENTRE, readStoredStringToBuffer(stringID));
+    oledPutstrXY(10, 24, OLED_CENTRE, text);
     oledBitmapDrawFlash(2, 17, BITMAP_INFO, 0);
     oledFlipBuffers(0,0);
 }
 
+/*! \fn     guiDisplayInformationOnScreen(uint8_t stringID)
+*   \brief  Display text information on screen
+*   \param  stringID    String ID to display
+*/
+void guiDisplayInformationOnScreen(uint8_t stringID)
+{
+    guiDisplayTextInformationOnScreen(readStoredStringToBuffer(stringID));
+}
+
 /*! \fn     guiDisplayRawString(uint8_t stringID)
 *   \brief  Display raw text at current position on string
 *   \param  stringID    String ID to display
@@ -371,10 +380,7 @@ void guiDisplayRawString(uint8_t stringID)
 */
 void guiDisplayLoginOrPasswordOnScreen(char* text)
 {
-    oledClear();
-    oledPutstrXY(10, 24, OLED_CENTRE, text);
-    oledBitmapDrawFlash(2, 17, BITMAP_INFO, 0);
-    oledFlipBuffers(0,0);
+    guiDisplayTextInformationOnScreen(text);
     getTouchedPositionAnswer(0);
 }
 

diff --git a/source_code/src/changelog.txt b/source_code/src/changelog.txt
@@ -1,6 +1,7 @@
 RC4:
 - no screen flipping when no credentials for given service
 - informing user of no credentials for given service
+- LEDS off when displaying information
 - flashy screen when adding service
 - ghost touches problem solved
 - size optimizations...

diff --git a/source_code/src/mooltipass.c b/source_code/src/mooltipass.c
@@ -482,6 +482,7 @@ int main(void)
             guiGetBackToCurrentScreen();
         }
 
+        #define TWO_CAPS_TRICK
         #ifdef TWO_CAPS_TRICK
         // Two quick caps lock presses wakes up the device        
         if ((hasTimerExpired(TIMER_CAPS, FALSE) == TIMER_EXPIRED) && (getKeyboardLeds() & HID_CAPS_MASK) && (wasCapsLockTimerArmed == FALSE))