dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHG: changed to use BigBuff_Eml memory instead of big_buff_malloc.

Browse Source 
CHG: downloading eml memory from device should use uint's
CHG: "hf legic read" has a different printing. It now prints 32bytes / row
This commit is contained in:
iceman1001
2016-10-03 23:24:59 +02:00
parent 44d9c722f0
commit 0b0b182fe2
4 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client/cmdhflegic.c
View File

@@ -414,7 +414,7 @@ int CmdLegicRFRead(const char *Cmd) {
PrintAndLog("LSB of IV must be SET");
}
//PrintAndLog("Using IV: 0x%02x | Offset: 0x%02x | Len: 0x%02x ", IV, offset, len);
//PrintAndLog("Using IV: 0x%02x", IV);
UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, IV}};
clearCommandBuffer();
@@ -424,12 +424,24 @@ int CmdLegicRFRead(const char *Cmd) {
uint8_t isOK = resp.arg[0] & 0xFF;
uint16_t len = resp.arg[1] & 0x3FF;
if ( isOK ) {
PrintAndLog("use 'hf legic decode'");
uint8_t *data = resp.d.asBytes;
PrintAndLog("\nData |");
uint8_t *data = malloc(len);
if ( !data ){
PrintAndLog("Cannot allocate memory");
return 2;
}
// copy data from device
GetEMLFromBigBuf(data, len, 0);
if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2000)){
PrintAndLog("Command execute timeout");
if ( data )
free(data);
return 1;
}
PrintAndLog("\nData");
PrintAndLog("-----------------------------");
PrintAndLog(" %s|\n", sprint_hex(data, len));
print_hex_break( data, len, 32);
} else {
PrintAndLog("failed reading tag");
}

2
client/data.c
View File

@@ -23,7 +23,7 @@ void GetFromBigBuf(uint8_t *dest, int bytes, int start_index) {
clearCommandBuffer();
SendCommand(&c);
}
void GetEMLFromBigBuf(uint8_t *dest, int bytes, int start_index) {
void GetEMLFromBigBuf(uint8_t *dest, uint32_t bytes, uint32_t start_index) {
sample_buf = dest;
UsbCommand c = {CMD_DOWNLOAD_EML_BIGBUF, {start_index, bytes, 0}};
clearCommandBuffer();

2
client/data.h
View File

@@ -14,5 +14,5 @@
#include "util.h"
extern uint8_t* sample_buf;
void GetFromBigBuf(uint8_t *dest, int bytes, int start_index);
void GetEMLFromBigBuf(uint8_t *dest, int bytes, int start_index);
void GetEMLFromBigBuf(uint8_t *dest, uint32_t bytes, uint32_t start_index);
#endif