X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4a79e52c0b9530242d728d182ede1bfdb9625cdc..f38a152863a5eb289acb169c5a38b4b77e87956e:/armsrc/mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 6be5b383..ff853a57 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -2,6 +2,9 @@
 // Merlok - June 2011, 2012
 // Gerhard de Koning Gans - May 2008
 // Hagen Fritsch - June 2010
+// Midnitesnake - Dec 2013
+// Andy Davies  - Apr 2014
+// Iceman - May 2014
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
@@ -12,9 +15,12 @@
 
 #include "mifarecmd.h"
 #include "apps.h"
+#include "util.h"
+#include "desfire.h"
+#include "../common/crc.h"
 
 //-----------------------------------------------------------------------------
-// Select, Authenticate, Read a MIFARE tag. 
+// Select, Authenticaate, Read an MIFARE tag. 
 // read block
 //-----------------------------------------------------------------------------
 void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
@@ -78,7 +84,72 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
+}
 
+
+void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){
+	// variables
+	byte_t isOK = 0;
+	byte_t dataoutbuf[16];
+	uint8_t uid[10];
+	uint32_t cuid;
+    
+	// clear trace
+	iso14a_clear_trace();
+	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+    
+	LED_A_ON();
+	LED_B_OFF();
+	LED_C_OFF();
+	
+
+	if(!iso14443a_select_card(uid, NULL, &cuid)) {
+          if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card, something went wrong before auth");
+	};
+
+	
+	
+	
+	if(mifare_ultra_auth1(cuid, dataoutbuf)){
+	  if (MF_DBGLEVEL >= 1)	Dbprintf("Authentication part1: Fail.");    
+	}
+
+	isOK=1;
+	if (MF_DBGLEVEL >= 2)	DbpString("AUTH 1 FINISHED");
+    
+	LED_B_ON();
+    cmd_send(CMD_ACK,isOK,cuid,0,dataoutbuf,11);
+	LED_B_OFF();
+	  
+	// Thats it...
+	LEDsoff();
+}
+void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){
+	// params
+	uint32_t cuid = arg0;
+	uint8_t key[16]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+	// variables
+	byte_t isOK = 0;
+	byte_t dataoutbuf[16];
+    
+	memcpy(key, datain, 16);
+    
+	LED_A_ON();
+	LED_B_OFF();
+	LED_C_OFF();
+	
+	if(mifare_ultra_auth2(cuid, key, dataoutbuf)){
+	    if (MF_DBGLEVEL >= 1) Dbprintf("Authentication part2: Fail...");    
+	}
+	isOK=1;
+	if (MF_DBGLEVEL >= 2)	DbpString("AUTH 2 FINISHED");
+    
+	LED_B_ON();
+        cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,11);
+	LED_B_OFF();
+    
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
 }
 
 void MifareUReadBlock(uint8_t arg0,uint8_t *datain)
@@ -129,7 +200,6 @@ void MifareUReadBlock(uint8_t arg0,uint8_t *datain)
 	LEDsoff();
 }
 
-
 //-----------------------------------------------------------------------------
 // Select, Authenticate, Read a MIFARE tag. 
 // read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes)
@@ -198,15 +268,15 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 	LEDsoff();
 }
 
-
-void MifareUReadCard(uint8_t arg0, uint8_t *datain)
+void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)
 {
   // params
         uint8_t sectorNo = arg0;
-        
+        int Pages=arg1;
+	int count_Pages=0;
         // variables
         byte_t isOK = 0;
-        byte_t dataoutbuf[16 * 4];
+        byte_t dataoutbuf[44 * 4];
         uint8_t uid[10];
         uint32_t cuid;
 
@@ -218,16 +288,18 @@ void MifareUReadCard(uint8_t arg0, uint8_t *datain)
         LED_A_ON();
         LED_B_OFF();
         LED_C_OFF();
-
+        Dbprintf("Pages %d",Pages);
         while (true) {
                 if(!iso14443a_select_card(uid, NULL, &cuid)) {
                 if (MF_DBGLEVEL >= 1)   Dbprintf("Can't select card");
                         break;
                 };
-		for(int sec=0;sec<16;sec++){
+		for(int sec=0;sec<Pages;sec++){
                     if(mifare_ultra_readblock(cuid, sectorNo * 4 + sec, dataoutbuf + 4 * sec)) {
                     if (MF_DBGLEVEL >= 1)   Dbprintf("Read block %d error",sec);
                         break;
+                    }else{
+		      count_Pages++;
                     };
                 }
                 if(mifare_ultra_halt(cuid)) {
@@ -238,11 +310,13 @@ void MifareUReadCard(uint8_t arg0, uint8_t *datain)
                 isOK = 1;
                 break;
         }
-        
+        Dbprintf("Pages read %d",count_Pages);
         if (MF_DBGLEVEL >= 2) DbpString("READ CARD FINISHED");
 
         LED_B_ON();
-		cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);
+	if (Pages==16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);
+	if (Pages==44 && count_Pages==16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);
+	if (Pages==44 && count_Pages>16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,176);
         LED_B_OFF();
 
         // Thats it...