github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 21:03:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

hf legic: use CMD_ACK instead of Dbprintf

Browse source
This commit is contained in:
András Veres-Szentkirályi 2019-04-11 14:04:29 +02:00
commit 297bc2ce09
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
armsrc/legicrf.c
View file

@ -379,8 +379,9 @@ void LegicRfReader(int offset, int bytes) {
// establish shared secret and detect card type
DbpString("Reading card ...");
uint8_t card_type = setup_phase(SESSION_IV);
uint8_t result = 0;
if(init_card(card_type, &card) != 0) {
Dbprintf("No or unknown card found, aborting");
result = 1;
goto OUT;
}
@ -397,17 +398,14 @@ void LegicRfReader(int offset, int bytes) {
for(uint16_t i = 0; i < bytes; ++i) {
int16_t byte = read_byte(offset + i, card.cmdsize);
if(byte == -1) {
Dbprintf("operation failed @ 0x%03.3x", bytes);
result = 2;
goto OUT;
}
BigBuf[i] = byte;
}
// OK
Dbprintf("Card (MIM %i) read, use 'hf legic decode' or", card.cardsize);
Dbprintf("'data hexsamples %d' to view results", (bytes+7) & ~7);
OUT:
cmd_send(CMD_ACK, result, bytes, 0, &card, sizeof(card));
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LED_B_OFF();
LED_C_OFF();

17
client/cmdhflegic.c
View file

@ -18,6 +18,7 @@
#include "cmdparser.h"
#include "cmdmain.h"
#include "util.h"
#include "../include/legic.h"
static int CmdHelp(const char *Cmd);
@ -214,7 +215,21 @@ int CmdLegicRFRead(const char *Cmd)
if(byte_count + offset > 1024) byte_count = 1024 - offset;
UsbCommand c={CMD_READER_LEGIC_RF, {offset, byte_count, 0}};
SendCommand(&c);
return 0;
UsbCommand resp;
WaitForResponse(CMD_ACK,&resp);
switch (resp.arg[0]) {
case 0:
PrintAndLog("Card (MIM %i) read, use 'hf legic decode' or", ((legic_card_select_t*)resp.d.asBytes)->cardsize);
PrintAndLog("'data hexsamples %d' to view results", (resp.arg[1] + 7) & ~7);
break;
case 1:
PrintAndLog("No or unknown card found, aborting");
break;
case 2:
PrintAndLog("operation failed @ 0x%03.3x", resp.arg[1]);
break;
}
return resp.arg[0];
}
int CmdLegicLoad(const char *Cmd)