projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ADD: NTAG_210, NTAG_212 support / identification. @marshmellow42 's idea.
[proxmark3-svn]
/
armsrc
/
mifarecmd.c
diff --git
a/armsrc/mifarecmd.c
b/armsrc/mifarecmd.c
index fb71b17111c9a8f92490c26917be2614151a13aa..de2b4db29ddb1e46ef0e418c14ecad3b6527d36e 100644
(file)
--- a/
armsrc/mifarecmd.c
+++ b/
armsrc/mifarecmd.c
@@
-101,18
+101,17
@@
void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
return;
\r
};
\r
\r
return;
\r
};
\r
\r
- if(
mifare_ultra_auth(keybytes) == 1
){
\r
+ if(
!mifare_ultra_auth(keybytes)
){
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");
\r
OnError(1);
\r
return;
\r
}
\r
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");
\r
OnError(1);
\r
return;
\r
}
\r
\r
- cmd_send(CMD_ACK,1,0,0,0,0);
\r
-
\r
if (turnOffField) {
\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
\r
LEDsoff();
\r
}
\r
if (turnOffField) {
\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
\r
LEDsoff();
\r
}
\r
+ cmd_send(CMD_ACK,1,0,0,0,0);
\r
}
\r
\r
// Arg0 = BlockNo,
\r
}
\r
\r
// Arg0 = BlockNo,
\r
@@
-142,7
+141,7
@@
void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
uint8_t key[16] = {0x00};
\r
memcpy(key, datain, sizeof(key) );
\r
\r
uint8_t key[16] = {0x00};
\r
memcpy(key, datain, sizeof(key) );
\r
\r
- if (
mifare_ultra_auth(key) == 1 )
{
\r
+ if (
!mifare_ultra_auth(key) )
{
\r
OnError(1);
\r
return;
\r
}
\r
OnError(1);
\r
return;
\r
}
\r
@@
-153,8
+152,7
@@
void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
uint8_t pwd[4] = {0x00};
\r
memcpy(pwd, datain, 4);
\r
uint8_t pack[4] = {0,0,0,0};
\r
uint8_t pwd[4] = {0x00};
\r
memcpy(pwd, datain, 4);
\r
uint8_t pack[4] = {0,0,0,0};
\r
-
\r
- if (mifare_ul_ev1_auth(pwd, pack) == 1){
\r
+ if (!mifare_ul_ev1_auth(pwd, pack)) {
\r
OnError(1);
\r
return;
\r
}
\r
OnError(1);
\r
return;
\r
}
\r
@@
-176,6
+174,7
@@
void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
\r
LEDsoff();
\r
}
\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
\r
LEDsoff();
\r
}
\r
+
\r
//-----------------------------------------------------------------------------
\r
// Select, Authenticate, Read a MIFARE tag.
\r
// read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes)
\r
//-----------------------------------------------------------------------------
\r
// Select, Authenticate, Read a MIFARE tag.
\r
// read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes)
\r
@@
-212,6
+211,7
@@
void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
\r
}
\r
\r
if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
\r
}
\r
\r
+
\r
if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
\r
isOK = 0;
\r
if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
\r
if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
\r
isOK = 0;
\r
if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
\r
@@
-249,17
+249,26
@@
void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
// datain = KEY bytes
\r
void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
\r
{
\r
// datain = KEY bytes
\r
void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
\r
{
\r
+ // free eventually allocated BigBuf memory
\r
+ BigBuf_free();
\r
+ // clear trace
\r
+ clear_trace();
\r
+
\r
// params
\r
uint8_t blockNo = arg0;
\r
uint16_t blocks = arg1;
\r
bool useKey = (arg2 == 1); //UL_C
\r
bool usePwd = (arg2 == 2); //UL_EV1/NTAG
\r
// params
\r
uint8_t blockNo = arg0;
\r
uint16_t blocks = arg1;
\r
bool useKey = (arg2 == 1); //UL_C
\r
bool usePwd = (arg2 == 2); //UL_EV1/NTAG
\r
- int countblocks = 0;
\r
- uint8_t dataout[176] = {0x00};
\r
+ uint32_t countblocks = 0;
\r
+ uint8_t *dataout = BigBuf_malloc(CARD_MEMORY_SIZE);
\r
+ if (dataout == NULL){
\r
+ Dbprintf("out of memory");
\r
+ OnError(1);
\r
+ return;
\r
+ }
\r
\r
LEDsoff();
\r
LED_A_ON();
\r
\r
LEDsoff();
\r
LED_A_ON();
\r
- clear_trace();
\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
\r
\r
int len = iso14443a_select_card(NULL, NULL, NULL);
\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
\r
\r
int len = iso14443a_select_card(NULL, NULL, NULL);
\r
@@
-274,7
+283,7
@@
void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
uint8_t key[16] = {0x00};
\r
memcpy(key, datain, sizeof(key) );
\r
\r
uint8_t key[16] = {0x00};
\r
memcpy(key, datain, sizeof(key) );
\r
\r
- if (
mifare_ultra_auth(key) == 1 )
{
\r
+ if (
!mifare_ultra_auth(key) )
{
\r
OnError(1);
\r
return;
\r
}
\r
OnError(1);
\r
return;
\r
}
\r
@@
-286,19
+295,30
@@
void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
memcpy(pwd, datain, sizeof(pwd));
\r
uint8_t pack[4] = {0,0,0,0};
\r
\r
memcpy(pwd, datain, sizeof(pwd));
\r
uint8_t pack[4] = {0,0,0,0};
\r
\r
- if (
mifare_ul_ev1_auth(pwd, pack) == 1
){
\r
+ if (
!mifare_ul_ev1_auth(pwd, pack)
){
\r
OnError(1);
\r
return;
\r
}
\r
}
\r
\r
for (int i = 0; i < blocks; i++){
\r
OnError(1);
\r
return;
\r
}
\r
}
\r
\r
for (int i = 0; i < blocks; i++){
\r
- len = mifare_ultra_readblock(blockNo * 4 + i, dataout + 4 * i);
\r
+ if ((i*4) + 4 > CARD_MEMORY_SIZE) {
\r
+ Dbprintf("Data exceeds buffer!!");
\r
+ break;
\r
+ }
\r
+
\r
+ len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);
\r
\r
if (len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
\r
\r
if (len) {
\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
\r
+ // if no blocks read - error out
\r
+ if (i==0){
\r
OnError(2);
\r
return;
\r
OnError(2);
\r
return;
\r
+ } else {
\r
+ //stop at last successful read block and return what we got
\r
+ break;
\r
+ }
\r
} else {
\r
countblocks++;
\r
}
\r
} else {
\r
countblocks++;
\r
}
\r
@@
-313,9
+333,8
@@
void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
\r
if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);
\r
\r
\r
if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);
\r
\r
- len = blocks*4;
\r
-
\r
- cmd_send(CMD_ACK, 1, len, 0, dataout, len);
\r
+ countblocks *= 4;
\r
+ cmd_send(CMD_ACK, 1, countblocks, countblocks, 0, 0);
\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
\r
LEDsoff();
\r
}
\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
\r
LEDsoff();
\r
}
\r
@@
-392,7
+411,6
@@
void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
LEDsoff();
\r
}
\r
\r
LEDsoff();
\r
}
\r
\r
-
\r
void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
\r
{
\r
uint8_t blockNo = arg0;
\r
void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
\r
{
\r
uint8_t blockNo = arg0;
\r
@@
-435,7
+453,6
@@
void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
{
\r
uint8_t blockNo = arg0;
\r
byte_t blockdata[4] = {0x00};
\r
{
\r
uint8_t blockNo = arg0;
\r
byte_t blockdata[4] = {0x00};
\r
- uint8_t uid[10] = {0x00};
\r
\r
memcpy(blockdata, datain,4);
\r
\r
\r
memcpy(blockdata, datain,4);
\r
\r
@@
-444,7
+461,7
@@
void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
clear_trace();
\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
\r
\r
clear_trace();
\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
\r
\r
- if(!iso14443a_select_card(
uid
, NULL, NULL)) {
\r
+ if(!iso14443a_select_card(
NULL
, NULL, NULL)) {
\r
if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
\r
OnError(0);
\r
return;
\r
if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
\r
OnError(0);
\r
return;
\r
Impressum
,
Datenschutz