Finalized migration to new USB CDC interface

[proxmark3-svn] / client / mifarehost.c

diff --git a/client/mifarehost.c b/client/mifarehost.c
index f34759df80b6343cd1be1de0cf7dc111a20cdcd4..14674b1635d83de45902ebf3c62821440506fecf 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -12,9 +12,9 @@
 #include <stdlib.h> \r
 #include <string.h>\r
 #include "mifarehost.h"\r
+#include "proxmark3.h"\r
 \r
 // MIFARE\r
-\r
 int compar_int(const void * a, const void * b) {\r
        return (*(uint64_t*)b - *(uint64_t*)a);\r
 }\r
@@ -59,12 +59,12 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
        fnVector * vector = NULL;\r
        countKeys       *ck;\r
        int lenVector = 0;\r
-       UsbCommand * resp = NULL;\r
+       UsbCommand resp;\r
        \r
        memset(resultKeys, 0x00, 16 * 6);\r
 \r
        // flush queue\r
-       while (WaitForResponseTimeout(CMD_ACK, 500) != NULL) ;\r
+       WaitForResponseTimeout(CMD_ACK,NULL,100);\r
        \r
   UsbCommand c = {CMD_MIFARE_NESTED, {blockNo, keyType, trgBlockNo + trgKeyType * 0x100}};\r
        memcpy(c.d.asBytes, key, 6);\r
@@ -81,18 +81,16 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
                        break;\r
                }\r
 \r
-               resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
-\r
-               if (resp != NULL) {\r
-                       isEOF  = resp->arg[0] & 0xff;\r
+               if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+                       isEOF  = resp.arg[0] & 0xff;\r
 \r
                        if (isEOF) break;\r
                        \r
-                       len = resp->arg[1] & 0xff;\r
+                       len = resp.arg[1] & 0xff;\r
                        if (len == 0) continue;\r
                        \r
-                       memcpy(&uid, resp->d.asBytes, 4); \r
-                       PrintAndLog("uid:%08x len=%d trgbl=%d trgkey=%x", uid, len, resp->arg[2] & 0xff, (resp->arg[2] >> 8) & 0xff);\r
+                       memcpy(&uid, resp.d.asBytes, 4);\r
+                       PrintAndLog("uid:%08x len=%d trgbl=%d trgkey=%x", uid, len, resp.arg[2] & 0xff, (resp.arg[2] >> 8) & 0xff);\r
                        vector = (fnVector *) realloc((void *)vector, (lenVector + len) * sizeof(fnVector) + 200);\r
                        if (vector == NULL) {\r
                                PrintAndLog("Memory allocation error for fnVector. len: %d bytes: %d", lenVector + len, (lenVector + len) * sizeof(fnVector)); \r
@@ -100,12 +98,12 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
                        }\r
                        \r
                        for (i = 0; i < len; i++) {\r
-                               vector[lenVector + i].blockNo = resp->arg[2] & 0xff;\r
-                               vector[lenVector + i].keyType = (resp->arg[2] >> 8) & 0xff;\r
+                               vector[lenVector + i].blockNo = resp.arg[2] & 0xff;\r
+                               vector[lenVector + i].keyType = (resp.arg[2] >> 8) & 0xff;\r
                                vector[lenVector + i].uid = uid;\r
 \r
-                               memcpy(&vector[lenVector + i].nt,  (void *)(resp->d.asBytes + 8 + i * 8 + 0), 4);\r
-                               memcpy(&vector[lenVector + i].ks1, (void *)(resp->d.asBytes + 8 + i * 8 + 4), 4);\r
+                               memcpy(&vector[lenVector + i].nt,  (void *)(resp.d.asBytes + 8 + i * 8 + 0), 4);\r
+                               memcpy(&vector[lenVector + i].ks1, (void *)(resp.d.asBytes + 8 + i * 8 + 4), 4);\r
                        }\r
 \r
                        lenVector += len;\r
@@ -187,14 +185,12 @@ int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * key
 \r
   UsbCommand c = {CMD_MIFARE_CHKKEYS, {blockNo, keyType, keycnt}};\r
        memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\r
-\r
   SendCommand(&c);\r
 \r
-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 3000);\r
-\r
-       if (resp == NULL) return 1;\r
-       if ((resp->arg[0] & 0xff) != 0x01) return 2;\r
-       *key = bytes_to_num(resp->d.asBytes, 6);\r
+       UsbCommand resp;\r
+       if (!WaitForResponseTimeout(CMD_ACK,&resp,3000)) return 1;\r
+       if ((resp.arg[0] & 0xff) != 0x01) return 2;\r
+       *key = bytes_to_num(resp.d.asBytes, 6);\r
        return 0;\r
 }\r
 \r
@@ -202,13 +198,11 @@ int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * key
 \r
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {\r
        UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};\r
- \r
-       SendCommand(&c);\r
-\r
-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
+       SendCommand(&c);\r
 \r
-       if (resp == NULL) return 1;\r
-       memcpy(data, resp->d.asBytes, blocksCount * 16); \r
+  UsbCommand resp;\r
+       if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) return 1;\r
+       memcpy(data, resp.d.asBytes, blocksCount * 16);\r
        return 0;\r
 }\r
 \r
@@ -241,11 +235,10 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, int wantWipe, uint
        memcpy(c.d.asBytes, data, 16); \r
        SendCommand(&c);\r
 \r
-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
-\r
-       if (resp != NULL) {\r
-               isOK  = resp->arg[0] & 0xff;\r
-               if (uid != NULL) memcpy(uid, resp->d.asBytes, 4); \r
+  UsbCommand resp;\r
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+               isOK  = resp.arg[0] & 0xff;\r
+               if (uid != NULL) memcpy(uid, resp.d.asBytes, 4);\r
                if (!isOK) return 2;\r
        } else {\r
                PrintAndLog("Command execute timeout");\r
@@ -260,11 +253,10 @@ int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
        UsbCommand c = {CMD_MIFARE_EML_CGETBLOCK, {params, 0, blockNo}};\r
        SendCommand(&c);\r
 \r
-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
-\r
-       if (resp != NULL) {\r
-               isOK  = resp->arg[0] & 0xff;\r
-               memcpy(data, resp->d.asBytes, 16); \r
+  UsbCommand resp;\r
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+               isOK  = resp.arg[0] & 0xff;\r
+               memcpy(data, resp.d.asBytes, 16);\r
                if (!isOK) return 2;\r
        } else {\r
                PrintAndLog("Command execute timeout");\r