*/
int CmdLegicDecode(const char *Cmd)
{
- int h, i, j, k, n;
+ int i, j, k, n;
int segment_len = 0;
int segment_flag = 0;
int stamp_len = 0;
int crc = 0;
int wrp = 0;
int wrc = 0;
- int data_buf[1032]; // receiver buffer
+ uint8_t data_buf[1024]; // receiver buffer
char out_string[3076]; // just use big buffer - bad practice
char token_type[4];
- int delivered = 0;
-
- h = 0;
// copy data from proxmark into buffer
- for (i = 0; i < 256; i += 12, h += 48) {
- UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {i, 0, 0}};
- SendCommand(&c);
- WaitForResponse(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, NULL);
-
- for (j = 0; j < 48; j += 8) {
- for (k = 0; k < 8; k++) {
- data_buf[h+j+k] = sample_buf[j+k];
- }
- delivered += 8;
- if (delivered >= 1024)
- break;
- }
- }
+ GetFromBigBuf(data_buf,sizeof(data_buf),0);
+ WaitForResponse(CMD_ACK,NULL);
// Output CDF System area (9 bytes) plus remaining header area (12 bytes)
int CmdLegicSave(const char *Cmd)
{
- int n;
int requested = 1024;
int offset = 0;
+ int delivered = 0;
char filename[1024];
+ uint8_t got[1024];
+
sscanf(Cmd, " %s %i %i", filename, &requested, &offset);
- if (offset % 4 != 0) {
- PrintAndLog("Offset must be a multiple of 4");
- return 0;
- }
- offset = offset/4;
-
- int delivered = 0;
+ /* If no length given save entire legic read buffer */
+ /* round up to nearest 8 bytes so the saved data can be used with legicload */
if (requested == 0) {
- n = 12;
- requested = 12;
- } else {
- n = requested/4;
+ requested = 1024;
}
-
+ if (requested % 8 != 0) {
+ int remainder = requested % 8;
+ requested = requested + 8 - remainder;
+ }
+
+ if (offset + requested > sizeof(got)) {
+ PrintAndLog("Tried to read past end of buffer, <bytes> + <offset> > 1024");
+ return 0;
+ }
+
FILE *f = fopen(filename, "w");
if(!f) {
PrintAndLog("couldn't open '%s'", Cmd+1);
return -1;
}
- for (int i = offset; i < n+offset; i += 12) {
- UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {i, 0, 0}};
- SendCommand(&c);
- WaitForResponse(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, NULL);
- for (int j = 0; j < 48; j += 8) {
- fprintf(f, "%02x %02x %02x %02x %02x %02x %02x %02x\n",
- sample_buf[j+0],
- sample_buf[j+1],
- sample_buf[j+2],
- sample_buf[j+3],
- sample_buf[j+4],
- sample_buf[j+5],
- sample_buf[j+6],
- sample_buf[j+7]
- );
- delivered += 8;
- if (delivered >= requested)
- break;
- }
+ GetFromBigBuf(got,requested,offset);
+ WaitForResponse(CMD_ACK,NULL);
+
+ for (int j = 0; j < requested; j += 8) {
+ fprintf(f, "%02x %02x %02x %02x %02x %02x %02x %02x\n",
+ got[j+0],
+ got[j+1],
+ got[j+2],
+ got[j+3],
+ got[j+4],
+ got[j+5],
+ got[j+6],
+ got[j+7]
+ );
+ delivered += 8;
if (delivered >= requested)
break;
}