Revert changes in hardnested nonces collection. Sacrifice some speed in favor of...

[proxmark3-svn] / armsrc / mifareutil.h

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 645d0e7dff08d1cecb8cc06fd4cdfd152cc079de..b2912895888fc47f948d9f5d68155cc946034564 100644 (file)
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -12,6 +12,9 @@
 #ifndef __MIFAREUTIL_H\r
 #define __MIFAREUTIL_H\r
 \r
+#include <stdint.h>\r
+#include <stdbool.h>\r
+\r
 #include "crapto1/crapto1.h"\r
 #include "usb_cdc.h"\r
 \r
@@ -21,8 +24,6 @@
 #define CRYPT_REQUEST 2\r
 #define AUTH_FIRST    0        \r
 #define AUTH_NESTED   2\r
-#define AUTHENTICATION_TIMEOUT 848                     // card times out 1ms after wrong authentication (according to NXP documentation)\r
-#define PRE_AUTHENTICATION_LEADTIME 400                // some (non standard) cards need a pause after select before they are ready for first authentication\r
 \r
 // mifare 4bit card answers\r
 #define CARD_ACK      0x0A  // 1010 - ACK\r
@@ -75,6 +76,8 @@ uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data);
 // Mifare memory structure\r
 uint8_t NumBlocksPerSector(uint8_t sectorNo);\r
 uint8_t FirstBlockOfSector(uint8_t sectorNo);\r
+bool IsSectorTrailer(uint8_t blockNo);\r
+uint8_t SectorTrailer(uint8_t blockNo);\r
 \r
 // emulator functions\r
 void emlClearMem(void);\r