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 <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"
|
2015-06-16 02:59:01 +08:00
|
|
|
#include "cmdhf14a.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 CmdHF14BList(const char *Cmd)
|
|
|
|
{
|
2015-01-22 07:19:20 +08:00
|
|
|
PrintAndLog("Deprecated command, use 'hf list 14b' instead");
|
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-22 07:19:20 +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-06-21 17:07:05 +08:00
|
|
|
int CmdHF14BSim(const char *Cmd)
|
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-07-29 03:33:09 +08:00
|
|
|
UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443B};
|
2015-06-25 18:25:44 +08:00
|
|
|
clearCommandBuffer();
|
2015-06-21 17:07:05 +08:00
|
|
|
SendCommand(&c);
|
|
|
|
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 CmdHF14BSnoop(const char *Cmd)
|
|
|
|
{
|
2015-07-24 22:45:52 +08:00
|
|
|
UsbCommand c = {CMD_SNOOP_ISO_14443B};
|
2015-06-25 18:25:44 +08:00
|
|
|
clearCommandBuffer();
|
2015-06-21 17:07:05 +08:00
|
|
|
SendCommand(&c);
|
|
|
|
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
|
|
|
}
|
|
|
|
|
|
|
|
/* 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)
|
|
|
|
{
|
2015-06-21 17:07:05 +08:00
|
|
|
UsbCommand c = {CMD_READ_SRI512_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
|
2015-06-18 15:52:53 +08:00
|
|
|
clearCommandBuffer();
|
2015-06-21 17:07:05 +08:00
|
|
|
SendCommand(&c);
|
|
|
|
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
|
|
|
}
|
|
|
|
|
|
|
|
/* 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)
|
|
|
|
{
|
2015-06-21 17:07:05 +08:00
|
|
|
UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
|
2015-06-18 15:52:53 +08:00
|
|
|
clearCommandBuffer();
|
2015-06-21 17:07:05 +08:00
|
|
|
SendCommand(&c);
|
|
|
|
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-11-23 01:13:26 +08:00
|
|
|
|
2015-06-16 02:59:01 +08:00
|
|
|
int rawClose(void){
|
2015-10-08 05:00:46 +08:00
|
|
|
UsbCommand resp;
|
2015-06-16 02:59:01 +08:00
|
|
|
UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};
|
2015-06-18 15:52:53 +08:00
|
|
|
clearCommandBuffer();
|
2015-06-16 02:59:01 +08:00
|
|
|
SendCommand(&c);
|
2015-10-08 05:00:46 +08:00
|
|
|
if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
|
2015-06-16 02:59:01 +08:00
|
|
|
return 0;
|
2015-10-08 05:00:46 +08:00
|
|
|
}
|
|
|
|
return 0;
|
2015-06-16 02:59:01 +08:00
|
|
|
}
|
|
|
|
|
2015-06-21 17:07:05 +08:00
|
|
|
int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose){
|
2015-06-30 04:37:55 +08:00
|
|
|
|
|
|
|
if(*crc) {
|
|
|
|
ComputeCrc14443(CRC_14443_B, data, *datalen, data+*datalen, data+*datalen+1);
|
2015-06-21 17:07:05 +08:00
|
|
|
*datalen += 2;
|
|
|
|
}
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv,power
|
2015-06-21 17:07:05 +08:00
|
|
|
c.arg[0] = *datalen;
|
|
|
|
c.arg[1] = reply;
|
|
|
|
c.arg[2] = power;
|
2015-06-30 04:37:55 +08:00
|
|
|
memcpy(c.d.asBytes, data, *datalen);
|
2015-06-18 15:52:53 +08:00
|
|
|
clearCommandBuffer();
|
2015-06-21 17:07:05 +08:00
|
|
|
SendCommand(&c);
|
|
|
|
|
|
|
|
if (!reply) return 1;
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
UsbCommand resp;
|
2015-06-25 18:25:44 +08:00
|
|
|
if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
|
2015-06-21 17:07:05 +08:00
|
|
|
if (verbose) PrintAndLog("timeout while waiting for reply.");
|
2015-06-25 18:25:44 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2015-06-21 17:07:05 +08:00
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
*datalen = resp.arg[0];
|
2015-07-13 04:58:16 +08:00
|
|
|
if (verbose) PrintAndLog("received %u octets", *datalen);
|
|
|
|
if(*datalen<3) return 0;
|
2015-06-25 18:25:44 +08:00
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
memcpy(data, resp.d.asBytes, *datalen);
|
|
|
|
|
|
|
|
uint8_t first = 0, second = 0;
|
|
|
|
ComputeCrc14443(CRC_14443_B, data, *datalen-2, &first, &second);
|
|
|
|
*crc = ( data[*datalen-2] == first && data[*datalen-1] == second);
|
|
|
|
|
|
|
|
if (verbose)
|
|
|
|
PrintAndLog("[LEN %u] %s[%02X %02X] %s",
|
|
|
|
*datalen,
|
|
|
|
sprint_hex(data, *datalen-2),
|
|
|
|
data[*datalen-2],
|
|
|
|
data[*datalen-1],
|
|
|
|
(*crc)?"OK":"FAIL"
|
|
|
|
);
|
|
|
|
|
2015-06-21 17:07:05 +08:00
|
|
|
return 1;
|
2015-06-14 20:39:50 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHF14BCmdRaw (const char *Cmd) {
|
|
|
|
bool reply = true;
|
|
|
|
bool crc = false;
|
2015-06-21 17:07:05 +08:00
|
|
|
bool power = false;
|
2015-07-13 04:58:16 +08:00
|
|
|
bool select = false;
|
|
|
|
bool SRx = false;
|
2013-09-02 02:41:05 +08:00
|
|
|
char buf[5]="";
|
2015-06-25 18:25:44 +08:00
|
|
|
uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
|
2015-06-14 20:39:50 +08:00
|
|
|
uint8_t datalen = 0;
|
|
|
|
unsigned int temp;
|
|
|
|
int i = 0;
|
|
|
|
if (strlen(Cmd)<3) {
|
2015-07-13 04:58:16 +08:00
|
|
|
PrintAndLog("Usage: hf 14b raw [-r] [-c] [-p] [-s || -ss] <0A 0B 0C ... hex>");
|
2013-09-02 02:41:05 +08:00
|
|
|
PrintAndLog(" -r do not read response");
|
|
|
|
PrintAndLog(" -c calculate and append CRC");
|
|
|
|
PrintAndLog(" -p leave the field on after receive");
|
2015-07-13 04:58:16 +08:00
|
|
|
PrintAndLog(" -s active signal field ON with select");
|
|
|
|
PrintAndLog(" -ss active signal field ON with select for SRx ST Microelectronics tags");
|
2013-09-02 02:41:05 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// strip
|
2015-06-14 20:39:50 +08:00
|
|
|
while (*Cmd==' ' || *Cmd=='\t') Cmd++;
|
2013-09-02 02:41:05 +08:00
|
|
|
|
2015-06-14 20:39:50 +08:00
|
|
|
while (Cmd[i]!='\0') {
|
|
|
|
if (Cmd[i]==' ' || Cmd[i]=='\t') { i++; continue; }
|
|
|
|
if (Cmd[i]=='-') {
|
|
|
|
switch (Cmd[i+1]) {
|
2013-09-02 02:41:05 +08:00
|
|
|
case 'r':
|
|
|
|
case 'R':
|
2015-06-14 20:39:50 +08:00
|
|
|
reply = false;
|
2013-09-02 02:41:05 +08:00
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
case 'C':
|
2015-06-14 20:39:50 +08:00
|
|
|
crc = true;
|
2013-09-02 02:41:05 +08:00
|
|
|
break;
|
|
|
|
case 'p':
|
|
|
|
case 'P':
|
2015-06-21 17:07:05 +08:00
|
|
|
power = true;
|
2013-09-02 02:41:05 +08:00
|
|
|
break;
|
2015-07-13 04:58:16 +08:00
|
|
|
case 's':
|
|
|
|
case 'S':
|
|
|
|
select = true;
|
|
|
|
if (Cmd[i+2]=='s' || Cmd[i+2]=='S') {
|
|
|
|
SRx = true;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
break;
|
2013-09-02 02:41:05 +08:00
|
|
|
default:
|
|
|
|
PrintAndLog("Invalid option");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
i+=2;
|
|
|
|
continue;
|
|
|
|
}
|
2015-06-14 20:39:50 +08:00
|
|
|
if ((Cmd[i]>='0' && Cmd[i]<='9') ||
|
|
|
|
(Cmd[i]>='a' && Cmd[i]<='f') ||
|
|
|
|
(Cmd[i]>='A' && Cmd[i]<='F') ) {
|
2013-09-02 02:41:05 +08:00
|
|
|
buf[strlen(buf)+1]=0;
|
2015-06-14 20:39:50 +08:00
|
|
|
buf[strlen(buf)]=Cmd[i];
|
2013-09-02 02:41:05 +08:00
|
|
|
i++;
|
|
|
|
|
|
|
|
if (strlen(buf)>=2) {
|
|
|
|
sscanf(buf,"%x",&temp);
|
2015-06-14 20:39:50 +08:00
|
|
|
data[datalen++]=(uint8_t)(temp & 0xff);
|
2013-09-02 02:41:05 +08:00
|
|
|
*buf=0;
|
2015-07-13 04:58:16 +08:00
|
|
|
memset(buf, 0x00, sizeof(buf));
|
2013-09-02 02:41:05 +08:00
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
PrintAndLog("Invalid char on input");
|
2015-07-13 04:58:16 +08:00
|
|
|
return 0;
|
2013-09-02 02:41:05 +08:00
|
|
|
}
|
2013-10-20 19:46:51 +08:00
|
|
|
if (datalen == 0)
|
|
|
|
{
|
|
|
|
PrintAndLog("Missing data input");
|
|
|
|
return 0;
|
|
|
|
}
|
2015-06-14 20:39:50 +08:00
|
|
|
|
2015-07-13 04:58:16 +08:00
|
|
|
if (select){ //auto select 14b tag
|
|
|
|
uint8_t cmd2[16];
|
|
|
|
bool crc2 = true;
|
|
|
|
uint8_t cmdLen;
|
|
|
|
|
|
|
|
if (SRx) {
|
|
|
|
// REQ SRx
|
|
|
|
cmdLen = 2;
|
|
|
|
cmd2[0] = 0x06;
|
|
|
|
cmd2[1] = 0x00;
|
|
|
|
} else {
|
|
|
|
// REQB
|
|
|
|
cmdLen = 3;
|
|
|
|
cmd2[0] = 0x05;
|
|
|
|
cmd2[1] = 0x00;
|
|
|
|
cmd2[2] = 0x08;
|
|
|
|
}
|
|
|
|
|
|
|
|
// REQB
|
|
|
|
if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
|
|
|
|
|
2015-07-14 05:06:49 +08:00
|
|
|
PrintAndLog("REQB : %s", sprint_hex(cmd2, cmdLen));
|
2015-07-13 04:58:16 +08:00
|
|
|
|
|
|
|
if ( SRx && (cmdLen != 3 || !crc2) ) return rawClose();
|
|
|
|
else if (cmd2[0] != 0x50 || cmdLen != 14 || !crc2) return rawClose();
|
|
|
|
|
|
|
|
uint8_t chipID = 0;
|
|
|
|
if (SRx) {
|
|
|
|
// select
|
|
|
|
chipID = cmd2[0];
|
|
|
|
cmd2[0] = 0x0E;
|
|
|
|
cmd2[1] = chipID;
|
|
|
|
cmdLen = 2;
|
|
|
|
} else {
|
|
|
|
// attrib
|
|
|
|
cmd2[0] = 0x1D;
|
|
|
|
// UID from cmd2[1 - 4]
|
|
|
|
cmd2[5] = 0x00;
|
|
|
|
cmd2[6] = 0x08;
|
|
|
|
cmd2[7] = 0x01;
|
|
|
|
cmd2[8] = 0x00;
|
|
|
|
cmdLen = 9;
|
|
|
|
}
|
|
|
|
// wait
|
|
|
|
|
|
|
|
// attrib
|
|
|
|
if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
|
2015-07-14 05:06:49 +08:00
|
|
|
PrintAndLog("ATTRIB : %s", sprint_hex(cmd2, cmdLen));
|
2015-07-13 04:58:16 +08:00
|
|
|
|
|
|
|
if (cmdLen != 3 || !crc2) return rawClose();
|
|
|
|
if (SRx && cmd2[0] != chipID) return rawClose();
|
|
|
|
|
|
|
|
}
|
2015-06-21 17:07:05 +08:00
|
|
|
return HF14BCmdRaw(reply, &crc, power, data, &datalen, true);
|
2015-06-14 20:39:50 +08:00
|
|
|
}
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
// print full atqb info
|
2015-06-16 02:59:01 +08:00
|
|
|
static void print_atqb_resp(uint8_t *data){
|
2015-07-13 04:58:16 +08:00
|
|
|
//PrintAndLog (" UID: %s", sprint_hex(data+1,4));
|
2015-06-21 17:07:05 +08:00
|
|
|
PrintAndLog (" App Data: %s", sprint_hex(data+5,4));
|
|
|
|
PrintAndLog (" Protocol: %s", sprint_hex(data+9,3));
|
|
|
|
uint8_t BitRate = data[9];
|
|
|
|
if (!BitRate) PrintAndLog (" Bit Rate: 106 kbit/s only PICC <-> PCD");
|
|
|
|
if (BitRate & 0x10) PrintAndLog (" Bit Rate: 212 kbit/s PICC -> PCD supported");
|
|
|
|
if (BitRate & 0x20) PrintAndLog (" Bit Rate: 424 kbit/s PICC -> PCD supported");
|
|
|
|
if (BitRate & 0x40) PrintAndLog (" Bit Rate: 847 kbit/s PICC -> PCD supported");
|
|
|
|
if (BitRate & 0x01) PrintAndLog (" Bit Rate: 212 kbit/s PICC <- PCD supported");
|
|
|
|
if (BitRate & 0x02) PrintAndLog (" Bit Rate: 424 kbit/s PICC <- PCD supported");
|
|
|
|
if (BitRate & 0x04) PrintAndLog (" Bit Rate: 847 kbit/s PICC <- PCD supported");
|
|
|
|
if (BitRate & 0x80) PrintAndLog (" Same bit rate <-> required");
|
|
|
|
|
|
|
|
uint16_t maxFrame = data[10]>>4;
|
|
|
|
if (maxFrame < 5) maxFrame = 8 * maxFrame + 16;
|
|
|
|
else if (maxFrame == 5) maxFrame = 64;
|
|
|
|
else if (maxFrame == 6) maxFrame = 96;
|
|
|
|
else if (maxFrame == 7) maxFrame = 128;
|
|
|
|
else if (maxFrame == 8) maxFrame = 256;
|
|
|
|
else maxFrame = 257;
|
|
|
|
|
2015-07-13 04:58:16 +08:00
|
|
|
PrintAndLog ("Max Frame Size: %u%s",maxFrame, (maxFrame == 257) ? "+ RFU" : "");
|
2015-06-21 17:07:05 +08:00
|
|
|
|
|
|
|
uint8_t protocolT = data[10] & 0xF;
|
|
|
|
PrintAndLog (" Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4",(protocolT) ? "" : "not " );
|
2015-07-13 04:58:16 +08:00
|
|
|
PrintAndLog ("Frame Wait Int: %u", data[11]>>4);
|
2015-06-21 17:07:05 +08:00
|
|
|
PrintAndLog (" App Data Code: Application is %s",(data[11]&4) ? "Standard" : "Proprietary");
|
|
|
|
PrintAndLog (" Frame Options: NAD is %ssupported",(data[11]&2) ? "" : "not ");
|
|
|
|
PrintAndLog (" Frame Options: CID is %ssupported",(data[11]&1) ? "" : "not ");
|
2015-07-13 04:58:16 +08:00
|
|
|
PrintAndLog ("Max Buf Length: %u (MBLI) %s",data[14]>>4, (data[14] & 0xF0) ? "" : "not supported");
|
2015-06-21 17:07:05 +08:00
|
|
|
|
|
|
|
return;
|
2015-06-14 20:39:50 +08:00
|
|
|
}
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
// get SRx chip model (from UID) // from ST Microelectronics
|
2015-06-16 02:59:01 +08:00
|
|
|
char *get_ST_Chip_Model(uint8_t data){
|
|
|
|
static char model[20];
|
|
|
|
char *retStr = model;
|
|
|
|
memset(model,0, sizeof(model));
|
|
|
|
|
|
|
|
switch (data) {
|
|
|
|
case 0x0: sprintf(retStr, "SRIX4K (Special)"); break;
|
|
|
|
case 0x2: sprintf(retStr, "SR176"); break;
|
|
|
|
case 0x3: sprintf(retStr, "SRIX4K"); break;
|
|
|
|
case 0x4: sprintf(retStr, "SRIX512"); break;
|
|
|
|
case 0x6: sprintf(retStr, "SRI512"); break;
|
|
|
|
case 0x7: sprintf(retStr, "SRI4K"); break;
|
|
|
|
case 0xC: sprintf(retStr, "SRT512"); break;
|
2015-11-23 01:13:26 +08:00
|
|
|
default : sprintf(retStr, "Unknown"); break;
|
2015-06-16 02:59:01 +08:00
|
|
|
}
|
2015-06-25 18:25:44 +08:00
|
|
|
return retStr;
|
|
|
|
}
|
|
|
|
|
2015-07-13 04:58:16 +08:00
|
|
|
int print_ST_Lock_info(uint8_t model){
|
|
|
|
//assume connection open and tag selected...
|
|
|
|
uint8_t data[16] = {0x00};
|
|
|
|
uint8_t datalen = 2;
|
|
|
|
bool crc = true;
|
|
|
|
uint8_t resplen;
|
|
|
|
uint8_t blk1;
|
|
|
|
data[0] = 0x08;
|
|
|
|
|
|
|
|
if (model == 0x2) { //SR176 has special command:
|
|
|
|
data[1] = 0xf;
|
|
|
|
resplen = 4;
|
|
|
|
} else {
|
|
|
|
data[1] = 0xff;
|
|
|
|
resplen = 6;
|
|
|
|
}
|
|
|
|
|
|
|
|
//std read cmd
|
|
|
|
if (HF14BCmdRaw(true, &crc, true, data, &datalen, false)==0) return rawClose();
|
|
|
|
|
|
|
|
if (datalen != resplen || !crc) return rawClose();
|
|
|
|
|
|
|
|
PrintAndLog("Chip Write Protection Bits:");
|
|
|
|
// now interpret the data
|
|
|
|
switch (model){
|
|
|
|
case 0x0: //fall through (SRIX4K special)
|
|
|
|
case 0x3: //fall through (SRIx4K)
|
|
|
|
case 0x7: // (SRI4K)
|
|
|
|
//only need data[3]
|
|
|
|
blk1 = 9;
|
|
|
|
PrintAndLog(" raw: %s",printBits(1,data+3));
|
|
|
|
PrintAndLog(" 07/08:%slocked", (data[3] & 1) ? " not " : " " );
|
|
|
|
for (uint8_t i = 1; i<8; i++){
|
|
|
|
PrintAndLog(" %02u:%slocked", blk1, (data[3] & (1 << i)) ? " not " : " " );
|
|
|
|
blk1++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 0x4: //fall through (SRIX512)
|
|
|
|
case 0x6: //fall through (SRI512)
|
|
|
|
case 0xC: // (SRT512)
|
|
|
|
//need data[2] and data[3]
|
|
|
|
blk1 = 0;
|
|
|
|
PrintAndLog(" raw: %s",printBits(2,data+2));
|
|
|
|
for (uint8_t b=2; b<4; b++){
|
|
|
|
for (uint8_t i=0; i<8; i++){
|
|
|
|
PrintAndLog(" %02u:%slocked", blk1, (data[b] & (1 << i)) ? " not " : " " );
|
|
|
|
blk1++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 0x2: // (SR176)
|
|
|
|
//need data[2]
|
|
|
|
blk1 = 0;
|
|
|
|
PrintAndLog(" raw: %s",printBits(1,data+2));
|
|
|
|
for (uint8_t i = 0; i<8; i++){
|
|
|
|
PrintAndLog(" %02u/%02u:%slocked", blk1, blk1+1, (data[2] & (1 << i)) ? " " : " not " );
|
|
|
|
blk1+=2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return rawClose();
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
// print UID info from SRx chips (ST Microelectronics)
|
|
|
|
static void print_st_general_info(uint8_t *data){
|
2015-06-25 18:25:44 +08:00
|
|
|
//uid = first 8 bytes in data
|
|
|
|
PrintAndLog(" UID: %s", sprint_hex(SwapEndian64(data,8,8),8));
|
|
|
|
PrintAndLog(" MFG: %02X, %s", data[6], getTagInfo(data[6]));
|
|
|
|
PrintAndLog("Chip: %02X, %s", data[5]>>2, get_ST_Chip_Model(data[5]>>2));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
// 14b get and print UID only (general info)
|
|
|
|
int HF14BStdReader(uint8_t *data, uint8_t *datalen){
|
2015-06-25 18:25:44 +08:00
|
|
|
//05 00 00 = find one tag in field
|
2015-07-13 04:58:16 +08:00
|
|
|
//1d xx xx xx xx 00 08 01 00 = attrib xx=UID (resp 10 [f9 e0])
|
|
|
|
//a3 = ? (resp 03 [e2 c2])
|
|
|
|
//02 = ? (resp 02 [6a d3])
|
2015-06-25 18:25:44 +08:00
|
|
|
// 022b (resp 02 67 00 [29 5b])
|
|
|
|
// 0200a40400 (resp 02 67 00 [29 5b])
|
|
|
|
// 0200a4040c07a0000002480300 (resp 02 67 00 [29 5b])
|
|
|
|
// 0200a4040c07a0000002480200 (resp 02 67 00 [29 5b])
|
|
|
|
// 0200a4040006a0000000010100 (resp 02 6a 82 [4b 4c])
|
|
|
|
// 0200a4040c09d27600002545500200 (resp 02 67 00 [29 5b])
|
|
|
|
// 0200a404000cd2760001354b414e4d30310000 (resp 02 6a 82 [4b 4c])
|
|
|
|
// 0200a404000ca000000063504b43532d313500 (resp 02 6a 82 [4b 4c])
|
|
|
|
// 0200a4040010a000000018300301000000000000000000 (resp 02 6a 82 [4b 4c])
|
|
|
|
//03 = ? (resp 03 [e3 c2])
|
|
|
|
//c2 = ? (resp c2 [66 15])
|
2015-06-30 04:37:55 +08:00
|
|
|
//b2 = ? (resp a3 [e9 67])
|
2015-07-13 04:58:16 +08:00
|
|
|
//a2 = ? (resp 02 [6a d3])
|
2015-06-25 18:25:44 +08:00
|
|
|
bool crc = true;
|
|
|
|
*datalen = 3;
|
|
|
|
//std read cmd
|
|
|
|
data[0] = 0x05;
|
|
|
|
data[1] = 0x00;
|
2015-06-30 04:37:55 +08:00
|
|
|
data[2] = 0x08;
|
2015-06-25 18:25:44 +08:00
|
|
|
|
2015-07-13 04:58:16 +08:00
|
|
|
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
|
2015-06-25 18:25:44 +08:00
|
|
|
|
2015-07-13 04:58:16 +08:00
|
|
|
if (data[0] != 0x50 || *datalen != 14 || !crc) return rawClose();
|
2015-06-25 18:25:44 +08:00
|
|
|
|
|
|
|
PrintAndLog ("\n14443-3b tag found:");
|
2015-06-30 04:37:55 +08:00
|
|
|
PrintAndLog (" UID: %s", sprint_hex(data+1,4));
|
|
|
|
|
2015-07-13 04:58:16 +08:00
|
|
|
uint8_t cmd2[16];
|
|
|
|
uint8_t cmdLen = 3;
|
|
|
|
bool crc2 = true;
|
|
|
|
|
|
|
|
cmd2[0] = 0x1D;
|
|
|
|
// UID from data[1 - 4]
|
|
|
|
cmd2[1] = data[1];
|
|
|
|
cmd2[2] = data[2];
|
|
|
|
cmd2[3] = data[3];
|
|
|
|
cmd2[4] = data[4];
|
|
|
|
cmd2[5] = 0x00;
|
|
|
|
cmd2[6] = 0x08;
|
|
|
|
cmd2[7] = 0x01;
|
|
|
|
cmd2[8] = 0x00;
|
|
|
|
cmdLen = 9;
|
|
|
|
|
|
|
|
// attrib
|
|
|
|
if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
|
|
|
|
|
|
|
|
if (cmdLen != 3 || !crc2) return rawClose();
|
|
|
|
// add attrib responce to data
|
|
|
|
data[14] = cmd2[0];
|
|
|
|
rawClose();
|
2015-06-30 04:37:55 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// 14b get and print Full Info (as much as we know)
|
|
|
|
int HF14BStdInfo(uint8_t *data, uint8_t *datalen){
|
|
|
|
if (!HF14BStdReader(data,datalen)) return 0;
|
|
|
|
|
|
|
|
//add more info here
|
2015-06-25 18:25:44 +08:00
|
|
|
print_atqb_resp(data);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
// SRx get and print general info about SRx chip from UID
|
2015-07-13 04:58:16 +08:00
|
|
|
int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){
|
2015-06-25 18:25:44 +08:00
|
|
|
bool crc = true;
|
|
|
|
*datalen = 2;
|
|
|
|
//wake cmd
|
|
|
|
data[0] = 0x06;
|
|
|
|
data[1] = 0x00;
|
|
|
|
|
|
|
|
//leave power on
|
|
|
|
// verbose on for now for testing - turn off when functional
|
|
|
|
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
|
|
|
|
|
|
|
|
if (*datalen != 3 || !crc) return rawClose();
|
|
|
|
|
|
|
|
uint8_t chipID = data[0];
|
|
|
|
// select
|
|
|
|
data[0] = 0x0E;
|
|
|
|
data[1] = chipID;
|
|
|
|
*datalen = 2;
|
|
|
|
|
|
|
|
//leave power on
|
|
|
|
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
|
|
|
|
|
|
|
|
if (*datalen != 3 || !crc || data[0] != chipID) return rawClose();
|
|
|
|
|
|
|
|
// get uid
|
|
|
|
data[0] = 0x0B;
|
|
|
|
*datalen = 1;
|
|
|
|
|
2015-07-13 04:58:16 +08:00
|
|
|
//leave power on
|
|
|
|
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
|
|
|
|
|
|
|
|
if (*datalen != 10 || !crc) return rawClose();
|
|
|
|
|
|
|
|
//power off ?
|
|
|
|
if (closeCon) rawClose();
|
2015-06-25 18:25:44 +08:00
|
|
|
|
|
|
|
PrintAndLog("\n14443-3b ST tag found:");
|
2015-06-30 04:37:55 +08:00
|
|
|
print_st_general_info(data);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// SRx get and print full info (needs more info...)
|
|
|
|
int HF14B_ST_Info(uint8_t *data, uint8_t *datalen){
|
2015-07-13 04:58:16 +08:00
|
|
|
if (!HF14B_ST_Reader(data, datalen, false)) return 0;
|
2015-06-30 04:37:55 +08:00
|
|
|
|
|
|
|
//add locking bit information here.
|
2015-07-13 04:58:16 +08:00
|
|
|
if (print_ST_Lock_info(data[5]>>2))
|
|
|
|
rawClose();
|
2015-06-30 04:37:55 +08:00
|
|
|
|
2015-06-25 18:25:44 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// test for other 14b type tags (mimic another reader - don't have tags to identify)
|
2015-06-30 04:37:55 +08:00
|
|
|
int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen){
|
2015-06-25 18:25:44 +08:00
|
|
|
bool crc = true;
|
|
|
|
*datalen = 4;
|
|
|
|
//std read cmd
|
|
|
|
data[0] = 0x00;
|
|
|
|
data[1] = 0x0b;
|
|
|
|
data[2] = 0x3f;
|
|
|
|
data[3] = 0x80;
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)!=0) {
|
2015-06-25 18:25:44 +08:00
|
|
|
if (*datalen > 2 || !crc) {
|
|
|
|
PrintAndLog ("\n14443-3b tag found:");
|
|
|
|
PrintAndLog ("Unknown tag type answered to a 0x000b3f80 command ans:");
|
|
|
|
PrintAndLog ("%s",sprint_hex(data,*datalen));
|
2015-07-13 04:58:16 +08:00
|
|
|
rawClose();
|
2015-06-25 18:25:44 +08:00
|
|
|
return 1;
|
|
|
|
}
|
2015-06-21 17:07:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
crc = false;
|
|
|
|
*datalen = 1;
|
|
|
|
data[0] = 0x0a;
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)!=0) {
|
2015-06-21 17:07:05 +08:00
|
|
|
if (*datalen > 0) {
|
|
|
|
PrintAndLog ("\n14443-3b tag found:");
|
|
|
|
PrintAndLog ("Unknown tag type answered to a 0x0A command ans:");
|
|
|
|
PrintAndLog ("%s",sprint_hex(data,*datalen));
|
2015-07-13 04:58:16 +08:00
|
|
|
rawClose();
|
2015-06-21 17:07:05 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
crc = false;
|
|
|
|
*datalen = 1;
|
|
|
|
data[0] = 0x0c;
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)!=0) {
|
2015-06-21 17:07:05 +08:00
|
|
|
if (*datalen > 0) {
|
|
|
|
PrintAndLog ("\n14443-3b tag found:");
|
|
|
|
PrintAndLog ("Unknown tag type answered to a 0x0C command ans:");
|
|
|
|
PrintAndLog ("%s",sprint_hex(data,*datalen));
|
2015-07-13 04:58:16 +08:00
|
|
|
rawClose();
|
2015-06-21 17:07:05 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
2015-06-30 04:37:55 +08:00
|
|
|
rawClose();
|
2015-06-21 17:07:05 +08:00
|
|
|
return 0;
|
2015-06-14 20:39:50 +08:00
|
|
|
}
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
// get and print all info known about any known 14b tag
|
2015-06-25 18:25:44 +08:00
|
|
|
int HF14BInfo(bool verbose){
|
2015-06-30 04:37:55 +08:00
|
|
|
uint8_t data[USB_CMD_DATA_SIZE];
|
2015-06-21 17:07:05 +08:00
|
|
|
uint8_t datalen = 5;
|
|
|
|
|
|
|
|
// try std 14b (atqb)
|
2015-06-25 18:25:44 +08:00
|
|
|
if (HF14BStdInfo(data, &datalen)) return 1;
|
2015-06-21 17:07:05 +08:00
|
|
|
|
|
|
|
// try st 14b
|
2015-06-25 18:25:44 +08:00
|
|
|
if (HF14B_ST_Info(data, &datalen)) return 1;
|
2015-06-14 20:39:50 +08:00
|
|
|
|
2015-06-21 17:07:05 +08:00
|
|
|
// try unknown 14b read commands (to be identified later)
|
|
|
|
// could be read of calypso, CEPAS, moneo, or pico pass.
|
2015-06-30 04:37:55 +08:00
|
|
|
if (HF14B_Other_Reader(data, &datalen)) return 1;
|
2015-06-18 15:52:53 +08:00
|
|
|
|
2015-06-16 02:59:01 +08:00
|
|
|
if (verbose) PrintAndLog("no 14443B tag found");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
// menu command to get and print all info known about any known 14b tag
|
2015-06-25 18:25:44 +08:00
|
|
|
int CmdHF14Binfo(const char *Cmd){
|
|
|
|
return HF14BInfo(true);
|
2013-09-02 02:41:05 +08:00
|
|
|
}
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
// get and print general info about all known 14b chips
|
|
|
|
int HF14BReader(bool verbose){
|
|
|
|
uint8_t data[USB_CMD_DATA_SIZE];
|
|
|
|
uint8_t datalen = 5;
|
|
|
|
|
|
|
|
// try std 14b (atqb)
|
|
|
|
if (HF14BStdReader(data, &datalen)) return 1;
|
|
|
|
|
|
|
|
// try st 14b
|
2015-07-13 04:58:16 +08:00
|
|
|
if (HF14B_ST_Reader(data, &datalen, true)) return 1;
|
2015-06-30 04:37:55 +08:00
|
|
|
|
|
|
|
// try unknown 14b read commands (to be identified later)
|
|
|
|
// could be read of calypso, CEPAS, moneo, or pico pass.
|
|
|
|
if (HF14B_Other_Reader(data, &datalen)) return 1;
|
|
|
|
|
|
|
|
if (verbose) PrintAndLog("no 14443B tag found");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// menu command to get and print general info about all known 14b chips
|
|
|
|
int CmdHF14BReader(const char *Cmd){
|
|
|
|
return HF14BReader(true);
|
|
|
|
}
|
|
|
|
|
2015-06-25 18:25:44 +08:00
|
|
|
int CmdSriWrite( const char *Cmd){
|
2015-01-05 22:51:27 +08:00
|
|
|
/*
|
|
|
|
* 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
|
|
|
|
2015-01-21 04:50:49 +08:00
|
|
|
sprintf(str, "-c 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;
|
|
|
|
}
|
|
|
|
|
2015-11-23 01:13:26 +08:00
|
|
|
int srix4kChecksum(uint32_t value) {
|
|
|
|
/*
|
|
|
|
// vv = value
|
|
|
|
// pp = position
|
|
|
|
// vv vv vv pp
|
|
|
|
4 bytes : 00 1A 20 01
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define NibbleHigh(b) ( (b & 0xF0) >> 4 )
|
|
|
|
#define NibbleLow(b) ( b & 0x0F )
|
|
|
|
#define Crumb(b,p) (((b & (0x3 << p) ) >> p ) & 0xF)
|
|
|
|
|
|
|
|
// only the lower crumbs.
|
|
|
|
uint8_t block = (value & 0xFF);
|
|
|
|
uint8_t i = 0;
|
|
|
|
uint8_t valuebytes[] = {0,0,0};
|
|
|
|
|
|
|
|
// if ( strlen(Cmd) > 0){
|
|
|
|
// value = param_get32ex(Cmd, 0, 0, 16);
|
|
|
|
|
|
|
|
// block = value & 0xFF;
|
|
|
|
|
|
|
|
// value &= 0xFFFFFF00;
|
|
|
|
// value >>=8;
|
|
|
|
// }
|
|
|
|
|
|
|
|
num_to_bytes(value, 3, valuebytes);
|
|
|
|
|
|
|
|
// Scrambled part
|
|
|
|
// Crumb swapping of value.
|
|
|
|
uint8_t temp[] = {0,0};
|
|
|
|
temp[0] = (Crumb(value, 22) << 4 | Crumb(value, 14 ) << 2 | Crumb(value, 6)) << 4;
|
|
|
|
temp[0] |= Crumb(value, 20) << 4 | Crumb(value, 12 ) << 2 | Crumb(value, 4);
|
|
|
|
temp[1] = (Crumb(value, 18) << 4 | Crumb(value, 10 ) << 2 | Crumb(value, 2)) << 4;
|
|
|
|
temp[1] |= Crumb(value, 16) << 4 | Crumb(value, 8 ) << 2 | Crumb(value, 0);
|
|
|
|
|
|
|
|
// chksum part
|
|
|
|
uint32_t chksum = 0xFF - block;
|
|
|
|
|
|
|
|
// chksum is reduced by each nibbles of value.
|
|
|
|
for (i = 0; i < 3; ++i){
|
|
|
|
chksum -= NibbleHigh(valuebytes[i]);
|
|
|
|
chksum -= NibbleLow(valuebytes[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
// base4 conversion
|
|
|
|
// and left shift twice
|
|
|
|
i = 3;
|
|
|
|
uint8_t base4[] = {0,0,0,0};
|
|
|
|
while( chksum !=0 ){
|
|
|
|
base4[i--] = (chksum % 4 << 2);
|
|
|
|
chksum /= 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
// merge scambled and chksum parts
|
|
|
|
uint32_t encvalue =
|
|
|
|
( NibbleLow ( base4[0]) << 28 ) |
|
|
|
|
( NibbleHigh( temp[0]) << 24 ) |
|
|
|
|
|
|
|
|
( NibbleLow ( base4[1]) << 20 ) |
|
|
|
|
( NibbleLow ( temp[0]) << 16 ) |
|
|
|
|
|
|
|
|
( NibbleLow ( base4[2]) << 12 ) |
|
|
|
|
( NibbleHigh( temp[1]) << 8 ) |
|
|
|
|
|
|
|
|
( NibbleLow ( base4[3]) << 4 ) |
|
|
|
|
NibbleLow ( temp[1] );
|
|
|
|
|
|
|
|
PrintAndLog("ICE | %08X", encvalue);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
int srix4kMagicbytes(){
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
int srix4kValid(){
|
|
|
|
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[] =
|
|
|
|
{
|
2015-06-21 17:07:05 +08:00
|
|
|
{"help", CmdHelp, 1, "This help"},
|
2015-06-30 04:37:55 +08:00
|
|
|
{"info", CmdHF14Binfo, 0, "Find and print details about a 14443B tag"},
|
|
|
|
{"list", CmdHF14BList, 0, "[Deprecated] List ISO 14443B history"},
|
|
|
|
{"reader", CmdHF14BReader, 0, "Act as a 14443B reader to identify a tag"},
|
|
|
|
{"sim", CmdHF14BSim, 0, "Fake ISO 14443B tag"},
|
|
|
|
{"snoop", CmdHF14BSnoop, 0, "Eavesdrop ISO 14443B"},
|
2015-06-21 17:07:05 +08:00
|
|
|
{"sri512read", CmdSri512Read, 0, "Read contents of a SRI512 tag"},
|
|
|
|
{"srix4kread", CmdSrix4kRead, 0, "Read contents of a SRIX4K tag"},
|
2015-06-30 04:37:55 +08:00
|
|
|
{"sriwrite", CmdSriWrite, 0, "Write data to a SRI512 | SRIX4K tag"},
|
2015-06-21 17:07:05 +08:00
|
|
|
{"raw", CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
|
2015-11-23 01:13:26 +08:00
|
|
|
//{"calcSrix4", srix4kchksum, 1, "a srix4k checksum test"},
|
2015-06-21 17:07:05 +08:00
|
|
|
{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 CmdHF14B(const char *Cmd)
|
|
|
|
{
|
2015-06-21 17:07:05 +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-06-21 17:07:05 +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
|
|
|
}
|