syntax sugar

[proxmark3-svn] / armsrc / mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index db49a9598a8935a219e7e76130bece230592e6a9..4bb01a4c5482060aa3930a06c9ff4d9e58fffca6 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -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
 // \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
        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
                        \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
        }\r
        \r
        LED_B_ON();\r


@@ -1360,24 +1372,48 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 void MifareCIdent(){\r
        #define GEN_1A 1\r
        #define GEN_1B 2\r
 void MifareCIdent(){\r
        #define GEN_1A 1\r
        #define GEN_1B 2\r

+       #define GEN_2  4\r

        // variables\r
        uint8_t isGen = 0;\r
        // variables\r
        uint8_t isGen = 0;\r

-       uint8_t receivedAnswer[1] = {0x00};\r
-       uint8_t receivedAnswerPar[1] = {0x00};\r
-\r
+       uint8_t rec[1] = {0x00};\r
+       uint8_t recpar[1] = {0x00};\r
+       \r
+       // Generation 1 test\r

        ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);\r
        ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);\r

-       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
-               goto OUT;\r
-       }\r
-       isGen |= GEN_1B;\r
+       if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {\r
+               goto TEST2;\r
+       };\r
+       isGen = GEN_1B;\r

        \r
        ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
        \r
        ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r

-       if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
+       if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {\r

                goto OUT;\r
                goto OUT;\r

-       }       \r
+       };      \r

        isGen = GEN_1A;\r
        isGen = GEN_1A;\r

+       goto OUT;\r

 \r
 \r

-OUT:   \r
+TEST2:;\r
+/*\r
+       // Generation 2 test\r
+       struct Crypto1State mpcs = {0, 0};\r
+       struct Crypto1State *pcs = &mpcs;\r
+\r
+       // halt previous.\r
+       mifare_classic_halt(NULL, 0);\r
+       \r
+       //select\r
+       if (!iso14443a_select_card(NULL, NULL, NULL, true, 0)) {\r
+               goto OUT;\r
+       };\r
+       \r
+       // MIFARE_CLASSIC_WRITEBLOCK 0xA0\r
+       // ACK 0x0a\r
+       uint16_t len = mifare_sendcmd_short(pcs, 1, 0xA0, 0, rec, recpar, NULL);\r
+       if ((len != 1) || (rec[0] != 0x0A)) {   \r
+               isGen = GEN_2;  \r
+       };\r
+       */\r
+OUT:;\r

        // removed the if,  since some magic tags misbehavies and send an answer to it.\r
        mifare_classic_halt(NULL, 0);\r
        cmd_send(CMD_ACK,isGen, 0, 0, 0, 0);\r
        // removed the if,  since some magic tags misbehavies and send an answer to it.\r
        mifare_classic_halt(NULL, 0);\r
        cmd_send(CMD_ACK,isGen, 0, 0, 0, 0);\r