X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/55acbb2a3903f7940d0db5fae2e8f4fdab51d1b8..2c39c25c67ef9db6693a895df0780ff8fd09e481:/client/mifarehost.h

diff --git a/client/mifarehost.h b/client/mifarehost.h
index 4d382409..a11f11d5 100644
--- a/client/mifarehost.h
+++ b/client/mifarehost.h
@@ -15,10 +15,10 @@
 #include "cmdmain.h"
 #include "ui.h"
 #include "data.h"
-#include "proxusb.h"
 #include "util.h"
 #include "nonce2key/nonce2key.h"
 #include "nonce2key/crapto1.h"
+#include "iso14443crc.h"
 
 #define MEM_CHUNK               1000000
 #define NESTED_SECTOR_RETRY     10
@@ -42,31 +42,28 @@
 
 #define TRACE_ERROR		 					0xFF
 
-typedef struct fnVector { uint8_t blockNo, keyType; uint32_t uid, nt, ks1; } fnVector;
-
 typedef struct {
 	uint64_t Key[2];
 	int foundKey[2];
 } sector;
  
-typedef struct {
-        uint64_t        *possibleKeys;
-        uint32_t        size;
-} pKeys;
-
-typedef struct {
-        uint64_t        key;
-        int             count;
-} countKeys;
-
-extern char logHexFileName[200];
+extern char logHexFileName[FILE_PATH_SIZE];
 
-int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys);
+int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);
 int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);
+
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);
 int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);
-int mfCSetUID(uint8_t *uid, uint8_t *oldUID, int wantWipe);
-int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, int wantWipe, uint8_t params);
+
+int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool wantWipe);
+int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params);
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);
-int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak);
-int mfTraceDecode(uint8_t *data_src, int len);
+
+int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile);
+int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile);
+
+int isTraceCardEmpty(void);
+int isBlockEmpty(int blockN);
+int isBlockTrailer(int blockN);
+int loadTraceCard(uint8_t *tuid);
+int saveTraceCard(void);