X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7c5f70dd9f8805967628f429f96fe1159a8bb827..8297860e256cd7d42cf0672ae40b7a391678e593:/armsrc/mifaredesfire.c?ds=sidebyside
diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index 155538cb..fb486477 100644
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -1,5 +1,6 @@
#include "mifaredesfire.h"
#include "des.h"
+#include "BigBuf.h"
#define MAX_APPLICATION_COUNT 28
#define MAX_FILE_COUNT 16
@@ -18,23 +19,20 @@ static uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};
//static uint8_t __res[MAX_FRAME_SIZE];
bool InitDesfireCard(){
-
- // Make sure it is off.
-// FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-// SpinDelay(300);
- byte_t cardbuf[USB_CMD_DATA_SIZE];
- memset(cardbuf,0,sizeof(cardbuf));
+ byte_t cardbuf[USB_CMD_DATA_SIZE] = {0x00};
+
iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;
- iso14a_set_tracing(TRUE);
+ set_tracing(TRUE);
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
int len = iso14443a_select_card(NULL,card,NULL);
if (!len) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- OnError();
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Can't select card");
+ OnError(1);
return false;
}
return true;
@@ -68,7 +66,7 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
}
if ( flags & CLEARTRACE ){
- iso14a_clear_trace();
+ clear_trace();
}
if ( flags & INIT ){
@@ -82,7 +80,7 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
}
if ( !len ) {
- OnError();
+ OnError(2);
return;
}
@@ -99,13 +97,9 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
void MifareDesfireGetInformation(){
int len = 0;
- uint8_t resp[USB_CMD_DATA_SIZE];
- uint8_t dataout[USB_CMD_DATA_SIZE];
- byte_t cardbuf[USB_CMD_DATA_SIZE];
-
- memset(resp,0,sizeof(resp));
- memset(dataout,0, sizeof(dataout));
- memset(cardbuf,0,sizeof(cardbuf));
+ uint8_t resp[USB_CMD_DATA_SIZE] = {0x00};
+ uint8_t dataout[USB_CMD_DATA_SIZE] = {0x00};
+ byte_t cardbuf[USB_CMD_DATA_SIZE] = {0x00};
/*
1 = PCB 1
@@ -116,18 +110,18 @@ void MifareDesfireGetInformation(){
PCB == 0x0A because sending CID byte.
CID == 0x00 first card?
*/
- iso14a_clear_trace();
- iso14a_set_tracing(TRUE);
+ clear_trace();
+ set_tracing(TRUE);
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
// card select - information
iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;
byte_t isOK = iso14443a_select_card(NULL, card, NULL);
if ( isOK == 0) {
- if (MF_DBGLEVEL >= 1) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) {
Dbprintf("Can't select card");
}
- OnError();
+ OnError(1);
return;
}
@@ -143,7 +137,7 @@ void MifareDesfireGetInformation(){
len = DesfireAPDU(cmd, cmd_len, resp);
if ( !len ) {
print_result("ERROR <--: ", resp, len);
- OnError();
+ OnError(2);
return;
}
@@ -156,7 +150,7 @@ void MifareDesfireGetInformation(){
len = DesfireAPDU(cmd, cmd_len, resp);
if ( !len ) {
print_result("ERROR <--: ", resp, len);
- OnError();
+ OnError(2);
return;
}
@@ -168,7 +162,7 @@ void MifareDesfireGetInformation(){
len = DesfireAPDU(cmd, cmd_len, resp);
if ( !len ) {
print_result("ERROR <--: ", resp, len);
- OnError();
+ OnError(2);
return;
}
@@ -191,7 +185,6 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
//uint8_t new_key_data8[8] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77};
//uint8_t new_key_data16[16] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF};
- //uint8_t* bigbuffer = get_bigbufptr_recvrespbuf();
uint8_t resp[256] = {0x00};
uint8_t IV[16] = {0x00};
@@ -205,10 +198,6 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
uint8_t encBoth[32] = {0x00};
InitDesfireCard();
-
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
// 3 olika sätt att authenticera. AUTH (CRC16) , AUTH_ISO (CRC32) , AUTH_AES (CRC32)
// 4 olika crypto algo DES, 3DES, 3K3DES, AES
@@ -219,7 +208,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
case 1:{
if (algo == 1) {
- uint8_t keybytes[8];
+ uint8_t keybytes[8] = {0x00};
uint8_t RndA[8] = {0x00};
uint8_t RndB[8] = {0x00};
@@ -237,17 +226,17 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
cmd[1] = keyno; //keynumber
len = DesfireAPDU(cmd, 2, resp);
if ( !len ) {
- if (MF_DBGLEVEL >= 1) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) {
DbpString("Authentication failed. Card timeout.");
}
- OnError();
+ OnError(3);
return;
}
if ( resp[2] == 0xaf ){
} else {
DbpString("Authetication failed. Invalid key number.");
- OnError();
+ OnError(3);
return;
}
@@ -268,7 +257,6 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
for (int x = 0; x < 8; x++) {
decRndB[x] = decRndB[x] ^ encRndA[x];
-
}
des_dec(&encRndB, &decRndB, key->data);
@@ -280,10 +268,10 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
len = DesfireAPDU(cmd, 17, resp);
if ( !len ) {
- if (MF_DBGLEVEL >= 1) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) {
DbpString("Authentication failed. Card timeout.");
}
- OnError();
+ OnError(3);
return;
}
@@ -300,7 +288,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
for (int x = 0; x < 8; x++) {
if (decRndA[x] != encRndA[x]) {
DbpString("Authetication failed. Cannot varify PICC.");
- OnError();
+ OnError(4);
return;
}
}
@@ -353,7 +341,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
} else {
DbpString("Authetication failed.");
- OnError();
+ OnError(6);
return;
}
@@ -366,14 +354,14 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
case 3:{
//defaultkey
- uint8_t keybytes[16];
+ uint8_t keybytes[16] = {0x00};
if (datain[1] == 0xff){
memcpy(keybytes,PICC_MASTER_KEY16,16);
} else{
memcpy(keybytes, datain+1, datalen);
}
- struct desfire_key defaultkey = {0};
+ struct desfire_key defaultkey = {0x00};
desfirekey_t key = &defaultkey;
Desfire_aes_key_new( keybytes, key);
@@ -382,7 +370,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
if( MF_DBGLEVEL >= 4) {
Dbprintf("AES context failed to init");
}
- OnError();
+ OnError(7);
return;
}
@@ -390,10 +378,10 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
cmd[1] = 0x00; //keynumber
len = DesfireAPDU(cmd, 2, resp);
if ( !len ) {
- if (MF_DBGLEVEL >= 1) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) {
DbpString("Authentication failed. Card timeout.");
}
- OnError();
+ OnError(3);
return;
}
@@ -411,10 +399,10 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
len = DesfireAPDU(cmd, 33, resp); // 1 + 32 == 33
if ( !len ) {
- if (MF_DBGLEVEL >= 1) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) {
DbpString("Authentication failed. Card timeout.");
}
- OnError();
+ OnError(3);
return;
}
@@ -426,10 +414,9 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain
print_result("SESSION : ", skey->data, 16);
} else {
DbpString("Authetication failed.");
- OnError();
+ OnError(7);
return;
}
-
break;
}
}
@@ -446,10 +433,10 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
size_t len = 0;
size_t wrappedLen = 0;
- uint8_t wCmd[USB_CMD_DATA_SIZE] = {0};
+ uint8_t wCmd[USB_CMD_DATA_SIZE] = {0x00};
- uint8_t *resp = ((uint8_t *)BigBuf) + RECV_RESP_OFFSET;
- uint8_t *resp_par = ((uint8_t *)BigBuf) + RECV_RESP_PAR_OFFSET;
+ uint8_t resp[MAX_FRAME_SIZE];
+ uint8_t par[MAX_PARITY_SIZE];
wrappedLen = CreateAPDU( cmd, cmd_len, wCmd);
@@ -458,7 +445,7 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
}
ReaderTransmit( wCmd, wrappedLen, NULL);
- len = ReaderReceive(resp, resp_par);
+ len = ReaderReceive(resp, par);
if( len == 0x00 ){
if (MF_DBGLEVEL >= 4) {
@@ -512,10 +499,11 @@ void OnSuccess(){
LEDsoff();
}
-void OnError(){
+void OnError(uint8_t reason){
pcb_blocknum = 0;
ReaderTransmit(deselect_cmd, 3 , NULL);
+
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- cmd_send(CMD_ACK,0,0,0,0,0);
+ cmd_send(CMD_ACK,0,reason,0,0,0);
LEDsoff();
}