]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/mifarecmd.c
CHG: renamed struct sector -> sector_t
[proxmark3-svn] / armsrc / mifarecmd.c
index 2ab076b626575975a396f905dc2510633124cef1..1e398bc8e08c9ae2a134e64d1a0925d1b519c19b 100644 (file)
@@ -956,9 +956,13 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 // \r
 //-----------------------------------------------------------------------------\r
 void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {\r
-       uint8_t blockNo = arg0 & 0xff;\r
-       uint8_t keyType = (arg0 >> 8) & 0xff;\r
-       bool clearTrace = arg1;\r
+#define STD_SEARCH 1\r
+#define EXT_SEARCH 2\r
+\r
+       uint8_t blockNo = arg0 & 0xFF;\r
+       uint8_t keyType = (arg0 >> 8) & 0xFF;\r
+       uint8_t searchType = (arg1 >> 8 ) & 0xFF;\r
+       bool clearTrace = arg1 & 0xFF;\r
        uint8_t keyCount = arg2;\r
        uint64_t ui64Key = 0;\r
        \r
@@ -1026,8 +1030,16 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
                        \r
                        continue;\r
                }\r
-               isOK = 1;\r
-               break;\r
+               \r
+               // found a key.\r
+               //\r
+               //if ( searchType == EXT_SEARCH) {\r
+                       \r
+               //}\r
+               //else {\r
+                       isOK = 1;\r
+                       break;\r
+               //}\r
        }\r
        \r
        LED_B_ON();\r
Impressum, Datenschutz