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.
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Low frequency EM4x 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>
|
2010-02-25 04:34:13 +08:00
|
|
|
#include <string.h>
|
2012-07-11 01:52:17 +08:00
|
|
|
#include <inttypes.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 "ui.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 "graph.h"
|
|
|
|
#include "cmdparser.h"
|
|
|
|
#include "cmddata.h"
|
|
|
|
#include "cmdlf.h"
|
|
|
|
#include "cmdlfem4x.h"
|
2015-04-03 00:48:52 +08:00
|
|
|
#include "lfdemod.h"
|
2015-06-15 12:44:57 +08:00
|
|
|
|
|
|
|
#define llx PRIx64
|
|
|
|
|
2015-01-08 07:17:40 +08:00
|
|
|
char *global_em410xId;
|
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);
|
|
|
|
|
2014-12-30 04:32:53 +08:00
|
|
|
int CmdEMdemodASK(const char *Cmd)
|
|
|
|
{
|
2015-01-05 22:51:27 +08:00
|
|
|
char cmdp = param_getchar(Cmd, 0);
|
2015-04-07 11:17:30 +08:00
|
|
|
int findone = (cmdp == '1') ? 1 : 0;
|
2015-04-03 00:48:52 +08:00
|
|
|
UsbCommand c={CMD_EM410X_DEMOD};
|
|
|
|
c.arg[0]=findone;
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
2014-12-30 04:32:53 +08:00
|
|
|
}
|
|
|
|
|
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
|
|
|
/* Read the ID of an EM410x tag.
|
|
|
|
* Format:
|
|
|
|
* 1111 1111 1 <-- standard non-repeatable header
|
|
|
|
* XXXX [row parity bit] <-- 10 rows of 5 bits for our 40 bit tag ID
|
|
|
|
* ....
|
|
|
|
* CCCC <-- each bit here is parity for the 10 bits above in corresponding column
|
|
|
|
* 0 <-- stop bit, end of tag
|
|
|
|
*/
|
|
|
|
int CmdEM410xRead(const char *Cmd)
|
|
|
|
{
|
2015-04-03 00:48:52 +08:00
|
|
|
uint32_t hi=0;
|
|
|
|
uint64_t lo=0;
|
|
|
|
|
2015-04-08 13:07:39 +08:00
|
|
|
if(!AskEm410xDemod("", &hi, &lo, false)) return 0;
|
2015-04-03 00:48:52 +08:00
|
|
|
PrintAndLog("EM410x pattern found: ");
|
|
|
|
printEM410x(hi, lo);
|
|
|
|
if (hi){
|
|
|
|
PrintAndLog ("EM410x XL pattern found");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
char id[12] = {0x00};
|
|
|
|
sprintf(id, "%010llx",lo);
|
|
|
|
|
|
|
|
global_em410xId = id;
|
|
|
|
return 1;
|
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
|
|
|
}
|
|
|
|
|
2015-03-23 03:28:48 +08:00
|
|
|
// emulate an EM410X 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
|
|
|
int CmdEM410xSim(const char *Cmd)
|
|
|
|
{
|
2015-01-05 22:51:27 +08:00
|
|
|
int i, n, j, binary[4], parity[4];
|
|
|
|
|
|
|
|
char cmdp = param_getchar(Cmd, 0);
|
|
|
|
uint8_t uid[5] = {0x00};
|
|
|
|
|
|
|
|
if (cmdp == 'h' || cmdp == 'H') {
|
2015-11-08 10:02:30 +08:00
|
|
|
PrintAndLog("Usage: lf em4x em410xsim <UID> <clock>");
|
2015-01-05 22:51:27 +08:00
|
|
|
PrintAndLog("");
|
2015-11-08 10:02:30 +08:00
|
|
|
PrintAndLog(" sample: lf em4x em410xsim 0F0368568B");
|
2015-01-05 22:51:27 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2015-11-08 10:02:30 +08:00
|
|
|
/* clock is 64 in EM410x tags */
|
2015-11-10 12:09:26 +08:00
|
|
|
uint8_t clock = 64;
|
2015-01-05 22:51:27 +08:00
|
|
|
|
|
|
|
if (param_gethex(Cmd, 0, uid, 10)) {
|
|
|
|
PrintAndLog("UID must include 10 HEX symbols");
|
|
|
|
return 0;
|
|
|
|
}
|
2015-11-10 12:09:26 +08:00
|
|
|
param_getdec(Cmd,1, &clock);
|
2015-11-08 10:02:30 +08:00
|
|
|
|
|
|
|
PrintAndLog("Starting simulating UID %02X%02X%02X%02X%02X clock: %d", uid[0],uid[1],uid[2],uid[3],uid[4],clock);
|
2015-01-05 22:51:27 +08:00
|
|
|
PrintAndLog("Press pm3-button to about simulation");
|
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
|
|
|
|
2015-04-03 00:48:52 +08:00
|
|
|
|
|
|
|
/* clear our graph */
|
|
|
|
ClearGraph(0);
|
|
|
|
|
|
|
|
/* write 9 start bits */
|
|
|
|
for (i = 0; i < 9; i++)
|
|
|
|
AppendGraph(0, clock, 1);
|
|
|
|
|
|
|
|
/* for each hex char */
|
|
|
|
parity[0] = parity[1] = parity[2] = parity[3] = 0;
|
|
|
|
for (i = 0; i < 10; i++)
|
|
|
|
{
|
|
|
|
/* read each hex char */
|
|
|
|
sscanf(&Cmd[i], "%1x", &n);
|
|
|
|
for (j = 3; j >= 0; j--, n/= 2)
|
|
|
|
binary[j] = n % 2;
|
|
|
|
|
|
|
|
/* append each bit */
|
|
|
|
AppendGraph(0, clock, binary[0]);
|
|
|
|
AppendGraph(0, clock, binary[1]);
|
|
|
|
AppendGraph(0, clock, binary[2]);
|
|
|
|
AppendGraph(0, clock, binary[3]);
|
|
|
|
|
|
|
|
/* append parity bit */
|
|
|
|
AppendGraph(0, clock, binary[0] ^ binary[1] ^ binary[2] ^ binary[3]);
|
|
|
|
|
|
|
|
/* keep track of column parity */
|
|
|
|
parity[0] ^= binary[0];
|
|
|
|
parity[1] ^= binary[1];
|
|
|
|
parity[2] ^= binary[2];
|
|
|
|
parity[3] ^= binary[3];
|
|
|
|
}
|
|
|
|
|
|
|
|
/* parity columns */
|
|
|
|
AppendGraph(0, clock, parity[0]);
|
|
|
|
AppendGraph(0, clock, parity[1]);
|
|
|
|
AppendGraph(0, clock, parity[2]);
|
|
|
|
AppendGraph(0, clock, parity[3]);
|
|
|
|
|
|
|
|
/* stop bit */
|
|
|
|
AppendGraph(1, clock, 0);
|
2015-01-05 22:51:27 +08:00
|
|
|
|
2015-04-03 00:48:52 +08:00
|
|
|
CmdLFSim("0"); //240 start_gap.
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2015-01-05 22:51:27 +08:00
|
|
|
/* Function is equivalent of lf read + data samples + em410xread
|
|
|
|
* looped until an EM410x tag is detected
|
|
|
|
*
|
|
|
|
* Why is CmdSamples("16000")?
|
|
|
|
* TBD: Auto-grow sample size based on detected sample rate. IE: If the
|
|
|
|
* rate gets lower, then grow the number of samples
|
|
|
|
* Changed by martin, 4000 x 4 = 16000,
|
|
|
|
* see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235
|
|
|
|
*/
|
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
|
|
|
int CmdEM410xWatch(const char *Cmd)
|
|
|
|
{
|
2015-01-05 22:51:27 +08:00
|
|
|
do {
|
|
|
|
if (ukbhit()) {
|
|
|
|
printf("\naborted via keyboard!\n");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2015-03-24 04:29:50 +08:00
|
|
|
CmdLFRead("s");
|
2015-04-05 12:58:57 +08:00
|
|
|
getSamples("8201",true); //capture enough to get 2 complete preambles (4096*2+9)
|
2015-03-23 03:28:48 +08:00
|
|
|
} while (!CmdEM410xRead(""));
|
|
|
|
|
2015-01-05 22:51:27 +08:00
|
|
|
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
|
|
|
}
|
|
|
|
|
2015-04-03 00:48:52 +08:00
|
|
|
//currently only supports manchester modulations
|
2015-01-08 07:17:40 +08:00
|
|
|
int CmdEM410xWatchnSpoof(const char *Cmd)
|
|
|
|
{
|
|
|
|
CmdEM410xWatch(Cmd);
|
2015-03-24 04:29:50 +08:00
|
|
|
PrintAndLog("# Replaying captured ID: %s",global_em410xId);
|
|
|
|
CmdLFaskSim("");
|
|
|
|
return 0;
|
2015-01-08 07:17:40 +08:00
|
|
|
}
|
|
|
|
|
2015-04-03 11:55:12 +08:00
|
|
|
int CmdEM410xWrite(const char *Cmd)
|
|
|
|
{
|
|
|
|
uint64_t id = 0xFFFFFFFFFFFFFFFF; // invalid id value
|
|
|
|
int card = 0xFF; // invalid card value
|
|
|
|
unsigned int clock = 0; // invalid clock value
|
|
|
|
|
|
|
|
sscanf(Cmd, "%" PRIx64 " %d %d", &id, &card, &clock);
|
|
|
|
|
|
|
|
// Check ID
|
|
|
|
if (id == 0xFFFFFFFFFFFFFFFF) {
|
|
|
|
PrintAndLog("Error! ID is required.\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (id >= 0x10000000000) {
|
|
|
|
PrintAndLog("Error! Given EM410x ID is longer than 40 bits.\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check Card
|
|
|
|
if (card == 0xFF) {
|
|
|
|
PrintAndLog("Error! Card type required.\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (card < 0) {
|
|
|
|
PrintAndLog("Error! Bad card type selected.\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check Clock
|
2015-11-04 09:18:16 +08:00
|
|
|
// Default: 64
|
|
|
|
if (clock == 0)
|
|
|
|
clock = 64;
|
|
|
|
|
|
|
|
// Allowed clock rates: 16, 32, 40 and 64
|
|
|
|
if ((clock != 16) && (clock != 32) && (clock != 64) && (clock != 40)) {
|
|
|
|
PrintAndLog("Error! Clock rate %d not valid. Supported clock rates are 16, 32, 40 and 64.\n", clock);
|
2015-04-03 11:55:12 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (card == 1) {
|
|
|
|
PrintAndLog("Writing %s tag with UID 0x%010" PRIx64 " (clock rate: %d)", "T55x7", id, clock);
|
|
|
|
// NOTE: We really should pass the clock in as a separate argument, but to
|
|
|
|
// provide for backwards-compatibility for older firmware, and to avoid
|
|
|
|
// having to add another argument to CMD_EM410X_WRITE_TAG, we just store
|
|
|
|
// the clock rate in bits 8-15 of the card value
|
2015-11-04 09:18:16 +08:00
|
|
|
card = (card & 0xFF) | ((clock << 8) & 0xFF00);
|
|
|
|
} else if (card == 0) {
|
2015-04-03 11:55:12 +08:00
|
|
|
PrintAndLog("Writing %s tag with UID 0x%010" PRIx64, "T5555", id, clock);
|
2015-11-04 09:18:16 +08:00
|
|
|
card = (card & 0xFF) | ((clock << 8) & 0xFF00);
|
|
|
|
} else {
|
2015-04-03 11:55:12 +08:00
|
|
|
PrintAndLog("Error! Bad card type selected.\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
UsbCommand c = {CMD_EM410X_WRITE_TAG, {card, (uint32_t)(id >> 32), (uint32_t)id}};
|
|
|
|
SendCommand(&c);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-04-03 00:48:52 +08:00
|
|
|
bool EM_EndParityTest(uint8_t *BitStream, size_t size, uint8_t rows, uint8_t cols, uint8_t pType)
|
|
|
|
{
|
|
|
|
if (rows*cols>size) return false;
|
|
|
|
uint8_t colP=0;
|
2015-04-07 11:17:30 +08:00
|
|
|
//assume last col is a parity and do not test
|
2015-04-03 00:48:52 +08:00
|
|
|
for (uint8_t colNum = 0; colNum < cols-1; colNum++) {
|
|
|
|
for (uint8_t rowNum = 0; rowNum < rows; rowNum++) {
|
|
|
|
colP ^= BitStream[(rowNum*cols)+colNum];
|
|
|
|
}
|
|
|
|
if (colP != pType) return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool EM_ByteParityTest(uint8_t *BitStream, size_t size, uint8_t rows, uint8_t cols, uint8_t pType)
|
|
|
|
{
|
|
|
|
if (rows*cols>size) return false;
|
|
|
|
uint8_t rowP=0;
|
|
|
|
//assume last row is a parity row and do not test
|
|
|
|
for (uint8_t rowNum = 0; rowNum < rows-1; rowNum++) {
|
|
|
|
for (uint8_t colNum = 0; colNum < cols; colNum++) {
|
|
|
|
rowP ^= BitStream[(rowNum*cols)+colNum];
|
|
|
|
}
|
|
|
|
if (rowP != pType) return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint32_t OutputEM4x50_Block(uint8_t *BitStream, size_t size, bool verbose, bool pTest)
|
|
|
|
{
|
|
|
|
if (size<45) return 0;
|
|
|
|
uint32_t code = bytebits_to_byte(BitStream,8);
|
|
|
|
code = code<<8 | bytebits_to_byte(BitStream+9,8);
|
|
|
|
code = code<<8 | bytebits_to_byte(BitStream+18,8);
|
|
|
|
code = code<<8 | bytebits_to_byte(BitStream+27,8);
|
|
|
|
if (verbose || g_debugMode){
|
|
|
|
for (uint8_t i = 0; i<5; i++){
|
2015-04-07 11:17:30 +08:00
|
|
|
if (i == 4) PrintAndLog(""); //parity byte spacer
|
2015-04-03 00:48:52 +08:00
|
|
|
PrintAndLog("%d%d%d%d%d%d%d%d %d -> 0x%02x",
|
|
|
|
BitStream[i*9],
|
|
|
|
BitStream[i*9+1],
|
|
|
|
BitStream[i*9+2],
|
|
|
|
BitStream[i*9+3],
|
|
|
|
BitStream[i*9+4],
|
|
|
|
BitStream[i*9+5],
|
|
|
|
BitStream[i*9+6],
|
|
|
|
BitStream[i*9+7],
|
|
|
|
BitStream[i*9+8],
|
|
|
|
bytebits_to_byte(BitStream+i*9,8)
|
|
|
|
);
|
|
|
|
}
|
|
|
|
if (pTest)
|
|
|
|
PrintAndLog("Parity Passed");
|
|
|
|
else
|
|
|
|
PrintAndLog("Parity Failed");
|
|
|
|
}
|
|
|
|
return code;
|
|
|
|
}
|
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
|
|
|
/* Read the transmitted data of an EM4x50 tag
|
|
|
|
* Format:
|
|
|
|
*
|
|
|
|
* XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
|
|
|
|
* XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
|
|
|
|
* XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
|
|
|
|
* XXXXXXXX [row parity bit (even)] <- 8 bits plus parity
|
|
|
|
* CCCCCCCC <- column parity bits
|
|
|
|
* 0 <- stop bit
|
|
|
|
* LW <- Listen Window
|
|
|
|
*
|
|
|
|
* This pattern repeats for every block of data being transmitted.
|
|
|
|
* Transmission starts with two Listen Windows (LW - a modulated
|
|
|
|
* pattern of 320 cycles each (32/32/128/64/64)).
|
|
|
|
*
|
|
|
|
* Note that this data may or may not be the UID. It is whatever data
|
|
|
|
* is stored in the blocks defined in the control word First and Last
|
|
|
|
* Word Read values. UID is stored in block 32.
|
|
|
|
*/
|
2015-04-07 11:17:30 +08:00
|
|
|
//completed by Marshmellow
|
2015-04-03 00:48:52 +08:00
|
|
|
int EM4x50Read(const char *Cmd, bool verbose)
|
|
|
|
{
|
2015-04-07 11:17:30 +08:00
|
|
|
uint8_t fndClk[] = {8,16,32,40,50,64,128};
|
2015-04-03 00:48:52 +08:00
|
|
|
int clk = 0;
|
|
|
|
int invert = 0;
|
|
|
|
int tol = 0;
|
|
|
|
int i, j, startblock, skip, block, start, end, low, high, minClk;
|
2015-04-07 11:17:30 +08:00
|
|
|
bool complete = false;
|
2015-04-03 00:48:52 +08:00
|
|
|
int tmpbuff[MAX_GRAPH_TRACE_LEN / 64];
|
|
|
|
uint32_t Code[6];
|
|
|
|
char tmp[6];
|
|
|
|
char tmp2[20];
|
2015-04-07 12:53:06 +08:00
|
|
|
int phaseoff;
|
2015-04-07 11:17:30 +08:00
|
|
|
high = low = 0;
|
2015-04-03 00:48:52 +08:00
|
|
|
memset(tmpbuff, 0, MAX_GRAPH_TRACE_LEN / 64);
|
2015-04-07 11:17:30 +08:00
|
|
|
|
|
|
|
// get user entry if any
|
|
|
|
sscanf(Cmd, "%i %i", &clk, &invert);
|
|
|
|
|
|
|
|
// save GraphBuffer - to restore it later
|
|
|
|
save_restoreGB(1);
|
|
|
|
|
2015-04-03 00:48:52 +08:00
|
|
|
// first get high and low values
|
2015-04-07 11:17:30 +08:00
|
|
|
for (i = 0; i < GraphTraceLen; i++) {
|
2015-04-03 00:48:52 +08:00
|
|
|
if (GraphBuffer[i] > high)
|
|
|
|
high = GraphBuffer[i];
|
|
|
|
else if (GraphBuffer[i] < low)
|
|
|
|
low = GraphBuffer[i];
|
|
|
|
}
|
|
|
|
|
2015-04-07 11:17:30 +08:00
|
|
|
i = 0;
|
|
|
|
j = 0;
|
|
|
|
minClk = 255;
|
|
|
|
// get to first full low to prime loop and skip incomplete first pulse
|
|
|
|
while ((GraphBuffer[i] < high) && (i < GraphTraceLen))
|
|
|
|
++i;
|
|
|
|
while ((GraphBuffer[i] > low) && (i < GraphTraceLen))
|
|
|
|
++i;
|
|
|
|
skip = i;
|
|
|
|
|
|
|
|
// populate tmpbuff buffer with pulse lengths
|
|
|
|
while (i < GraphTraceLen) {
|
2015-04-03 00:48:52 +08:00
|
|
|
// measure from low to low
|
2015-04-07 11:17:30 +08:00
|
|
|
while ((GraphBuffer[i] > low) && (i < GraphTraceLen))
|
2015-04-03 00:48:52 +08:00
|
|
|
++i;
|
|
|
|
start= i;
|
2015-04-07 11:17:30 +08:00
|
|
|
while ((GraphBuffer[i] < high) && (i < GraphTraceLen))
|
2015-04-03 00:48:52 +08:00
|
|
|
++i;
|
2015-04-07 11:17:30 +08:00
|
|
|
while ((GraphBuffer[i] > low) && (i < GraphTraceLen))
|
2015-04-03 00:48:52 +08:00
|
|
|
++i;
|
|
|
|
if (j>=(MAX_GRAPH_TRACE_LEN/64)) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
tmpbuff[j++]= i - start;
|
2015-04-07 11:17:30 +08:00
|
|
|
if (i-start < minClk && i < GraphTraceLen) {
|
|
|
|
minClk = i - start;
|
|
|
|
}
|
2015-04-03 00:48:52 +08:00
|
|
|
}
|
|
|
|
// set clock
|
2015-04-07 11:17:30 +08:00
|
|
|
if (!clk) {
|
2015-04-03 00:48:52 +08:00
|
|
|
for (uint8_t clkCnt = 0; clkCnt<7; clkCnt++) {
|
|
|
|
tol = fndClk[clkCnt]/8;
|
2015-04-07 11:17:30 +08:00
|
|
|
if (minClk >= fndClk[clkCnt]-tol && minClk <= fndClk[clkCnt]+1) {
|
2015-04-03 00:48:52 +08:00
|
|
|
clk=fndClk[clkCnt];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2015-04-07 11:17:30 +08:00
|
|
|
if (!clk) return 0;
|
2015-04-03 11:55:12 +08:00
|
|
|
} else tol = clk/8;
|
2015-04-03 00:48:52 +08:00
|
|
|
|
|
|
|
// look for data start - should be 2 pairs of LW (pulses of clk*3,clk*2)
|
2015-04-07 11:17:30 +08:00
|
|
|
start = -1;
|
|
|
|
for (i= 0; i < j - 4 ; ++i) {
|
2015-04-03 00:48:52 +08:00
|
|
|
skip += tmpbuff[i];
|
2015-04-07 11:17:30 +08:00
|
|
|
if (tmpbuff[i] >= clk*3-tol && tmpbuff[i] <= clk*3+tol) //3 clocks
|
|
|
|
if (tmpbuff[i+1] >= clk*2-tol && tmpbuff[i+1] <= clk*2+tol) //2 clocks
|
|
|
|
if (tmpbuff[i+2] >= clk*3-tol && tmpbuff[i+2] <= clk*3+tol) //3 clocks
|
|
|
|
if (tmpbuff[i+3] >= clk-tol) //1.5 to 2 clocks - depends on bit following
|
2015-04-03 00:48:52 +08:00
|
|
|
{
|
|
|
|
start= i + 4;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2015-04-07 11:17:30 +08:00
|
|
|
startblock = i + 4;
|
2015-04-03 00:48:52 +08:00
|
|
|
|
|
|
|
// skip over the remainder of LW
|
2015-04-07 12:53:06 +08:00
|
|
|
skip += tmpbuff[i+1] + tmpbuff[i+2] + clk;
|
|
|
|
if (tmpbuff[i+3]>clk)
|
|
|
|
phaseoff = tmpbuff[i+3]-clk;
|
|
|
|
else
|
|
|
|
phaseoff = 0;
|
2015-04-03 00:48:52 +08:00
|
|
|
// now do it again to find the end
|
|
|
|
end = skip;
|
2015-04-07 11:17:30 +08:00
|
|
|
for (i += 3; i < j - 4 ; ++i) {
|
2015-04-03 00:48:52 +08:00
|
|
|
end += tmpbuff[i];
|
2015-04-07 11:17:30 +08:00
|
|
|
if (tmpbuff[i] >= clk*3-tol && tmpbuff[i] <= clk*3+tol) //3 clocks
|
|
|
|
if (tmpbuff[i+1] >= clk*2-tol && tmpbuff[i+1] <= clk*2+tol) //2 clocks
|
|
|
|
if (tmpbuff[i+2] >= clk*3-tol && tmpbuff[i+2] <= clk*3+tol) //3 clocks
|
|
|
|
if (tmpbuff[i+3] >= clk-tol) //1.5 to 2 clocks - depends on bit following
|
2015-04-03 00:48:52 +08:00
|
|
|
{
|
|
|
|
complete= true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
end = i;
|
|
|
|
// report back
|
|
|
|
if (verbose || g_debugMode) {
|
|
|
|
if (start >= 0) {
|
2015-04-07 11:17:30 +08:00
|
|
|
PrintAndLog("\nNote: one block = 50 bits (32 data, 12 parity, 6 marker)");
|
2015-04-03 00:48:52 +08:00
|
|
|
} else {
|
2015-04-07 11:17:30 +08:00
|
|
|
PrintAndLog("No data found!, clock tried:%d",clk);
|
2015-04-03 00:48:52 +08:00
|
|
|
PrintAndLog("Try again with more samples.");
|
2015-04-07 11:17:30 +08:00
|
|
|
PrintAndLog(" or after a 'data askedge' command to clean up the read");
|
2015-04-03 00:48:52 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
} else if (start < 0) return 0;
|
2015-04-07 11:17:30 +08:00
|
|
|
start = skip;
|
2015-04-03 00:48:52 +08:00
|
|
|
snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk*47);
|
|
|
|
// get rid of leading crap
|
2015-04-07 11:17:30 +08:00
|
|
|
snprintf(tmp, sizeof(tmp), "%i", skip);
|
2015-04-03 00:48:52 +08:00
|
|
|
CmdLtrim(tmp);
|
|
|
|
bool pTest;
|
2015-04-07 11:17:30 +08:00
|
|
|
bool AllPTest = true;
|
2015-04-03 00:48:52 +08:00
|
|
|
// now work through remaining buffer printing out data blocks
|
|
|
|
block = 0;
|
|
|
|
i = startblock;
|
2015-04-07 11:17:30 +08:00
|
|
|
while (block < 6) {
|
2015-04-03 00:48:52 +08:00
|
|
|
if (verbose || g_debugMode) PrintAndLog("\nBlock %i:", block);
|
|
|
|
skip = phaseoff;
|
|
|
|
|
|
|
|
// look for LW before start of next block
|
2015-04-07 11:17:30 +08:00
|
|
|
for ( ; i < j - 4 ; ++i) {
|
2015-04-03 00:48:52 +08:00
|
|
|
skip += tmpbuff[i];
|
|
|
|
if (tmpbuff[i] >= clk*3-tol && tmpbuff[i] <= clk*3+tol)
|
|
|
|
if (tmpbuff[i+1] >= clk-tol)
|
|
|
|
break;
|
|
|
|
}
|
2015-04-07 12:53:06 +08:00
|
|
|
if (i >= j-4) break; //next LW not found
|
2015-04-03 00:48:52 +08:00
|
|
|
skip += clk;
|
2015-04-07 12:53:06 +08:00
|
|
|
if (tmpbuff[i+1]>clk)
|
|
|
|
phaseoff = tmpbuff[i+1]-clk;
|
|
|
|
else
|
|
|
|
phaseoff = 0;
|
2015-04-03 00:48:52 +08:00
|
|
|
i += 2;
|
2015-04-08 13:07:39 +08:00
|
|
|
if (ASKDemod(tmp2, false, false, 1) < 1) {
|
2015-04-07 11:17:30 +08:00
|
|
|
save_restoreGB(0);
|
|
|
|
return 0;
|
|
|
|
}
|
2015-04-03 00:48:52 +08:00
|
|
|
//set DemodBufferLen to just one block
|
|
|
|
DemodBufferLen = skip/clk;
|
|
|
|
//test parities
|
|
|
|
pTest = EM_ByteParityTest(DemodBuffer,DemodBufferLen,5,9,0);
|
|
|
|
pTest &= EM_EndParityTest(DemodBuffer,DemodBufferLen,5,9,0);
|
|
|
|
AllPTest &= pTest;
|
|
|
|
//get output
|
2015-04-07 11:17:30 +08:00
|
|
|
Code[block] = OutputEM4x50_Block(DemodBuffer,DemodBufferLen,verbose, pTest);
|
|
|
|
if (g_debugMode) PrintAndLog("\nskipping %d samples, bits:%d", skip, skip/clk);
|
2015-04-03 00:48:52 +08:00
|
|
|
//skip to start of next block
|
|
|
|
snprintf(tmp,sizeof(tmp),"%i",skip);
|
|
|
|
CmdLtrim(tmp);
|
|
|
|
block++;
|
2015-04-07 11:17:30 +08:00
|
|
|
if (i >= end) break; //in case chip doesn't output 6 blocks
|
2015-04-03 00:48:52 +08:00
|
|
|
}
|
|
|
|
//print full code:
|
|
|
|
if (verbose || g_debugMode || AllPTest){
|
2015-04-07 12:53:06 +08:00
|
|
|
if (!complete) {
|
|
|
|
PrintAndLog("*** Warning!");
|
|
|
|
PrintAndLog("Partial data - no end found!");
|
|
|
|
PrintAndLog("Try again with more samples.");
|
|
|
|
}
|
2015-04-07 11:17:30 +08:00
|
|
|
PrintAndLog("Found data at sample: %i - using clock: %i", start, clk);
|
|
|
|
end = block;
|
|
|
|
for (block=0; block < end; block++){
|
2015-04-03 00:48:52 +08:00
|
|
|
PrintAndLog("Block %d: %08x",block,Code[block]);
|
|
|
|
}
|
2015-04-07 12:53:06 +08:00
|
|
|
if (AllPTest) {
|
2015-04-03 00:48:52 +08:00
|
|
|
PrintAndLog("Parities Passed");
|
2015-04-07 12:53:06 +08:00
|
|
|
} else {
|
2015-04-03 00:48:52 +08:00
|
|
|
PrintAndLog("Parities Failed");
|
2015-04-07 11:17:30 +08:00
|
|
|
PrintAndLog("Try cleaning the read samples with 'data askedge'");
|
2015-04-07 12:53:06 +08:00
|
|
|
}
|
2015-04-03 00:48:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
//restore GraphBuffer
|
|
|
|
save_restoreGB(0);
|
|
|
|
return (int)AllPTest;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
int CmdEM4x50Read(const char *Cmd)
|
|
|
|
{
|
2015-04-03 00:48:52 +08:00
|
|
|
return EM4x50Read(Cmd, true);
|
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
|
|
|
}
|
|
|
|
|
2013-03-01 01:04:23 +08:00
|
|
|
int CmdReadWord(const char *Cmd)
|
|
|
|
{
|
2015-01-08 05:00:29 +08:00
|
|
|
int Word = -1; //default to invalid word
|
2015-04-03 00:48:52 +08:00
|
|
|
UsbCommand c;
|
|
|
|
|
|
|
|
sscanf(Cmd, "%d", &Word);
|
|
|
|
|
2015-01-08 05:00:29 +08:00
|
|
|
if ( (Word > 15) | (Word < 0) ) {
|
2015-04-03 00:48:52 +08:00
|
|
|
PrintAndLog("Word must be between 0 and 15");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
PrintAndLog("Reading word %d", Word);
|
|
|
|
|
|
|
|
c.cmd = CMD_EM4X_READ_WORD;
|
|
|
|
c.d.asBytes[0] = 0x0; //Normal mode
|
|
|
|
c.arg[0] = 0;
|
|
|
|
c.arg[1] = Word;
|
|
|
|
c.arg[2] = 0;
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
2013-03-01 01:04:23 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int CmdReadWordPWD(const char *Cmd)
|
|
|
|
{
|
2015-01-08 05:00:29 +08:00
|
|
|
int Word = -1; //default to invalid word
|
2015-04-03 00:48:52 +08:00
|
|
|
int Password = 0xFFFFFFFF; //default to blank password
|
|
|
|
UsbCommand c;
|
|
|
|
|
|
|
|
sscanf(Cmd, "%d %x", &Word, &Password);
|
|
|
|
|
2015-01-08 05:00:29 +08:00
|
|
|
if ( (Word > 15) | (Word < 0) ) {
|
2015-04-03 00:48:52 +08:00
|
|
|
PrintAndLog("Word must be between 0 and 15");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
PrintAndLog("Reading word %d with password %08X", Word, Password);
|
|
|
|
|
|
|
|
c.cmd = CMD_EM4X_READ_WORD;
|
|
|
|
c.d.asBytes[0] = 0x1; //Password mode
|
|
|
|
c.arg[0] = 0;
|
|
|
|
c.arg[1] = Word;
|
|
|
|
c.arg[2] = Password;
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
2013-03-01 01:04:23 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int CmdWriteWord(const char *Cmd)
|
|
|
|
{
|
2015-04-03 00:48:52 +08:00
|
|
|
int Word = 16; //default to invalid block
|
|
|
|
int Data = 0xFFFFFFFF; //default to blank data
|
|
|
|
UsbCommand c;
|
|
|
|
|
|
|
|
sscanf(Cmd, "%x %d", &Data, &Word);
|
|
|
|
|
|
|
|
if (Word > 15) {
|
|
|
|
PrintAndLog("Word must be between 0 and 15");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
PrintAndLog("Writing word %d with data %08X", Word, Data);
|
|
|
|
|
|
|
|
c.cmd = CMD_EM4X_WRITE_WORD;
|
|
|
|
c.d.asBytes[0] = 0x0; //Normal mode
|
|
|
|
c.arg[0] = Data;
|
|
|
|
c.arg[1] = Word;
|
|
|
|
c.arg[2] = 0;
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
2013-03-01 01:04:23 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int CmdWriteWordPWD(const char *Cmd)
|
|
|
|
{
|
2015-04-03 00:48:52 +08:00
|
|
|
int Word = 16; //default to invalid word
|
|
|
|
int Data = 0xFFFFFFFF; //default to blank data
|
|
|
|
int Password = 0xFFFFFFFF; //default to blank password
|
|
|
|
UsbCommand c;
|
|
|
|
|
|
|
|
sscanf(Cmd, "%x %d %x", &Data, &Word, &Password);
|
|
|
|
|
|
|
|
if (Word > 15) {
|
|
|
|
PrintAndLog("Word must be between 0 and 15");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
PrintAndLog("Writing word %d with data %08X and password %08X", Word, Data, Password);
|
|
|
|
|
|
|
|
c.cmd = CMD_EM4X_WRITE_WORD;
|
|
|
|
c.d.asBytes[0] = 0x1; //Password mode
|
|
|
|
c.arg[0] = Data;
|
|
|
|
c.arg[1] = Word;
|
|
|
|
c.arg[2] = Password;
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
2013-03-01 01:04:23 +08:00
|
|
|
}
|
|
|
|
|
2012-03-07 21:44:53 +08:00
|
|
|
static command_t CommandTable[] =
|
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
|
|
|
{
|
2015-04-03 00:48:52 +08:00
|
|
|
{"help", CmdHelp, 1, "This help"},
|
|
|
|
{"em410xdemod", CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"},
|
2015-04-10 12:06:59 +08:00
|
|
|
{"em410xread", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag in GraphBuffer"},
|
2015-11-10 12:09:26 +08:00
|
|
|
{"em410xsim", CmdEM410xSim, 0, "<UID> [clock rate] -- Simulate EM410x tag"},
|
2015-04-03 00:48:52 +08:00
|
|
|
{"em410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},
|
|
|
|
{"em410xspoof", CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },
|
2015-04-10 12:06:59 +08:00
|
|
|
{"em410xwrite", CmdEM410xWrite, 0, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},
|
2015-04-03 00:48:52 +08:00
|
|
|
{"em4x50read", CmdEM4x50Read, 1, "Extract data from EM4x50 tag"},
|
|
|
|
{"readword", CmdReadWord, 1, "<Word> -- Read EM4xxx word data"},
|
|
|
|
{"readwordPWD", CmdReadWordPWD, 1, "<Word> <Password> -- Read EM4xxx word data in password mode"},
|
|
|
|
{"writeword", CmdWriteWord, 1, "<Data> <Word> -- Write EM4xxx word data"},
|
|
|
|
{"writewordPWD", CmdWriteWordPWD, 1, "<Data> <Word> <Password> -- Write EM4xxx word data in password mode"},
|
|
|
|
{NULL, NULL, 0, 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
|
|
|
};
|
|
|
|
|
|
|
|
int CmdLFEM4X(const char *Cmd)
|
|
|
|
{
|
2015-04-03 00:48:52 +08:00
|
|
|
CmdsParse(CommandTable, Cmd);
|
|
|
|
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
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHelp(const char *Cmd)
|
|
|
|
{
|
2015-04-03 00:48:52 +08:00
|
|
|
CmdsHelp(CommandTable);
|
|
|
|
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
|
|
|
}
|