2010-02-21 08:47:22 +08:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
|
|
|
|
//
|
|
|
|
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
|
|
|
|
// at your option, any later version. See the LICENSE.txt file for the text of
|
|
|
|
// the license.
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// High frequency ISO14443B commands
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "iso14443crc.h"
|
2012-12-05 07:39:18 +08:00
|
|
|
#include "proxmark3.h"
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
#include "data.h"
|
|
|
|
#include "graph.h"
|
2015-01-05 22:51:27 +08:00
|
|
|
#include "util.h"
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
#include "ui.h"
|
|
|
|
#include "cmdparser.h"
|
|
|
|
#include "cmdhf14b.h"
|
2013-09-02 02:41:05 +08:00
|
|
|
#include "cmdmain.h"
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
|
|
|
|
static int CmdHelp(const char *Cmd);
|
|
|
|
|
|
|
|
int CmdHF14BDemod(const char *Cmd)
|
|
|
|
{
|
|
|
|
int i, j, iold;
|
|
|
|
int isum, qsum;
|
|
|
|
int outOfWeakAt;
|
|
|
|
bool negateI, negateQ;
|
|
|
|
|
|
|
|
uint8_t data[256];
|
|
|
|
int dataLen = 0;
|
|
|
|
|
|
|
|
// As received, the samples are pairs, correlations against I and Q
|
|
|
|
// square waves. So estimate angle of initial carrier (or just
|
|
|
|
// quadrant, actually), and then do the demod.
|
|
|
|
|
|
|
|
// First, estimate where the tag starts modulating.
|
|
|
|
for (i = 0; i < GraphTraceLen; i += 2) {
|
|
|
|
if (abs(GraphBuffer[i]) + abs(GraphBuffer[i + 1]) > 40) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (i >= GraphTraceLen) {
|
|
|
|
PrintAndLog("too weak to sync");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
PrintAndLog("out of weak at %d", i);
|
|
|
|
outOfWeakAt = i;
|
|
|
|
|
|
|
|
// Now, estimate the phase in the initial modulation of the tag
|
|
|
|
isum = 0;
|
|
|
|
qsum = 0;
|
|
|
|
for (; i < (outOfWeakAt + 16); i += 2) {
|
|
|
|
isum += GraphBuffer[i + 0];
|
|
|
|
qsum += GraphBuffer[i + 1];
|
|
|
|
}
|
|
|
|
negateI = (isum < 0);
|
|
|
|
negateQ = (qsum < 0);
|
|
|
|
|
|
|
|
// Turn the correlation pairs into soft decisions on the bit.
|
|
|
|
j = 0;
|
|
|
|
for (i = 0; i < GraphTraceLen / 2; i++) {
|
|
|
|
int si = GraphBuffer[j];
|
|
|
|
int sq = GraphBuffer[j + 1];
|
|
|
|
if (negateI) si = -si;
|
|
|
|
if (negateQ) sq = -sq;
|
|
|
|
GraphBuffer[i] = si + sq;
|
|
|
|
j += 2;
|
|
|
|
}
|
|
|
|
GraphTraceLen = i;
|
|
|
|
|
|
|
|
i = outOfWeakAt / 2;
|
|
|
|
while (GraphBuffer[i] > 0 && i < GraphTraceLen)
|
|
|
|
i++;
|
|
|
|
if (i >= GraphTraceLen) goto demodError;
|
|
|
|
|
|
|
|
iold = i;
|
|
|
|
while (GraphBuffer[i] < 0 && i < GraphTraceLen)
|
|
|
|
i++;
|
|
|
|
if (i >= GraphTraceLen) goto demodError;
|
|
|
|
if ((i - iold) > 23) goto demodError;
|
|
|
|
|
|
|
|
PrintAndLog("make it to demod loop");
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
iold = i;
|
|
|
|
while (GraphBuffer[i] >= 0 && i < GraphTraceLen)
|
|
|
|
i++;
|
|
|
|
if (i >= GraphTraceLen) goto demodError;
|
|
|
|
if ((i - iold) > 6) goto demodError;
|
|
|
|
|
|
|
|
uint16_t shiftReg = 0;
|
|
|
|
if (i + 20 >= GraphTraceLen) goto demodError;
|
|
|
|
|
|
|
|
for (j = 0; j < 10; j++) {
|
|
|
|
int soft = GraphBuffer[i] + GraphBuffer[i + 1];
|
|
|
|
|
|
|
|
if (abs(soft) < (abs(isum) + abs(qsum)) / 20) {
|
|
|
|
PrintAndLog("weak bit");
|
|
|
|
}
|
|
|
|
|
|
|
|
shiftReg >>= 1;
|
|
|
|
if(GraphBuffer[i] + GraphBuffer[i+1] >= 0) {
|
|
|
|
shiftReg |= 0x200;
|
|
|
|
}
|
|
|
|
|
|
|
|
i+= 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((shiftReg & 0x200) && !(shiftReg & 0x001))
|
|
|
|
{
|
|
|
|
// valid data byte, start and stop bits okay
|
|
|
|
PrintAndLog(" %02x", (shiftReg >> 1) & 0xff);
|
|
|
|
data[dataLen++] = (shiftReg >> 1) & 0xff;
|
|
|
|
if (dataLen >= sizeof(data)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
} else if (shiftReg == 0x000) {
|
|
|
|
// this is EOF
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
goto demodError;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
uint8_t first, second;
|
|
|
|
ComputeCrc14443(CRC_14443_B, data, dataLen-2, &first, &second);
|
|
|
|
PrintAndLog("CRC: %02x %02x (%s)\n", first, second,
|
|
|
|
(first == data[dataLen-2] && second == data[dataLen-1]) ?
|
|
|
|
"ok" : "****FAIL****");
|
|
|
|
|
|
|
|
RepaintGraphWindow();
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
demodError:
|
|
|
|
PrintAndLog("demod error");
|
|
|
|
RepaintGraphWindow();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHF14BList(const char *Cmd)
|
|
|
|
{
|
2015-01-08 05:00:29 +08:00
|
|
|
uint8_t got[TRACE_BUFFER_SIZE];
|
2012-09-18 21:52:50 +08:00
|
|
|
GetFromBigBuf(got,sizeof(got),0);
|
2013-09-17 02:38:47 +08:00
|
|
|
WaitForResponse(CMD_ACK,NULL);
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
|
|
|
|
PrintAndLog("recorded activity:");
|
|
|
|
PrintAndLog(" time :rssi: who bytes");
|
|
|
|
PrintAndLog("---------+----+----+-----------");
|
|
|
|
|
|
|
|
int i = 0;
|
|
|
|
int prev = -1;
|
|
|
|
|
|
|
|
for(;;) {
|
2015-01-08 05:00:29 +08:00
|
|
|
|
|
|
|
if(i >= TRACE_BUFFER_SIZE) { break; }
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
|
|
|
|
bool isResponse;
|
|
|
|
int timestamp = *((uint32_t *)(got+i));
|
|
|
|
if(timestamp & 0x80000000) {
|
|
|
|
timestamp &= 0x7fffffff;
|
|
|
|
isResponse = 1;
|
|
|
|
} else {
|
|
|
|
isResponse = 0;
|
|
|
|
}
|
|
|
|
int metric = *((uint32_t *)(got+i+4));
|
|
|
|
|
|
|
|
int len = got[i+8];
|
|
|
|
|
|
|
|
if(len > 100) {
|
|
|
|
break;
|
|
|
|
}
|
2015-01-08 05:00:29 +08:00
|
|
|
if(i + len >= TRACE_BUFFER_SIZE) {
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint8_t *frame = (got+i+9);
|
|
|
|
|
2014-02-20 04:35:04 +08:00
|
|
|
// Break and stick with current result if buffer was not completely full
|
|
|
|
if (frame[0] == 0x44 && frame[1] == 0x44 && frame[2] == 0x44 && frame[3] == 0x44) break;
|
|
|
|
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
char line[1000] = "";
|
|
|
|
int j;
|
|
|
|
for(j = 0; j < len; j++) {
|
|
|
|
sprintf(line+(j*3), "%02x ", frame[j]);
|
|
|
|
}
|
|
|
|
|
|
|
|
char *crc;
|
|
|
|
if(len > 2) {
|
|
|
|
uint8_t b1, b2;
|
|
|
|
ComputeCrc14443(CRC_14443_B, frame, len-2, &b1, &b2);
|
|
|
|
if(b1 != frame[len-2] || b2 != frame[len-1]) {
|
|
|
|
crc = "**FAIL CRC**";
|
|
|
|
} else {
|
|
|
|
crc = "";
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
crc = "(SHORT)";
|
|
|
|
}
|
|
|
|
|
|
|
|
char metricString[100];
|
|
|
|
if(isResponse) {
|
|
|
|
sprintf(metricString, "%3d", metric);
|
|
|
|
} else {
|
|
|
|
strcpy(metricString, " ");
|
|
|
|
}
|
|
|
|
|
|
|
|
PrintAndLog(" +%7d: %s: %s %s %s",
|
|
|
|
(prev < 0 ? 0 : timestamp - prev),
|
|
|
|
metricString,
|
|
|
|
(isResponse ? "TAG" : " "), line, crc);
|
|
|
|
|
|
|
|
prev = timestamp;
|
|
|
|
i += (len + 9);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHF14BRead(const char *Cmd)
|
|
|
|
{
|
|
|
|
UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443, {strtol(Cmd, NULL, 0), 0, 0}};
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHF14Sim(const char *Cmd)
|
|
|
|
{
|
|
|
|
UsbCommand c={CMD_SIMULATE_TAG_ISO_14443};
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHFSimlisten(const char *Cmd)
|
|
|
|
{
|
|
|
|
UsbCommand c = {CMD_SIMULATE_TAG_HF_LISTEN};
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHF14BSnoop(const char *Cmd)
|
|
|
|
{
|
|
|
|
UsbCommand c = {CMD_SNOOP_ISO_14443};
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* New command to read the contents of a SRI512 tag
|
|
|
|
* SRI512 tags are ISO14443-B modulated memory tags,
|
|
|
|
* this command just dumps the contents of the memory
|
|
|
|
*/
|
|
|
|
int CmdSri512Read(const char *Cmd)
|
|
|
|
{
|
|
|
|
UsbCommand c = {CMD_READ_SRI512_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* New command to read the contents of a SRIX4K tag
|
|
|
|
* SRIX4K tags are ISO14443-B modulated memory tags,
|
|
|
|
* this command just dumps the contents of the memory/
|
|
|
|
*/
|
|
|
|
int CmdSrix4kRead(const char *Cmd)
|
|
|
|
{
|
|
|
|
UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-09-02 02:41:05 +08:00
|
|
|
int CmdHF14BCmdRaw (const char *cmd) {
|
|
|
|
UsbCommand resp;
|
|
|
|
uint8_t *recv;
|
|
|
|
UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv?
|
|
|
|
uint8_t reply=1;
|
|
|
|
uint8_t crc=0;
|
|
|
|
uint8_t power=0;
|
|
|
|
char buf[5]="";
|
|
|
|
int i=0;
|
|
|
|
uint8_t data[100];
|
|
|
|
unsigned int datalen=0, temp;
|
|
|
|
char *hexout;
|
|
|
|
|
|
|
|
if (strlen(cmd)<3) {
|
|
|
|
PrintAndLog("Usage: hf 14b raw [-r] [-c] [-p] <0A 0B 0C ... hex>");
|
|
|
|
PrintAndLog(" -r do not read response");
|
|
|
|
PrintAndLog(" -c calculate and append CRC");
|
|
|
|
PrintAndLog(" -p leave the field on after receive");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// strip
|
|
|
|
while (*cmd==' ' || *cmd=='\t') cmd++;
|
|
|
|
|
|
|
|
while (cmd[i]!='\0') {
|
|
|
|
if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
|
|
|
|
if (cmd[i]=='-') {
|
|
|
|
switch (cmd[i+1]) {
|
|
|
|
case 'r':
|
|
|
|
case 'R':
|
|
|
|
reply=0;
|
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
case 'C':
|
|
|
|
crc=1;
|
|
|
|
break;
|
|
|
|
case 'p':
|
|
|
|
case 'P':
|
|
|
|
power=1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
PrintAndLog("Invalid option");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
i+=2;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if ((cmd[i]>='0' && cmd[i]<='9') ||
|
|
|
|
(cmd[i]>='a' && cmd[i]<='f') ||
|
|
|
|
(cmd[i]>='A' && cmd[i]<='F') ) {
|
|
|
|
buf[strlen(buf)+1]=0;
|
|
|
|
buf[strlen(buf)]=cmd[i];
|
|
|
|
i++;
|
|
|
|
|
|
|
|
if (strlen(buf)>=2) {
|
|
|
|
sscanf(buf,"%x",&temp);
|
|
|
|
data[datalen]=(uint8_t)(temp & 0xff);
|
|
|
|
datalen++;
|
|
|
|
*buf=0;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
PrintAndLog("Invalid char on input");
|
|
|
|
return 0;
|
|
|
|
}
|
2013-10-20 19:46:51 +08:00
|
|
|
if (datalen == 0)
|
|
|
|
{
|
|
|
|
PrintAndLog("Missing data input");
|
|
|
|
return 0;
|
|
|
|
}
|
2013-09-02 02:41:05 +08:00
|
|
|
if(crc)
|
|
|
|
{
|
|
|
|
uint8_t first, second;
|
|
|
|
ComputeCrc14443(CRC_14443_B, data, datalen, &first, &second);
|
|
|
|
data[datalen++] = first;
|
|
|
|
data[datalen++] = second;
|
|
|
|
}
|
|
|
|
|
|
|
|
c.arg[0] = datalen;
|
|
|
|
c.arg[1] = reply;
|
|
|
|
c.arg[2] = power;
|
|
|
|
memcpy(c.d.asBytes,data,datalen);
|
|
|
|
|
|
|
|
SendCommand(&c);
|
|
|
|
|
|
|
|
if (reply) {
|
|
|
|
if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
|
|
|
|
recv = resp.d.asBytes;
|
|
|
|
PrintAndLog("received %i octets",resp.arg[0]);
|
|
|
|
if(!resp.arg[0])
|
|
|
|
return 0;
|
|
|
|
hexout = (char *)malloc(resp.arg[0] * 3 + 1);
|
|
|
|
if (hexout != NULL) {
|
|
|
|
uint8_t first, second;
|
|
|
|
for (int i = 0; i < resp.arg[0]; i++) { // data in hex
|
2013-09-25 18:40:16 +08:00
|
|
|
sprintf(&hexout[i * 3], "%02X ", recv[i]);
|
2013-09-02 02:41:05 +08:00
|
|
|
}
|
|
|
|
PrintAndLog("%s", hexout);
|
|
|
|
free(hexout);
|
|
|
|
ComputeCrc14443(CRC_14443_B, recv, resp.arg[0]-2, &first, &second);
|
|
|
|
if(recv[resp.arg[0]-2]==first && recv[resp.arg[0]-1]==second) {
|
|
|
|
PrintAndLog("CRC OK");
|
|
|
|
} else {
|
|
|
|
PrintAndLog("CRC failed");
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
PrintAndLog("malloc failed your client has low memory?");
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
PrintAndLog("timeout while waiting for reply.");
|
|
|
|
}
|
|
|
|
} // if reply
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-01-05 22:51:27 +08:00
|
|
|
int CmdHF14BWrite( const char *Cmd){
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For SRIX4K blocks 00 - 7F
|
|
|
|
* hf 14b raw -c -p 09 $srix4kwblock $srix4kwdata
|
|
|
|
*
|
|
|
|
* For SR512 blocks 00 - 0F
|
|
|
|
* hf 14b raw -c -p 09 $sr512wblock $sr512wdata
|
|
|
|
*
|
|
|
|
* Special block FF = otp_lock_reg block.
|
|
|
|
* Data len 4 bytes-
|
|
|
|
*/
|
|
|
|
char cmdp = param_getchar(Cmd, 0);
|
|
|
|
uint8_t blockno = -1;
|
|
|
|
uint8_t data[4] = {0x00};
|
|
|
|
bool isSrix4k = true;
|
|
|
|
char str[20];
|
|
|
|
|
2015-01-08 05:56:20 +08:00
|
|
|
if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') {
|
2015-01-05 22:51:27 +08:00
|
|
|
PrintAndLog("Usage: hf 14b write <1|2> <BLOCK> <DATA>");
|
2015-01-08 05:56:20 +08:00
|
|
|
PrintAndLog(" [1 = SRIX4K]");
|
|
|
|
PrintAndLog(" [2 = SRI512]");
|
|
|
|
PrintAndLog(" [BLOCK number depends on tag, special block == FF]");
|
|
|
|
PrintAndLog(" sample: hf 14b write 1 7F 11223344");
|
|
|
|
PrintAndLog(" : hf 14b write 1 FF 11223344");
|
|
|
|
PrintAndLog(" : hf 14b write 2 15 11223344");
|
|
|
|
PrintAndLog(" : hf 14b write 2 FF 11223344");
|
2015-01-05 22:51:27 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-01-08 05:56:20 +08:00
|
|
|
if ( cmdp == '2' )
|
2015-01-05 22:51:27 +08:00
|
|
|
isSrix4k = false;
|
|
|
|
|
2015-01-08 05:56:20 +08:00
|
|
|
//blockno = param_get8(Cmd, 1);
|
|
|
|
|
|
|
|
if ( param_gethex(Cmd,1, &blockno, 2) ) {
|
|
|
|
PrintAndLog("Block number must include 2 HEX symbols");
|
|
|
|
return 0;
|
|
|
|
}
|
2015-01-05 22:51:27 +08:00
|
|
|
|
|
|
|
if ( isSrix4k ){
|
|
|
|
if ( blockno > 0x7f && blockno != 0xff ){
|
|
|
|
PrintAndLog("Block number out of range");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if ( blockno > 0x0f && blockno != 0xff ){
|
|
|
|
PrintAndLog("Block number out of range");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (param_gethex(Cmd, 2, data, 8)) {
|
|
|
|
PrintAndLog("Data must include 8 HEX symbols");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( blockno == 0xff)
|
2015-01-08 05:56:20 +08:00
|
|
|
PrintAndLog("[%s] Write special block %02X [ %s ]", (isSrix4k)?"SRIX4K":"SRI512" , blockno, sprint_hex(data,4) );
|
2015-01-05 22:51:27 +08:00
|
|
|
else
|
2015-01-08 05:56:20 +08:00
|
|
|
PrintAndLog("[%s] Write block %02X [ %s ]", (isSrix4k)?"SRIX4K":"SRI512", blockno, sprint_hex(data,4) );
|
2015-01-05 22:51:27 +08:00
|
|
|
|
|
|
|
sprintf(str, "-c -p 09 %02x %02x%02x%02x%02x", blockno, data[0], data[1], data[2], data[3]);
|
2015-01-08 05:56:20 +08:00
|
|
|
|
2015-01-05 22:51:27 +08:00
|
|
|
CmdHF14BCmdRaw(str);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
static command_t CommandTable[] =
|
|
|
|
{
|
|
|
|
{"help", CmdHelp, 1, "This help"},
|
|
|
|
{"demod", CmdHF14BDemod, 1, "Demodulate ISO14443 Type B from tag"},
|
|
|
|
{"list", CmdHF14BList, 0, "List ISO 14443 history"},
|
|
|
|
{"read", CmdHF14BRead, 0, "Read HF tag (ISO 14443)"},
|
|
|
|
{"sim", CmdHF14Sim, 0, "Fake ISO 14443 tag"},
|
|
|
|
{"simlisten", CmdHFSimlisten, 0, "Get HF samples as fake tag"},
|
|
|
|
{"snoop", CmdHF14BSnoop, 0, "Eavesdrop ISO 14443"},
|
2013-09-02 02:41:05 +08:00
|
|
|
{"sri512read", CmdSri512Read, 0, "Read contents of a SRI512 tag"},
|
|
|
|
{"srix4kread", CmdSrix4kRead, 0, "Read contents of a SRIX4K tag"},
|
|
|
|
{"raw", CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
|
2015-01-05 22:51:27 +08:00
|
|
|
{"write", CmdHF14BWrite, 0, "Write data to a SRI512 | SRIX4K tag"},
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
{NULL, NULL, 0, NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
int CmdHF14B(const char *Cmd)
|
|
|
|
{
|
|
|
|
CmdsParse(CommandTable, Cmd);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHelp(const char *Cmd)
|
|
|
|
{
|
|
|
|
CmdsHelp(CommandTable);
|
|
|
|
return 0;
|
|
|
|
}
|