X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/181e6db6a95d4d2a8e09bab5fb2cf62d35333447..a71c68bdf0d117609a1ffd0141d1d682e1ff8e15:/common/protocols.h?ds=sidebyside

diff --git a/common/protocols.h b/common/protocols.h
index 1dd66185..2de52b4d 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -31,6 +31,9 @@ ISO14443B
 	05 = REQB
 	1D = ATTRIB
 	50 = HALT
+	
+	BA = PING (reader -> tag)
+	AB = PONG (tag -> reader)
 SRIX4K (tag does not respond to 05)
 	06 00 = INITIATE
 	0E xx = SELECT ID (xx = Chip-ID)
@@ -88,7 +91,29 @@ NXP/Philips CUSTOM COMMANDS
 	BA = Enable Privacy
 	BB = 64bit Password Protection
 	40 = Long Range CMD (Standard ISO/TR7003:1990)
-		*/
+
+ISO 7816-4 Basic interindustry commands. For command APDU's.
+	B0 = READ BINARY
+	D0 = WRITE BINARY
+	D6 = UPDATE BINARY
+	0E = ERASE BINARY
+	B2 = READ RECORDS
+	D2 = WRITE RECORDS
+	E2 = APPEND RECORD
+	DC = UPDATE RECORD
+	CA = GET DATA
+	DA = PUT DATA
+	A4 = SELECT FILE
+	20 = VERIFY
+	88 = INTERNAL AUTHENTICATION
+	82 = EXTERNAL AUTHENTICATION
+	B4 = GET CHALLENGE
+	70 = MANAGE CHANNEL
+
+	For response APDU's
+	90 00 = OK
+	6x xx = ERROR
+*/
 
 #define ICLASS_CMD_ACTALL           0x0A
 #define ICLASS_CMD_READ_OR_IDENTIFY 0x0C
@@ -109,21 +134,33 @@ NXP/Philips CUSTOM COMMANDS
 #define ISO14443A_CMD_WUPA       0x52
 #define ISO14443A_CMD_ANTICOLL_OR_SELECT     0x93
 #define ISO14443A_CMD_ANTICOLL_OR_SELECT_2   0x95
-#define ISO14443A_CMD_WRITEBLOCK 0xA0 // or 0xA2 ?
+#define ISO14443A_CMD_WRITEBLOCK 0xA0
 #define ISO14443A_CMD_HALT       0x50
 #define ISO14443A_CMD_RATS       0xE0
 
 #define MIFARE_AUTH_KEYA	    0x60
 #define MIFARE_AUTH_KEYB	    0x61
-#define MIFARE_MAGICMODE	    0x40
+#define MIFARE_MAGICWUPC1	    0x40
+#define MIFARE_MAGICWUPC2		0x43
+#define MIFARE_MAGICWIPEC		0x41
 #define MIFARE_CMD_INC          0xC0
 #define MIFARE_CMD_DEC          0xC1
 #define MIFARE_CMD_RESTORE      0xC2
 #define MIFARE_CMD_TRANSFER     0xB0
 
-#define MIFARE_ULC_WRITE        0xA0
+#define MIFARE_ULC_WRITE        0xA2
+//#define MIFARE_ULC__COMP_WRITE  0xA0
 #define MIFARE_ULC_AUTH_1       0x1A
-#define MIFARE_ULC_AUTH_2        0xAF
+#define MIFARE_ULC_AUTH_2       0xAF
+
+#define MIFARE_ULEV1_AUTH		0x1B
+#define MIFARE_ULEV1_VERSION	0x60
+#define MIFARE_ULEV1_FASTREAD	0x3A
+#define MIFARE_ULEV1_READ_CNT	0x39
+#define MIFARE_ULEV1_INCR_CNT	0xA5
+#define MIFARE_ULEV1_READSIG	0x3C
+#define MIFARE_ULEV1_CHECKTEAR	0x3E
+#define MIFARE_ULEV1_VCSL		0x4B
 
 /**
 06 00 = INITIATE
@@ -147,6 +184,8 @@ NXP/Philips CUSTOM COMMANDS
 #define ISO14443B_RESET        0x0C
 #define ISO14443B_COMPLETION   0x0F
 #define ISO14443B_AUTHENTICATE 0x0A
+#define ISO14443B_PING		   0xBA
+#define ISO14443B_PONG		   0xAB
 
 //First byte is 26
 #define ISO15693_INVENTORY     0x01
@@ -166,9 +205,26 @@ NXP/Philips CUSTOM COMMANDS
 #define ISO15693_READ_MULTI_SECSTATUS 0x2C
 
 
-#define ISO_14443A 0
-#define ICLASS     1
-#define ISO_14443B 2
+// Topaz command set:
+#define	TOPAZ_REQA						0x26	// Request
+#define	TOPAZ_WUPA						0x52	// WakeUp
+#define	TOPAZ_RID						0x78	// Read ID
+#define	TOPAZ_RALL						0x00	// Read All (all bytes)
+#define	TOPAZ_READ						0x01	// Read (a single byte)
+#define	TOPAZ_WRITE_E					0x53	// Write-with-erase (a single byte)
+#define	TOPAZ_WRITE_NE					0x1a	// Write-no-erase (a single byte)
+// additional commands for Dynamic Memory Model
+#define TOPAZ_RSEG						0x10	// Read segment
+#define TOPAZ_READ8						0x02	// Read (eight bytes)
+#define TOPAZ_WRITE_E8					0x54	// Write-with-erase (eight bytes)
+#define TOPAZ_WRITE_NE8					0x1B	// Write-no-erase (eight bytes)
+
+
+#define ISO_14443A	0
+#define ICLASS		1
+#define ISO_14443B	2
+#define TOPAZ		3
+#define ISO_7816_4  4
 
 //-- Picopass fuses
 #define FUSE_FPERS   0x80
@@ -180,7 +236,28 @@ NXP/Philips CUSTOM COMMANDS
 #define FUSE_FPROD0  0x02
 #define FUSE_RA      0x01
 
+// ISO 7816-4 Basic interindustry commands. For command APDU's.
+#define ISO7816_READ_BINARY 0xB0
+#define ISO7816_WRITE_BINARY 0xD0
+#define ISO7816_UPDATE_BINARY 0xD6
+#define ISO7816_ERASE_BINARY 0x0E
+#define ISO7816_READ_RECORDS 0xB2
+#define ISO7816_WRITE_RECORDS 0xD2
+#define ISO7816_APPEND_RECORD 0xE2
+#define ISO7816_UPDATE_RECORD 0xDC
+#define ISO7816_GET_DATA 0xCA
+#define ISO7816_PUT_DATA 0xDA
+#define ISO7816_SELECT_FILE 0xA4
+#define ISO7816_VERIFY 0x20
+#define ISO7816_INTERNAL_AUTHENTICATION 0x88
+#define ISO7816_EXTERNAL_AUTHENTICATION 0x82
+#define ISO7816_GET_CHALLENGE 0xB4
+#define ISO7816_MANAGE_CHANNEL 0x70
 
+// ISO7816-4	For response APDU's
+#define ISO7816_OK	0x9000
+//	6x xx = ERROR
+	
 void printIclassDumpInfo(uint8_t* iclass_dump);
 
 #endif // PROTOCOLS_H