projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #53 from iceman1001/feature
[proxmark3-svn]
/
armsrc
/
mifarecmd.c
diff --git
a/armsrc/mifarecmd.c
b/armsrc/mifarecmd.c
index 470af6a7a9edc9084ac3e5219be651ba76c61e0a..4279e63f2295e0f7e9e03e3cb22453bf1646f0c7 100644
(file)
--- a/
armsrc/mifarecmd.c
+++ b/
armsrc/mifarecmd.c
@@
-104,14
+104,14
@@
void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){
if(!iso14443a_select_card(uid, NULL, &cuid)) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Can't select card");
\r
if(!iso14443a_select_card(uid, NULL, &cuid)) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Can't select card");
\r
- OnError(0);
\r
+
//
OnError(0);
\r
return;
\r
};
\r
\r
if(mifare_ultra_auth1(cuid, dataoutbuf)){
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Authentication part1: Fail.");
\r
return;
\r
};
\r
\r
if(mifare_ultra_auth1(cuid, dataoutbuf)){
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Authentication part1: Fail.");
\r
- OnError(1);
\r
+
//
OnError(1);
\r
return;
\r
}
\r
\r
return;
\r
}
\r
\r
@@
-138,7
+138,7
@@
void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){
if(mifare_ultra_auth2(cuid, key, dataoutbuf)){
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Authentication part2: Fail...");
\r
if(mifare_ultra_auth2(cuid, key, dataoutbuf)){
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Authentication part2: Fail...");
\r
- OnError(1);
\r
+
//
OnError(1);
\r
return;
\r
}
\r
\r
return;
\r
}
\r
\r
@@
-168,21
+168,21
@@
void MifareUReadBlock(uint8_t arg0,uint8_t *datain)
int len = iso14443a_select_card(uid, NULL, &cuid);
\r
if(!len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
\r
int len = iso14443a_select_card(uid, NULL, &cuid);
\r
if(!len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
\r
- OnError(1);
\r
+
//
OnError(1);
\r
return;
\r
};
\r
\r
len = mifare_ultra_readblock(cuid, blockNo, dataout);
\r
if(len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
\r
return;
\r
};
\r
\r
len = mifare_ultra_readblock(cuid, blockNo, dataout);
\r
if(len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
\r
- OnError(2);
\r
+
//
OnError(2);
\r
return;
\r
};
\r
\r
len = mifare_ultra_halt(cuid);
\r
if(len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
\r
return;
\r
};
\r
\r
len = mifare_ultra_halt(cuid);
\r
if(len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
\r
- OnError(3);
\r
+
//
OnError(3);
\r
return;
\r
};
\r
\r
return;
\r
};
\r
\r
@@
-267,11
+267,11
@@
void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)
int count_Pages = 0;
\r
byte_t dataout[176] = {0x00};;
\r
uint8_t uid[10] = {0x00};
\r
int count_Pages = 0;
\r
byte_t dataout[176] = {0x00};;
\r
uint8_t uid[10] = {0x00};
\r
-
uint32_t cuid;
\r
+ uint32_t cuid;
\r
\r
\r
-
LED_A_ON();
\r
-
LED_B_OFF();
\r
-
LED_C_OFF();
\r
+ LED_A_ON();
\r
+ LED_B_OFF();
\r
+ LED_C_OFF();
\r
\r
if (MF_DBGLEVEL >= MF_DBG_ALL)
\r
Dbprintf("Pages %d",Pages);
\r
\r
if (MF_DBGLEVEL >= MF_DBG_ALL)
\r
Dbprintf("Pages %d",Pages);
\r
@@
-284,7
+284,7
@@
void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)
if (!len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Can't select card");
\r
if (!len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Can't select card");
\r
- OnError(1);
\r
+
//
OnError(1);
\r
return;
\r
}
\r
\r
return;
\r
}
\r
\r
@@
-295,7
+295,7
@@
void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)
if (len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Read block %d error",i);
\r
if (len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Read block %d error",i);
\r
- OnError(2);
\r
+
//
OnError(2);
\r
return;
\r
} else {
\r
count_Pages++;
\r
return;
\r
} else {
\r
count_Pages++;
\r
@@
-306,7
+306,7
@@
void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)
if (len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Halt error");
\r
if (len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Halt error");
\r
- OnError(3);
\r
+
//
OnError(3);
\r
return;
\r
}
\r
\r
return;
\r
}
\r
\r
@@
-321,8
+321,8
@@
void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)
len = 176;
\r
\r
cmd_send(CMD_ACK, 1, 0, 0, dataout, len);
\r
len = 176;
\r
\r
cmd_send(CMD_ACK, 1, 0, 0, dataout, len);
\r
-
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
\r
-
LEDsoff();
\r
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
\r
+ LEDsoff();
\r
}
\r
\r
\r
}
\r
\r
\r
@@
-529,11
+529,13
@@
void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
struct Crypto1State mpcs = {0, 0};
\r
struct Crypto1State *pcs;
\r
pcs = &mpcs;
\r
struct Crypto1State mpcs = {0, 0};
\r
struct Crypto1State *pcs;
\r
pcs = &mpcs;
\r
- uint8_t
* receivedAnswer = get_bigbufptr_recvrespbuf()
;
\r
+ uint8_t
receivedAnswer[MAX_MIFARE_FRAME_SIZE]
;
\r
\r
uint32_t auth1_time, auth2_time;
\r
static uint16_t delta_time;
\r
\r
\r
uint32_t auth1_time, auth2_time;
\r
static uint16_t delta_time;
\r
\r
+ // free eventually allocated BigBuf memory
\r
+ BigBuf_free();
\r
// clear trace
\r
iso14a_clear_trace();
\r
iso14a_set_tracing(false);
\r
// clear trace
\r
iso14a_clear_trace();
\r
iso14a_set_tracing(false);
\r
@@
-920,8
+922,8
@@
void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
uint8_t d_block[18] = {0x00};
\r
uint32_t cuid;
\r
\r
uint8_t d_block[18] = {0x00};
\r
uint32_t cuid;
\r
\r
- uint8_t
*receivedAnswer = get_bigbufptr_recvrespbuf()
;
\r
- uint8_t
*receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE
;
\r
+ uint8_t
receivedAnswer[MAX_MIFARE_FRAME_SIZE]
;
\r
+ uint8_t
receivedAnswerPar[MAX_MIFARE_PARITY_SIZE]
;
\r
\r
// reset FPGA and LED
\r
if (workFlags & 0x08) {
\r
\r
// reset FPGA and LED
\r
if (workFlags & 0x08) {
\r
@@
-1039,8
+1041,8
@@
void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
uint8_t data[18] = {0x00};
\r
uint32_t cuid = 0;
\r
\r
uint8_t data[18] = {0x00};
\r
uint32_t cuid = 0;
\r
\r
- uint8_t
* receivedAnswer = get_bigbufptr_recvrespbuf()
;
\r
- uint8_t
*receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE
;
\r
+ uint8_t
receivedAnswer[MAX_MIFARE_FRAME_SIZE]
;
\r
+ uint8_t
receivedAnswerPar[MAX_MIFARE_PARITY_SIZE]
;
\r
\r
if (workFlags & 0x08) {
\r
LED_A_ON();
\r
\r
if (workFlags & 0x08) {
\r
LED_A_ON();
\r
@@
-1104,8
+1106,8
@@
void MifareCIdent(){
// variables
\r
byte_t isOK = 1;
\r
\r
// variables
\r
byte_t isOK = 1;
\r
\r
- uint8_t
* receivedAnswer = get_bigbufptr_recvrespbuf()
;
\r
- uint8_t
*receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE
;
\r
+ uint8_t
receivedAnswer[MAX_MIFARE_FRAME_SIZE]
;
\r
+ uint8_t
receivedAnswerPar[MAX_MIFARE_PARITY_SIZE]
;
\r
\r
ReaderTransmitBitsPar(wupC1,7,0, NULL);
\r
if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
\r
\r
ReaderTransmitBitsPar(wupC1,7,0, NULL);
\r
if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
\r
@@
-1141,14
+1143,14
@@
void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
if(!len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Can't select card");
\r
if(!len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Can't select card");
\r
- OnError(1);
\r
+
//
OnError(1);
\r
return;
\r
};
\r
\r
if(mifare_desfire_des_auth1(cuid, dataout)){
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Authentication part1: Fail.");
\r
return;
\r
};
\r
\r
if(mifare_desfire_des_auth1(cuid, dataout)){
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR)
\r
Dbprintf("Authentication part1: Fail.");
\r
- OnError(4);
\r
+
//
OnError(4);
\r
return;
\r
}
\r
\r
return;
\r
}
\r
\r
@@
-1171,7
+1173,7
@@
void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
if( isOK) {
\r
if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
\r
Dbprintf("Authentication part2: Failed");
\r
if( isOK) {
\r
if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
\r
Dbprintf("Authentication part2: Failed");
\r
- OnError(4);
\r
+
//
OnError(4);
\r
return;
\r
}
\r
\r
return;
\r
}
\r
\r
@@
-1181,4
+1183,4
@@
void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
\r
LEDsoff();
\r
cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
\r
LEDsoff();
\r
-}
\ No newline at end of file
+}
Impressum
,
Datenschutz