Merge pull request #163 from shinhub/mf_detection_canary_init

Move DETECTION canary write to AppInit instead of STATE_AUTHING
iceman1001 · Sep 28, 2019 · db81ad5 · db81ad5
2 parents c99e40d + 45605ac
commit db81ad5
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Firmware/ChameleonMini/Application/MifareClassic.c b/Firmware/ChameleonMini/Application/MifareClassic.c
@@ -280,6 +280,10 @@ void MifareClassicAppInit(uint16_t ATQA_4B, uint8_t SAK, bool is7B, bool isDetec
     CardSAKValue = SAK;
     isFromHaltState = false;
     isDetectionEnabled = isDetection;
+    if(isDetectionEnabled) {
+        uint8_t canary[DETECTION_BLOCK0_CANARY_SIZE] = { DETECTION_BLOCK0_CANARY };
+        AppMemoryWrite(canary, DETECTION_BLOCK0_CANARY_ADDR, DETECTION_BLOCK0_CANARY_SIZE);
+    }
 }
 
 void MifareClassicAppInit1K(void) {
@@ -558,8 +562,6 @@ uint16_t MifareClassicAppProcess(uint8_t* Buffer, uint16_t BitCount) {
                     DetectionAttemptsKeyB++;
                     DetectionAttemptsKeyB = DetectionAttemptsKeyB % DETECTION_MEM_MAX_KEYX_SAVES;
                 }
-                uint8_t canary[DETECTION_BLOCK0_CANARY_SIZE] = { DETECTION_BLOCK0_CANARY };
-                AppMemoryWrite(canary, DETECTION_BLOCK0_CANARY_ADDR, DETECTION_BLOCK0_CANARY_SIZE);
                 // Write to app memory
                 AppMemoryWrite(DetectionDataSave, memSaveAddr, DETECTION_BYTES_PER_SAVE);
                 // Rage quit