Merge branch 'master' into fix_iso15693_fpga

[proxmark3-svn] / include / mifare.h

diff --git a/include/mifare.h b/include/mifare.h
index b821f32b5cb590ec347e9681ce59727a9cd2631f..dbf5ed39c4bb9194cfd8e66e052b1dfab79cc584 100644 (file)
--- a/include/mifare.h
+++ b/include/mifare.h
@@ -13,6 +13,15 @@
 
 #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
 //-----------------------------------------------------------------------------
@@ -36,7 +45,8 @@ typedef enum ISO14A_COMMAND {
        ISO14A_NO_SELECT =                      (1 << 7),
        ISO14A_TOPAZMODE =                      (1 << 8),
        ISO14A_NO_RATS =                        (1 << 9),
-       ISO14A_CLEAR_TRACE =            (1 << 10)
+       ISO14A_SEND_CHAINING =      (1 << 10),
+       ISO14A_CLEAR_TRACE =            (1 << 11)
 } iso14a_command_t;
 
 typedef struct {