Merge pull request #526 from Proxmark/marshmellow42-patch-1

[proxmark3-svn] / include / mifare.h

diff --git a/include/mifare.h b/include/mifare.h
index 9ef03f20ceeff2990fec1d8e5cf45bb372aa7e80..b821f32b5cb590ec347e9681ce59727a9cd2631f 100644 (file)
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -26,13 +26,30 @@ typedef struct {
 } __attribute__((__packed__)) iso14a_card_select_t;
 
 typedef enum ISO14A_COMMAND {
-       ISO14A_CONNECT = 1,
-       ISO14A_NO_DISCONNECT = 2,
-       ISO14A_APDU = 4,
-       ISO14A_RAW = 8,
-       ISO14A_REQUEST_TRIGGER = 0x10,
-       ISO14A_APPEND_CRC = 0x20,
-       ISO14A_SET_TIMEOUT = 0x40
+       ISO14A_CONNECT =                        (1 << 0),
+       ISO14A_NO_DISCONNECT =          (1 << 1),
+       ISO14A_APDU =                           (1 << 2),
+       ISO14A_RAW =                            (1 << 3),
+       ISO14A_REQUEST_TRIGGER =        (1 << 4),
+       ISO14A_APPEND_CRC =                     (1 << 5),
+       ISO14A_SET_TIMEOUT =            (1 << 6),
+       ISO14A_NO_SELECT =                      (1 << 7),
+       ISO14A_TOPAZMODE =                      (1 << 8),
+       ISO14A_NO_RATS =                        (1 << 9),
+       ISO14A_CLEAR_TRACE =            (1 << 10)
 } iso14a_command_t;
 
+typedef struct {
+       uint32_t cuid;
+       uint8_t  sector;
+       uint8_t  keytype;
+       uint32_t nonce;
+       uint32_t ar;
+       uint32_t nr;
+       uint32_t at;
+       uint32_t nonce2;
+       uint32_t ar2;
+       uint32_t nr2;
+} nonces_t;
+
 #endif // _MIFARE_H_