updated

[proxmark3-svn] / include / mifare.h

diff --git a/include/mifare.h b/include/mifare.h
index 89ff758e20727266698385204dc05e2f5b60c0e7..e6643f5f235f95b34d82631f56019539c393a8d6 100644 (file)
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -11,7 +11,7 @@
 #ifndef _MIFARE_H_
 #define _MIFARE_H_
 
 #ifndef _MIFARE_H_
 #define _MIFARE_H_
 

-#include "../include/common.h"
+#include "common.h"

 
 //-----------------------------------------------------------------------------
 // ISO 14443A
 
 //-----------------------------------------------------------------------------
 // ISO 14443A


@@ -37,4 +37,48 @@ typedef enum ISO14A_COMMAND {
        ISO14A_TOPAZMODE =                      (1 << 8)
 } iso14a_command_t;
 
        ISO14A_TOPAZMODE =                      (1 << 8)
 } iso14a_command_t;
 

+
+//-----------------------------------------------------------------------------
+// ISO 14443B
+//-----------------------------------------------------------------------------
+typedef struct {
+       byte_t uid[10];
+       byte_t uidlen;
+       byte_t atqb[7];
+       byte_t chipid;
+       byte_t cid;
+} __attribute__((__packed__)) iso14b_card_select_t;
+
+
+typedef enum ISO14B_COMMAND {
+       ISO14B_CONNECT =                        (1 << 0),
+       ISO14B_DISCONNECT =                     (1 << 1),
+       ISO14B_APDU =                           (1 << 2),
+       ISO14B_RAW =                            (1 << 3),
+       ISO14B_REQUEST_TRIGGER =        (1 << 4),
+       ISO14B_APPEND_CRC =                     (1 << 5),
+       ISO14B_SELECT_STD =                     (1 << 6),
+       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_