X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8556b852ed769280d1b63054ab1bd08fa19b746a..e654346b7952ec0a024189c30b657195bf35f7e4:/armsrc/mifareutil.c?ds=sidebyside

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index be36e9db..4f4e978c 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------
-// Merlok, May 2011
+// Merlok, May 2011, 2012
 // Many authors, whom made it possible
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
@@ -77,12 +77,12 @@ uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {
 }
 
 // send commands
-int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer)
+int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t *timing)
 {
-	return mifare_sendcmd_shortex(pcs, crypted, cmd, data, answer, NULL);
+	return mifare_sendcmd_shortex(pcs, crypted, cmd, data, answer, NULL, timing);
 }
 
-int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t * parptr)
+int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t * parptr, uint32_t *timing)
 {
 	uint8_t dcmd[4], ecmd[4];
 	uint32_t pos, par, res;
@@ -101,10 +101,10 @@ int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cm
 			par = (par >> 1) | ( ((filter(pcs->odd) ^ oddparity(dcmd[pos])) & 0x01) * 0x08 );
 		}	
 
-		ReaderTransmitPar(ecmd, sizeof(ecmd), par);
+		ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);
 
 	} else {
-		ReaderTransmit(dcmd, sizeof(dcmd));
+		ReaderTransmit(dcmd, sizeof(dcmd), timing);
 	}
 
 	int len = ReaderReceivePar(answer, &par);
@@ -133,10 +133,10 @@ int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cm
 // mifare commands
 int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested) 
 {
-	return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL);
+	return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL);
 }
 
-int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested, uint32_t * ntptr) 
+int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested, uint32_t * ntptr, uint32_t *timing) 
 {
 	// variables
 	int len;	
@@ -150,8 +150,8 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 	uint8_t* receivedAnswer = mifare_get_bigbufptr();
 
 	// Transmit MIFARE_CLASSIC_AUTH
-	len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer);
-  if (MF_DBGLEVEL >= 4)	Dbprintf("rand nonce len: %x", len);  
+	len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, timing);
+	if (MF_DBGLEVEL >= 4)	Dbprintf("rand nonce len: %x", len);  
 	if (len != 4) return 1;
 	
 	ar[0] = 0x55;
@@ -205,7 +205,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 	}	
 		
 	// Transmit reader nonce and reader answer
-	ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par);
+	ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);
 
 	// Receive 4 bit answer
 	len = ReaderReceive(receivedAnswer);
@@ -235,7 +235,7 @@ int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blo
 	uint8_t* receivedAnswer = mifare_get_bigbufptr();
 	
 	// command MIFARE_CLASSIC_READBLOCK
-	len = mifare_sendcmd_short(pcs, 1, 0x30, blockNo, receivedAnswer);
+	len = mifare_sendcmd_short(pcs, 1, 0x30, blockNo, receivedAnswer, NULL);
 	if (len == 1) {
 		if (MF_DBGLEVEL >= 1)	Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
 		return 1;
@@ -268,7 +268,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
 	uint8_t* receivedAnswer = mifare_get_bigbufptr();
 	
 	// command MIFARE_CLASSIC_WRITEBLOCK
-	len = mifare_sendcmd_short(pcs, 1, 0xA0, blockNo, receivedAnswer);
+	len = mifare_sendcmd_short(pcs, 1, 0xA0, blockNo, receivedAnswer, NULL);
 
 	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
 		if (MF_DBGLEVEL >= 1)	Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
@@ -286,7 +286,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
 		par = (par >> 1) | ( ((filter(pcs->odd) ^ oddparity(d_block[pos])) & 0x01) * 0x20000 );
 	}	
 
-	ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par);
+	ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);
 
 	// Receive the response
 	len = ReaderReceive(receivedAnswer);	
@@ -311,7 +311,7 @@ int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid)
 	// Mifare HALT
 	uint8_t* receivedAnswer = mifare_get_bigbufptr();
 
-	len = mifare_sendcmd_short(pcs, 1, 0x50, 0x00, receivedAnswer);
+	len = mifare_sendcmd_short(pcs, pcs == NULL ? 0:1, 0x50, 0x00, receivedAnswer, NULL);
 	if (len != 0) {
 		if (MF_DBGLEVEL >= 1)	Dbprintf("halt error. response len: %x", len);  
 		return 1;
@@ -339,6 +339,52 @@ void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount) {
 	memcpy(data, emCARD + bytePtr, byteCount);
 }
 
+int emlCheckValBl(int blockNum) {
+	uint8_t* emCARD = eml_get_bigbufptr_cardmem();
+	uint8_t* data = emCARD + blockNum * 16;
+
+	if ((data[0] != (data[4] ^ 0xff)) || (data[0] != data[8]) ||
+			(data[1] != (data[5] ^ 0xff)) || (data[1] != data[9]) ||
+			(data[2] != (data[6] ^ 0xff)) || (data[2] != data[10]) ||
+			(data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||
+			(data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||
+			(data[12] != (data[15] ^ 0xff))
+		 ) 
+		return 1;
+	return 0;
+}
+
+int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {
+	uint8_t* emCARD = eml_get_bigbufptr_cardmem();
+	uint8_t* data = emCARD + blockNum * 16;
+	
+	if (emlCheckValBl(blockNum)) {
+		return 1;
+	}
+	
+	memcpy(blReg, data, 4);
+	*blBlock = data[12];
+	
+	return 0;
+}
+
+int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {
+	uint8_t* emCARD = eml_get_bigbufptr_cardmem();
+	uint8_t* data = emCARD + blockNum * 16;
+	
+	memcpy(data + 0, &blReg, 4);
+	memcpy(data + 8, &blReg, 4);
+	blReg = blReg ^ 0xffffffff;
+	memcpy(data + 4, &blReg, 4);
+	
+	data[12] = blBlock;
+	data[13] = blBlock ^ 0xff;
+	data[14] = blBlock;
+	data[15] = blBlock ^ 0xff;
+	
+	return 0;
+}
+
 uint64_t emlGetKey(int sectorNum, int keyType) {
 	uint8_t key[6];
 	uint8_t* emCARD = eml_get_bigbufptr_cardmem();
@@ -348,18 +394,18 @@ uint64_t emlGetKey(int sectorNum, int keyType) {
 }
 
 void emlClearMem(void) {
-	int i;
+	int b;
 	
 	const uint8_t trailer[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x80, 0x69, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-	const uint8_t empty[] =   {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 	const uint8_t uid[]   =   {0xe6, 0x84, 0x87, 0xf3, 0x16, 0x88, 0x04, 0x00, 0x46, 0x8e, 0x45, 0x55, 0x4d, 0x70, 0x41, 0x04};
-	// fill sectors data
-	for(i = 0; i < 16; i++) {
-		emlSetMem((uint8_t *)empty,   i * 4 + 0, 1);
-		emlSetMem((uint8_t *)empty,   i * 4 + 1, 1);
-		emlSetMem((uint8_t *)empty,   i * 4 + 2, 1);
-		emlSetMem((uint8_t *)trailer, i * 4 + 3, 1);
-	}
+	uint8_t* emCARD = eml_get_bigbufptr_cardmem();
+	
+	memset(emCARD, 0, CARD_MEMORY_LEN);
+	
+	// fill sectors trailer data
+	for(b = 3; b < 256; b<127?(b+=4):(b+=16)) {
+		emlSetMem((uint8_t *)trailer, b , 1);
+	}	
 
 	// uid
 	emlSetMem((uint8_t *)uid, 0, 1);