Merge branch 'master' into fix_iclass_sim

[proxmark3-svn] / common / protocols.h

diff --git a/common/protocols.h b/common/protocols.h
index ab556516a4a4e36443529da45263c5227cc8436c..703855f64c3517c5edcfb0fc294a12c1f9e98b1c 100644 (file)
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -96,7 +96,8 @@ NXP/Philips CUSTOM COMMANDS
 #define ICLASS_CMD_PAGESEL          0x84
 #define ICLASS_CMD_READCHECK_KD     0x88
 #define ICLASS_CMD_READCHECK_KC     0x18
 #define ICLASS_CMD_PAGESEL          0x84
 #define ICLASS_CMD_READCHECK_KD     0x88
 #define ICLASS_CMD_READCHECK_KC     0x18

-#define ICLASS_CMD_CHECK            0x05
+#define ICLASS_CMD_CHECK_KC         0x95
+#define ICLASS_CMD_CHECK_KD         0x05

 #define ICLASS_CMD_DETECT           0x0F
 #define ICLASS_CMD_HALT             0x00
 #define ICLASS_CMD_UPDATE           0x87
 #define ICLASS_CMD_DETECT           0x0F
 #define ICLASS_CMD_HALT             0x00
 #define ICLASS_CMD_UPDATE           0x87


@@ -125,6 +126,10 @@ NXP/Philips CUSTOM COMMANDS
 #define MIFARE_CMD_TRANSFER      0xB0
 
 #define MIFARE_EV1_PERSONAL_UID  0x40
 #define MIFARE_CMD_TRANSFER      0xB0
 
 #define MIFARE_EV1_PERSONAL_UID  0x40

+#define MIFARE_EV1_UIDF0         0x00
+#define MIFARE_EV1_UIDF1         0x40
+#define MIFARE_EV1_UIDF2         0x20
+#define MIFARE_EV1_UIDF3         0x60

 #define MIFARE_EV1_SETMODE       0x43
 
 #define MIFARE_ULC_WRITE         0xA2
 #define MIFARE_EV1_SETMODE       0x43
 
 #define MIFARE_ULC_WRITE         0xA2


@@ -232,6 +237,26 @@ NXP/Philips CUSTOM COMMANDS
 #define TOPAZ_WRITE_E8                                 0x54    // Write-with-erase (eight bytes)
 #define TOPAZ_WRITE_NE8                                        0x1B    // Write-no-erase (eight bytes)
 
 #define TOPAZ_WRITE_E8                                 0x54    // Write-with-erase (eight bytes)
 #define TOPAZ_WRITE_NE8                                        0x1B    // Write-no-erase (eight bytes)
 

+// HITAG1 commands
+#define HITAG1_SET_CCNEW                0xC2    // left 5 bits only
+#define HITAG1_READ_ID                  0x00    // not a real command, consists of 5 bits length, <length> bits partial SN, 8 bits CRC
+#define HITAG1_SELECT                   0x00    // left 5 bits only, followed by 32 bits SN and 8 bits CRC
+#define HITAG1_WRPPAGE                  0x80    // left 4 bits only, followed by 8 bits page and 8 bits CRC
+#define HITAG1_WRPBLK                   0x90    // left 4 bits only, followed by 8 bits block and 8 bits CRC
+#define HITAG1_WRCPAGE                  0xA0    // left 4 bits only, followed by 8 bits page or key information and 8 bits CRC
+#define HITAG1_WRCBLK                   0xB0    // left 4 bits only, followed by 8 bits block and 8 bits CRC
+#define HITAG1_RDPPAGE                  0xC0    // left 4 bits only, followed by 8 bits page and 8 bits CRC
+#define HITAG1_RDPBLK                   0xD0    // left 4 bits only, followed by 8 bits block and 8 bits CRC
+#define HITAG1_RDCPAGE                  0xE0    // left 4 bits only, followed by 8 bits page and 8 bits CRC
+#define HITAG1_RDCBLK                   0xF0    // left 4 bits only, followed by 8 bits block and 8 bits CRC
+#define HITAG1_HALT                     0x70    // left 4 bits only, followed by 8 bits (dummy) page and 8 bits CRC
+
+// HITAG2 commands
+#define HITAG2_START_AUTH               0xC0    // left 5 bits only
+#define HITAG2_READ_PAGE                0xC0    // page number in bits 5 to 3, page number inverted in bit 0 and following 2 bits
+#define HITAG2_READ_PAGE_INVERTED       0x44    // page number in bits 5 to 3, page number inverted in bit 0 and following 2 bits
+#define HITAG2_WRITE_PAGE               0x82    // page number in bits 5 to 3, page number inverted in bit 0 and following 2 bits
+#define HITAG2_HALT                     0x00    // left 5 bits only

 
 #define ISO_14443A    0
 #define ICLASS        1
 
 #define ISO_14443A    0
 #define ICLASS        1