X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4888b2819574627efea9bd7d23444d785c5a2077..refs/pull/63/head:/armsrc/mifarecmd.c
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 8541553b..4279e63f 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -15,6 +15,9 @@
#include "mifarecmd.h"
#include "apps.h"
+#include "util.h"
+
+#include "crc.h"
//-----------------------------------------------------------------------------
// Select, Authenticate, Read a MIFARE tag.
@@ -79,55 +82,111 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
LED_B_OFF();
- // Thats it...
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
-void MifareUReadBlock(uint8_t arg0,uint8_t *datain)
-{
- // params
- uint8_t blockNo = arg0;
-
- // variables
+
+void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){
+
byte_t isOK = 0;
- byte_t dataoutbuf[16];
- uint8_t uid[10];
+ byte_t dataoutbuf[16] = {0x00};
+ uint8_t uid[10] = {0x00};
uint32_t cuid;
+
+ LED_A_ON();
+ LED_B_OFF();
+ LED_C_OFF();
- // clear trace
iso14a_clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+ if(!iso14443a_select_card(uid, NULL, &cuid)) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Can't select card");
+ //OnError(0);
+ return;
+ };
+
+ if(mifare_ultra_auth1(cuid, dataoutbuf)){
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Authentication part1: Fail.");
+ //OnError(1);
+ return;
+ }
+
+ isOK = 1;
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+ DbpString("AUTH 1 FINISHED");
+
+ cmd_send(CMD_ACK,isOK,cuid,0,dataoutbuf,11);
+ LEDsoff();
+}
+void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){
+
+ uint32_t cuid = arg0;
+ uint8_t key[16] = {0x00};
+ byte_t isOK = 0;
+ byte_t dataoutbuf[16] = {0x00};
+
+ memcpy(key, datain, 16);
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
+
+ if(mifare_ultra_auth2(cuid, key, dataoutbuf)){
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Authentication part2: Fail...");
+ //OnError(1);
+ return;
+ }
+
+ isOK = 1;
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+ DbpString("AUTH 2 FINISHED");
- while (true) {
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
+ cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,11);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ LEDsoff();
+}
+
+void MifareUReadBlock(uint8_t arg0,uint8_t *datain)
+{
+ uint8_t blockNo = arg0;
+ byte_t dataout[16] = {0x00};
+ uint8_t uid[10] = {0x00};
+ uint32_t cuid;
+
+ LED_A_ON();
+ LED_B_OFF();
+ LED_C_OFF();
+
+ 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_ultra_readblock(cuid, blockNo, dataoutbuf)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block error");
- break;
+ len = mifare_ultra_readblock(cuid, blockNo, dataout);
+ if(len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
+ //OnError(2);
+ return;
};
- if(mifare_ultra_halt(cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
+ len = mifare_ultra_halt(cuid);
+ if(len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
+ //OnError(3);
+ return;
};
- isOK = 1;
- break;
- }
-
- if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED");
-
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
- LED_B_OFF();
+ cmd_send(CMD_ACK,1,0,0,dataout,16);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
@@ -200,58 +259,70 @@ 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;
-
- // variables
- byte_t isOK = 0;
- byte_t dataoutbuf[16 * 4];
- uint8_t uid[10];
- uint32_t cuid;
-
- // clear trace
- iso14a_clear_trace();
-// iso14a_set_tracing(false);
-
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
+ int Pages = arg1;
+ int count_Pages = 0;
+ byte_t dataout[176] = {0x00};;
+ uint8_t uid[10] = {0x00};
+ uint32_t cuid;
- 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++){
- if(mifare_ultra_readblock(cuid, sectorNo * 4 + sec, dataoutbuf + 4 * sec)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block %d error",sec);
- break;
- };
- }
- if(mifare_ultra_halt(cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
+ LED_A_ON();
+ LED_B_OFF();
+ LED_C_OFF();
- isOK = 1;
- break;
- }
-
- if (MF_DBGLEVEL >= 2) DbpString("READ CARD FINISHED");
+ if (MF_DBGLEVEL >= MF_DBG_ALL)
+ Dbprintf("Pages %d",Pages);
+
+ iso14a_clear_trace();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);
- LED_B_OFF();
+ int len = iso14443a_select_card(uid, NULL, &cuid);
+
+ if (!len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Can't select card");
+ //OnError(1);
+ return;
+ }
+
+ for (int i = 0; i < Pages; i++){
+
+ len = mifare_ultra_readblock(cuid, sectorNo * 4 + i, dataout + 4 * i);
+
+ if (len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Read block %d error",i);
+ //OnError(2);
+ return;
+ } else {
+ count_Pages++;
+ }
+ }
+
+ len = mifare_ultra_halt(cuid);
+ if (len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Halt error");
+ //OnError(3);
+ return;
+ }
+
+ if (MF_DBGLEVEL >= MF_DBG_ALL) {
+ Dbprintf("Pages read %d", count_Pages);
+ }
- // Thats it...
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
+ len = 16*4; //64 bytes
+
+ // Read a UL-C
+ if (Pages == 44 && count_Pages > 16)
+ len = 176;
+ cmd_send(CMD_ACK, 1, 0, 0, dataout, len);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ LEDsoff();
}
@@ -331,19 +402,16 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
{
// params
uint8_t blockNo = arg0;
- byte_t blockdata[16];
+ byte_t blockdata[16] = {0x00};
- memset(blockdata,'\0',16);
memcpy(blockdata, datain,16);
// variables
byte_t isOK = 0;
- uint8_t uid[10];
+ uint8_t uid[10] = {0x00};
uint32_t cuid;
- // clear trace
iso14a_clear_trace();
-
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
LED_A_ON();
@@ -372,33 +440,25 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
- LED_B_ON();
cmd_send(CMD_ACK,isOK,0,0,0,0);
- LED_B_OFF();
-
-
- // Thats it...
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
-// iso14a_set_tracing(TRUE);
}
void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
{
// params
uint8_t blockNo = arg0;
- byte_t blockdata[4];
+ byte_t blockdata[4] = {0x00};
memcpy(blockdata, datain,4);
// variables
byte_t isOK = 0;
- uint8_t uid[10];
+ uint8_t uid[10] = {0x00};
uint32_t cuid;
- // clear trace
iso14a_clear_trace();
-
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
LED_A_ON();
@@ -427,11 +487,7 @@ void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
- LED_B_ON();
cmd_send(CMD_ACK,isOK,0,0,0,0);
- LED_B_OFF();
-
- // Thats it...
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
@@ -473,11 +529,13 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
struct Crypto1State mpcs = {0, 0};
struct Crypto1State *pcs;
pcs = &mpcs;
- uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();
+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
uint32_t auth1_time, auth2_time;
static uint16_t delta_time;
+ // free eventually allocated BigBuf memory
+ BigBuf_free();
// clear trace
iso14a_clear_trace();
iso14a_set_tracing(false);
@@ -864,8 +922,8 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
uint8_t d_block[18] = {0x00};
uint32_t cuid;
- uint8_t *receivedAnswer = get_bigbufptr_recvrespbuf();
- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;
+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
// reset FPGA and LED
if (workFlags & 0x08) {
@@ -983,8 +1041,8 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
uint8_t data[18] = {0x00};
uint32_t cuid = 0;
- uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();
- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;
+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
if (workFlags & 0x08) {
LED_A_ON();
@@ -1048,8 +1106,8 @@ void MifareCIdent(){
// variables
byte_t isOK = 1;
- uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();
- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;
+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
ReaderTransmitBitsPar(wupC1,7,0, NULL);
if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
@@ -1071,3 +1129,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();
+}