github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

@Marshmellow42 's fixes for bigbuf.

Browse source
This commit is contained in:
iceman1001 2015-05-19 18:46:38 +02:00
commit 0a0d9a5828
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
armsrc/mifarecmd.c
View file

@ -249,17 +249,26 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
// datain = KEY bytes // datain = KEY bytes
void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain) void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
{ {
// free eventually allocated BigBuf memory
BigBuf_free();
// clear trace
clear_trace();
// params // params
uint8_t blockNo = arg0; uint8_t blockNo = arg0;
uint16_t blocks = arg1; uint16_t blocks = arg1;
bool useKey = (arg2 == 1); //UL_C bool useKey = (arg2 == 1); //UL_C
bool usePwd = (arg2 == 2); //UL_EV1/NTAG bool usePwd = (arg2 == 2); //UL_EV1/NTAG
uint32_t countblocks = 0; uint32_t countblocks = 0;
uint8_t *dataout = BigBuf_get_addr(); uint8_t *dataout = BigBuf_malloc(CARD_MEMORY_SIZE);
if (dataout == NULL){
Dbprintf("out of memory");
OnError(1);
return;
}
LEDsoff(); LEDsoff();
LED_A_ON(); LED_A_ON();
clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN); iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
int len = iso14443a_select_card(NULL, NULL, NULL); int len = iso14443a_select_card(NULL, NULL, NULL);
@ -293,7 +302,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
} }
for (int i = 0; i < blocks; i++){ for (int i = 0; i < blocks; i++){
if ((i*4) + 4 > BigBuf_get_traceLen()) { if ((i*4) + 4 > CARD_MEMORY_SIZE) {
Dbprintf("Data exceeds buffer!!"); Dbprintf("Data exceeds buffer!!");
break; break;
} }