More coverity findings

[proxmark3-svn] / client / mifarehost.h

diff --git a/client/mifarehost.h b/client/mifarehost.h
index d74f3f0e4aa2361b08d1766bd0b0a814913ff52b..5de082ceaa5655253e74d27a5435df446f4e3e25 100644 (file)
--- a/client/mifarehost.h
+++ b/client/mifarehost.h
@@ -15,7 +15,7 @@
 #include "cmdmain.h"\r
 #include "ui.h"\r
 #include "data.h"\r
 #include "cmdmain.h"\r
 #include "ui.h"\r
 #include "data.h"\r

-#include "proxusb.h"\r
+//#include "proxusb.h"\r

 #include "util.h"\r
 #include "nonce2key/nonce2key.h"\r
 #include "nonce2key/crapto1.h"\r
 #include "util.h"\r
 #include "nonce2key/nonce2key.h"\r
 #include "nonce2key/crapto1.h"\r


@@ -43,26 +43,14 @@
 \r
 #define TRACE_ERROR                                                    0xFF\r
 \r
 \r
 #define TRACE_ERROR                                                    0xFF\r
 \r

-typedef struct fnVector { uint8_t blockNo, keyType; uint32_t uid, nt, ks1; } fnVector;\r
-\r

 typedef struct {\r
        uint64_t Key[2];\r
        int foundKey[2];\r
 } sector;\r
  \r
 typedef struct {\r
        uint64_t Key[2];\r
        int foundKey[2];\r
 } sector;\r
  \r

-typedef struct {\r
-        uint64_t        *possibleKeys;\r
-        uint32_t        size;\r
-} pKeys;\r
-\r
-typedef struct {\r
-        uint64_t        key;\r
-        int             count;\r
-} countKeys;\r
-\r

 extern char logHexFileName[200];\r
 \r
 extern char logHexFileName[200];\r
 \r

-int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys);\r
+int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);\r

 int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);\r
 \r
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);\r
 int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);\r
 \r
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);\r


@@ -73,7 +61,7 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, int wantWipe, uint
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);\r
 \r
 int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile);\r
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);\r
 \r
 int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile);\r

-int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile);\r
+int mfTraceDecode(uint8_t *data_src, int len, uint32_t parity, bool wantSaveToEmlFile);\r

 \r
 int isTraceCardEmpty(void);\r
 int isBlockEmpty(int blockN);\r
 \r
 int isTraceCardEmpty(void);\r
 int isBlockEmpty(int blockN);\r