From: Martin Holst Swende <martin@swende.se>
Date: Thu, 15 Jan 2015 20:50:03 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/iceman1001/ForPm3
X-Git-Tag: v2.0.0-rc1~44^2~12^2
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f164662363901292b83d452b107a4f630473144a

Merge branch 'master' of https://github.com/iceman1001/ForPm3

Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
---

f164662363901292b83d452b107a4f630473144a
diff --cc armsrc/mifarecmd.c
index ecd8728d,470af6a7..22926dcf
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@@ -1061,3 -1127,58 +1127,58 @@@ void MifareCIdent()
  			//
  // DESFIRE
  //
+ 
+ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
+ 
+ 	byte_t dataout[11] = {0x00};
+ 	uint8_t uid[10] = {0x00};
+ 	uint32_t cuid;
+     
+ 	iso14a_clear_trace();
+ 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ 
+ 	int len = iso14443a_select_card(uid, NULL, &cuid);
+ 	if(!len) {
+ 		if (MF_DBGLEVEL >= MF_DBG_ERROR)	
+ 			Dbprintf("Can't select card");
+ 		OnError(1);
+ 		return;
+ 	};
+ 
+ 	if(mifare_desfire_des_auth1(cuid, dataout)){
+ 		if (MF_DBGLEVEL >= MF_DBG_ERROR)	
+ 			Dbprintf("Authentication part1: Fail.");
+ 		OnError(4);
+ 		return;
+ 	}
+ 
+ 	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
+     
+     cmd_send(CMD_ACK,1,cuid,0,dataout, sizeof(dataout));
+ }
+ 
+ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
+ 
+ 	uint32_t cuid = arg0;
+ 	uint8_t key[16] = {0x00};
+ 	byte_t isOK = 0;
+ 	byte_t dataout[12] = {0x00};
+     
+ 	memcpy(key, datain, 16);
+ 	
+ 	isOK = mifare_desfire_des_auth2(cuid, key, dataout);
+ 	
+ 	if( isOK) {
+ 	    if (MF_DBGLEVEL >= MF_DBG_EXTENDED) 
+ 			Dbprintf("Authentication part2: Failed");  
+ 		OnError(4);
+ 		return;
+ 	}
+ 
+ 	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) 
+ 		DbpString("AUTH 2 FINISHED");
+ 
+ 	cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
+ 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ 	LEDsoff();
 -}
++}