fix: 'hf mf nested' - got an initialized bug from the monster merge

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 3b5247589a86b8e594e6d0102b267f6226ebd12e..92ffbd4e7e26b6cb009f4770a1c34327859a24b9 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -396,8 +396,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {\r
        UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};\r
        SendCommand(&c);\r
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {\r
        UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};\r
        SendCommand(&c);\r

-\r
-  UsbCommand resp;\r
+       UsbCommand resp;\r

        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) return 1;\r
        memcpy(data, resp.d.asBytes, blocksCount * 16);\r
        return 0;\r
        if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) return 1;\r
        memcpy(data, resp.d.asBytes, blocksCount * 16);\r
        return 0;\r


@@ -417,8 +416,7 @@ int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
 \r
        UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};\r
        SendCommand(&c);\r
 \r
        UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};\r
        SendCommand(&c);\r

-\r
-  UsbCommand resp;\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 (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
                isOK  = resp.arg[0] & 0xff;\r
                memcpy(data, resp.d.asBytes, 16);\r


@@ -436,8 +434,7 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin
        UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};\r
        memcpy(c.d.asBytes, data, 16);\r
        SendCommand(&c);\r
        UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};\r
        memcpy(c.d.asBytes, data, 16);\r
        SendCommand(&c);\r

-\r
-  UsbCommand resp;\r
+       UsbCommand resp;\r

        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
                isOK  = resp.arg[0] & 0xff;\r
                if (uid != NULL)\r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
                isOK  = resp.arg[0] & 0xff;\r
                if (uid != NULL)\r


@@ -534,7 +531,7 @@ int isBlockEmpty(int blockN) {
 }\r
 \r
 int isBlockTrailer(int blockN) {\r
 }\r
 \r
 int isBlockTrailer(int blockN) {\r

- return ((blockN & 0x03) == 0x03);\r
+       return ((blockN & 0x03) == 0x03);\r

 }\r
 \r
 int saveTraceCard(void) {\r
 }\r
 \r
 int saveTraceCard(void) {\r


@@ -596,7 +593,6 @@ int loadTraceCard(uint8_t *tuid) {
                blockNum++;\r
        }\r
        fclose(f);\r
                blockNum++;\r
        }\r
        fclose(f);\r

-\r

        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r


@@ -617,7 +613,6 @@ int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFil
        uid = bytes_to_num(tuid + 3, 4);\r
 \r
        traceState = TRACE_IDLE;\r
        uid = bytes_to_num(tuid + 3, 4);\r
 \r
        traceState = TRACE_IDLE;\r

-\r

        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r


@@ -844,7 +839,6 @@ int mfCIdentify()
 {\r
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};\r
        SendCommand(&c);\r
 {\r
        UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};\r
        SendCommand(&c);\r

-\r

        UsbCommand resp;\r
        WaitForResponse(CMD_ACK,&resp);\r
 \r
        UsbCommand resp;\r
        WaitForResponse(CMD_ACK,&resp);\r
 \r