Merge pull request #969 from pwpiwi/gcc10_fixes

[proxmark3-svn] / include / mifare.h

diff --git a/include/mifare.h b/include/mifare.h
index ad86886dbc0b69afc29ce453b08ec94be5cd23fb..dbf5ed39c4bb9194cfd8e66e052b1dfab79cc584 100644 (file)
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -13,6 +13,15 @@
 
 #include "common.h"
 
 
 #include "common.h"
 

+#define MF_KEY_A 0
+#define MF_KEY_B 1
+
+#define MF_MAD1_SECTOR 0x00
+#define MF_MAD2_SECTOR 0x10
+
+// Fixed encrypted nonce used for nested attack with fixed nonce tags
+#define NESTED_FIXED_NR_ENC   {0x70, 0x69, 0x77, 0x69}
+

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


@@ -34,7 +43,23 @@ typedef enum ISO14A_COMMAND {
        ISO14A_APPEND_CRC =                     (1 << 5),
        ISO14A_SET_TIMEOUT =            (1 << 6),
        ISO14A_NO_SELECT =                      (1 << 7),
        ISO14A_APPEND_CRC =                     (1 << 5),
        ISO14A_SET_TIMEOUT =            (1 << 6),
        ISO14A_NO_SELECT =                      (1 << 7),

-       ISO14A_TOPAZMODE =                      (1 << 8)
+       ISO14A_TOPAZMODE =                      (1 << 8),
+       ISO14A_NO_RATS =                        (1 << 9),
+       ISO14A_SEND_CHAINING =      (1 << 10),
+       ISO14A_CLEAR_TRACE =            (1 << 11)

 } iso14a_command_t;
 
 } 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_
 #endif // _MIFARE_H_