Improved logic for determining the correct Frame Delay Time (FDT) value based on...

[proxmark3-svn] / include / mifare.h

diff --git a/include/mifare.h b/include/mifare.h
index f6626328217d75f3ee20a2f7a6bd24d61881be80..fa714f26117d7f0297f828dc845f883a71a24aad 100644 (file)
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -37,7 +37,13 @@ typedef enum ISO14A_COMMAND {
        ISO14A_TOPAZMODE =                      (1 << 8)
 } iso14a_command_t;
 
        ISO14A_TOPAZMODE =                      (1 << 8)
 } iso14a_command_t;
 

-
+typedef struct {
+       uint8_t* response;
+       size_t   response_n;
+       uint8_t* modulation;
+       size_t   modulation_n;
+       uint32_t ProxToAirDuration;
+} tag_response_info_t;

 //-----------------------------------------------------------------------------
 // ISO 14443B
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // ISO 14443B
 //-----------------------------------------------------------------------------


@@ -61,5 +67,24 @@ typedef enum ISO14B_COMMAND {
        ISO14B_SELECT_SR =                      (1 << 7)
 } iso14b_command_t;
 
        ISO14B_SELECT_SR =                      (1 << 7)
 } iso14b_command_t;
 

+//-----------------------------------------------------------------------------
+// "hf 14a sim x", "hf mf sim x" attacks
+//-----------------------------------------------------------------------------
+typedef struct {
+  uint32_t cuid;
+  uint32_t nonce;
+  uint32_t ar;
+  uint32_t nr;
+  uint32_t nonce2;
+  uint32_t ar2;
+  uint32_t nr2;
+  uint8_t  sector;
+  uint8_t  keytype;
+  enum {
+               EMPTY,
+               FIRST,
+               SECOND,
+       } state;
+} nonces_t;

 
 #endif // _MIFARE_H_
 
 #endif // _MIFARE_H_