X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/bea6e7b0b648868926329addf21036255a460166..c5e9a0212e68f864371439cb5be8fd227002e9c8:/client/mifarehost.h

diff --git a/client/mifarehost.h b/client/mifarehost.h
index a9db4ec3..118d55cc 100644
--- a/client/mifarehost.h
+++ b/client/mifarehost.h
@@ -1,4 +1,4 @@
-// Merlok, 2011
+// Merlok, 2011, 2017
 // people from mifare@nethemba.com, 2010
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
@@ -8,28 +8,44 @@
 // High frequency ISO14443A commands
 //-----------------------------------------------------------------------------
 
+#ifndef MIFAREHOST_H
+#define MIFAREHOST_H
+
 #include <stdint.h>
 #include <stdbool.h>
 #include "data.h"
 
+// defaults
+// timeout in units. (ms * 106)/10 or us*0.0106
+// 5 == 500us
+#define MF_CHKKEYS_DEFTIMEOUT		5
+
 // mfCSetBlock work flags
-#define CSETBLOCK_UID 					0x01
-#define CSETBLOCK_WUPC					0x02
-#define CSETBLOCK_HALT					0x04
+#define CSETBLOCK_UID 				0x01
+#define CSETBLOCK_WUPC				0x02
+#define CSETBLOCK_HALT				0x04
 #define CSETBLOCK_INIT_FIELD			0x08
 #define CSETBLOCK_RESET_FIELD			0x10
 #define CSETBLOCK_SINGLE_OPER			0x1F
+#define CSETBLOCK_MAGIC_1B 			0x40
+
+typedef struct {
+	uint64_t Key[2];
+	int foundKey[2];
+} sector_t;
 
 extern char logHexFileName[FILE_PATH_SIZE];
 
 extern int mfDarkside(uint64_t *key);
 extern int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *ResultKeys, bool calibrate);
 extern int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key);
+extern int mfCheckKeysSec(uint8_t sectorCnt, uint8_t keyType, uint8_t timeout14a, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, sector_t * e_sector);
 
 extern int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);
 extern int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);
 
-extern int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool wantWipe);
+extern int mfCWipe(uint32_t numSectors, bool gen1b, bool wantWipe, bool wantFill);
+extern int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID);
 extern int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params);
 extern int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);
 
@@ -42,3 +58,7 @@ extern int isBlockTrailer(int blockN);
 extern int loadTraceCard(uint8_t *tuid);
 extern int saveTraceCard(void);
 extern int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len);
+
+extern int mfCIdentify();
+
+#endif