2010-02-21 08:47:22 +08:00
|
|
|
//-----------------------------------------------------------------------------
|
2017-11-01 00:14:32 +08:00
|
|
|
// 2011, 2017 Merlok
|
2010-07-13 21:39:30 +08:00
|
|
|
// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>, Hagen Fritsch
|
2010-02-21 08:47:22 +08:00
|
|
|
//
|
|
|
|
// 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 ISO14443A 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 "cmdhf14a.h"
|
|
|
|
|
2017-11-10 15:15:56 +08:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <inttypes.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
2017-11-03 19:42:38 +08:00
|
|
|
#include "util.h"
|
|
|
|
#include "util_posix.h"
|
|
|
|
#include "iso14443crc.h"
|
|
|
|
#include "data.h"
|
|
|
|
#include "proxmark3.h"
|
|
|
|
#include "ui.h"
|
|
|
|
#include "cmdparser.h"
|
|
|
|
#include "common.h"
|
|
|
|
#include "cmdmain.h"
|
|
|
|
#include "mifare.h"
|
|
|
|
#include "cmdhfmfu.h"
|
|
|
|
#include "mifarehost.h"
|
|
|
|
#include "emv/apduinfo.h"
|
|
|
|
#include "emv/emvcore.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);
|
2017-10-30 23:58:43 +08:00
|
|
|
static int waitCmd(uint8_t iLen);
|
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
|
|
|
|
2017-11-03 19:42:38 +08:00
|
|
|
|
2015-01-08 04:06:15 +08:00
|
|
|
const manufactureName manufactureMapping[] = {
|
|
|
|
// ID, "Vendor Country"
|
|
|
|
{ 0x01, "Motorola UK" },
|
|
|
|
{ 0x02, "ST Microelectronics SA France" },
|
|
|
|
{ 0x03, "Hitachi, Ltd Japan" },
|
|
|
|
{ 0x04, "NXP Semiconductors Germany" },
|
|
|
|
{ 0x05, "Infineon Technologies AG Germany" },
|
|
|
|
{ 0x06, "Cylink USA" },
|
|
|
|
{ 0x07, "Texas Instrument France" },
|
|
|
|
{ 0x08, "Fujitsu Limited Japan" },
|
|
|
|
{ 0x09, "Matsushita Electronics Corporation, Semiconductor Company Japan" },
|
|
|
|
{ 0x0A, "NEC Japan" },
|
|
|
|
{ 0x0B, "Oki Electric Industry Co. Ltd Japan" },
|
|
|
|
{ 0x0C, "Toshiba Corp. Japan" },
|
|
|
|
{ 0x0D, "Mitsubishi Electric Corp. Japan" },
|
|
|
|
{ 0x0E, "Samsung Electronics Co. Ltd Korea" },
|
|
|
|
{ 0x0F, "Hynix / Hyundai, Korea" },
|
|
|
|
{ 0x10, "LG-Semiconductors Co. Ltd Korea" },
|
|
|
|
{ 0x11, "Emosyn-EM Microelectronics USA" },
|
|
|
|
{ 0x12, "INSIDE Technology France" },
|
|
|
|
{ 0x13, "ORGA Kartensysteme GmbH Germany" },
|
|
|
|
{ 0x14, "SHARP Corporation Japan" },
|
|
|
|
{ 0x15, "ATMEL France" },
|
|
|
|
{ 0x16, "EM Microelectronic-Marin SA Switzerland" },
|
|
|
|
{ 0x17, "KSW Microtec GmbH Germany" },
|
|
|
|
{ 0x18, "ZMD AG Germany" },
|
|
|
|
{ 0x19, "XICOR, Inc. USA" },
|
|
|
|
{ 0x1A, "Sony Corporation Japan Identifier Company Country" },
|
|
|
|
{ 0x1B, "Malaysia Microelectronic Solutions Sdn. Bhd Malaysia" },
|
|
|
|
{ 0x1C, "Emosyn USA" },
|
|
|
|
{ 0x1D, "Shanghai Fudan Microelectronics Co. Ltd. P.R. China" },
|
|
|
|
{ 0x1E, "Magellan Technology Pty Limited Australia" },
|
|
|
|
{ 0x1F, "Melexis NV BO Switzerland" },
|
|
|
|
{ 0x20, "Renesas Technology Corp. Japan" },
|
|
|
|
{ 0x21, "TAGSYS France" },
|
|
|
|
{ 0x22, "Transcore USA" },
|
|
|
|
{ 0x23, "Shanghai belling corp., ltd. China" },
|
|
|
|
{ 0x24, "Masktech Germany Gmbh Germany" },
|
|
|
|
{ 0x25, "Innovision Research and Technology Plc UK" },
|
|
|
|
{ 0x26, "Hitachi ULSI Systems Co., Ltd. Japan" },
|
|
|
|
{ 0x27, "Cypak AB Sweden" },
|
|
|
|
{ 0x28, "Ricoh Japan" },
|
|
|
|
{ 0x29, "ASK France" },
|
|
|
|
{ 0x2A, "Unicore Microsystems, LLC Russian Federation" },
|
|
|
|
{ 0x2B, "Dallas Semiconductor/Maxim USA" },
|
|
|
|
{ 0x2C, "Impinj, Inc. USA" },
|
|
|
|
{ 0x2D, "RightPlug Alliance USA" },
|
|
|
|
{ 0x2E, "Broadcom Corporation USA" },
|
|
|
|
{ 0x2F, "MStar Semiconductor, Inc Taiwan, ROC" },
|
|
|
|
{ 0x30, "BeeDar Technology Inc. USA" },
|
|
|
|
{ 0x31, "RFIDsec Denmark" },
|
|
|
|
{ 0x32, "Schweizer Electronic AG Germany" },
|
|
|
|
{ 0x33, "AMIC Technology Corp Taiwan" },
|
|
|
|
{ 0x34, "Mikron JSC Russia" },
|
|
|
|
{ 0x35, "Fraunhofer Institute for Photonic Microsystems Germany" },
|
|
|
|
{ 0x36, "IDS Microchip AG Switzerland" },
|
|
|
|
{ 0x37, "Kovio USA" },
|
|
|
|
{ 0x38, "HMT Microelectronic Ltd Switzerland Identifier Company Country" },
|
|
|
|
{ 0x39, "Silicon Craft Technology Thailand" },
|
|
|
|
{ 0x3A, "Advanced Film Device Inc. Japan" },
|
|
|
|
{ 0x3B, "Nitecrest Ltd UK" },
|
|
|
|
{ 0x3C, "Verayo Inc. USA" },
|
|
|
|
{ 0x3D, "HID Global USA" },
|
|
|
|
{ 0x3E, "Productivity Engineering Gmbh Germany" },
|
|
|
|
{ 0x3F, "Austriamicrosystems AG (reserved) Austria" },
|
|
|
|
{ 0x40, "Gemalto SA France" },
|
|
|
|
{ 0x41, "Renesas Electronics Corporation Japan" },
|
|
|
|
{ 0x42, "3Alogics Inc Korea" },
|
|
|
|
{ 0x43, "Top TroniQ Asia Limited Hong Kong" },
|
|
|
|
{ 0x44, "Gentag Inc (USA) USA" },
|
|
|
|
{ 0x00, "no tag-info available" } // must be the last entry
|
|
|
|
};
|
|
|
|
|
|
|
|
// get a product description based on the UID
|
|
|
|
// uid[8] tag uid
|
|
|
|
// returns description of the best match
|
2015-01-08 05:00:29 +08:00
|
|
|
char* getTagInfo(uint8_t uid) {
|
2015-01-08 04:06:15 +08:00
|
|
|
|
2015-01-12 04:49:13 +08:00
|
|
|
int i;
|
2015-01-08 04:06:15 +08:00
|
|
|
int len = sizeof(manufactureMapping) / sizeof(manufactureName);
|
|
|
|
|
2015-01-12 04:49:13 +08:00
|
|
|
for ( i = 0; i < len; ++i )
|
|
|
|
if ( uid == manufactureMapping[i].uid)
|
|
|
|
return manufactureMapping[i].desc;
|
2015-01-08 04:06:15 +08:00
|
|
|
|
2015-01-12 04:49:13 +08:00
|
|
|
//No match, return default
|
|
|
|
return manufactureMapping[len-1].desc;
|
2015-01-08 04:06:15 +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
|
|
|
int CmdHF14AList(const char *Cmd)
|
|
|
|
{
|
2015-01-05 04:22:54 +08:00
|
|
|
PrintAndLog("Deprecated command, use 'hf list 14a' instead");
|
2011-05-31 19:31: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
|
|
|
}
|
|
|
|
|
2017-11-01 15:51:05 +08:00
|
|
|
int CmdHF14AReader(const char *Cmd) {
|
|
|
|
uint32_t cm = ISO14A_CONNECT;
|
|
|
|
bool disconnectAfter = false;
|
|
|
|
|
|
|
|
int cmdp = 0;
|
|
|
|
while(param_getchar(Cmd, cmdp) != 0x00) {
|
|
|
|
switch(param_getchar(Cmd, cmdp)) {
|
|
|
|
case 'h':
|
|
|
|
case 'H':
|
|
|
|
PrintAndLog("Usage: hf 14a reader [d] [3]");
|
|
|
|
PrintAndLog(" d drop the signal field after command executed");
|
|
|
|
PrintAndLog(" x just drop the signal field");
|
|
|
|
PrintAndLog(" 3 ISO14443-3 select only (skip RATS)");
|
|
|
|
return 0;
|
|
|
|
case '3':
|
|
|
|
cm |= ISO14A_NO_RATS;
|
|
|
|
break;
|
|
|
|
case 'd':
|
|
|
|
case 'D':
|
|
|
|
disconnectAfter = true;
|
|
|
|
break;
|
|
|
|
case 'x':
|
|
|
|
case 'X':
|
|
|
|
disconnectAfter = true;
|
|
|
|
cm = cm - ISO14A_CONNECT;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
PrintAndLog("Unknown command.");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
cmdp++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!disconnectAfter)
|
|
|
|
cm |= ISO14A_NO_DISCONNECT;
|
|
|
|
|
|
|
|
UsbCommand c = {CMD_READER_ISO_14443a, {cm, 0, 0}};
|
|
|
|
SendCommand(&c);
|
|
|
|
|
|
|
|
if (ISO14A_CONNECT & cm) {
|
|
|
|
UsbCommand resp;
|
|
|
|
WaitForResponse(CMD_ACK,&resp);
|
|
|
|
|
|
|
|
iso14a_card_select_t card;
|
|
|
|
memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
|
|
|
|
|
|
|
|
uint64_t select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
|
|
|
|
|
|
|
|
if(select_status == 0) {
|
|
|
|
PrintAndLog("iso14443a card select failed");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(select_status == 3) {
|
|
|
|
PrintAndLog("Card doesn't support standard iso14443-3 anticollision");
|
|
|
|
PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
|
|
|
|
PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
|
|
|
|
PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
|
|
|
|
if(card.ats_len >= 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
|
|
|
|
PrintAndLog(" ATS : %s", sprint_hex(card.ats, card.ats_len));
|
|
|
|
}
|
|
|
|
PrintAndLog("Card is selected. You can now start sending commands");
|
|
|
|
} else {
|
|
|
|
PrintAndLog("Field dropped.");
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHF14AInfo(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
|
|
|
{
|
2014-06-30 14:21:50 +08:00
|
|
|
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
|
2010-07-13 21:39:30 +08:00
|
|
|
SendCommand(&c);
|
2012-12-05 07:39:18 +08:00
|
|
|
|
|
|
|
UsbCommand resp;
|
2014-02-20 04:35:04 +08:00
|
|
|
WaitForResponse(CMD_ACK,&resp);
|
2012-12-05 07:39:18 +08:00
|
|
|
|
2014-06-30 14:21:50 +08:00
|
|
|
iso14a_card_select_t card;
|
|
|
|
memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
|
2010-07-13 21:39:30 +08:00
|
|
|
|
2015-03-13 14:36:52 +08:00
|
|
|
uint64_t select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision
|
2014-06-30 14:21:50 +08:00
|
|
|
|
|
|
|
if(select_status == 0) {
|
2015-05-13 04:45:48 +08:00
|
|
|
if (Cmd[0] != 's') PrintAndLog("iso14443a card select failed");
|
2014-12-23 18:11:52 +08:00
|
|
|
// disconnect
|
|
|
|
c.arg[0] = 0;
|
|
|
|
c.arg[1] = 0;
|
|
|
|
c.arg[2] = 0;
|
|
|
|
SendCommand(&c);
|
2010-07-13 21:39:30 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-03-13 14:36:52 +08:00
|
|
|
if(select_status == 3) {
|
|
|
|
PrintAndLog("Card doesn't support standard iso14443-3 anticollision");
|
|
|
|
PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
|
|
|
|
// disconnect
|
|
|
|
c.arg[0] = 0;
|
|
|
|
c.arg[1] = 0;
|
|
|
|
c.arg[2] = 0;
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-06-30 14:21:50 +08:00
|
|
|
PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
|
2015-04-29 03:35:23 +08:00
|
|
|
PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
|
2014-06-30 14:21:50 +08:00
|
|
|
PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
|
2012-02-05 17:30:08 +08:00
|
|
|
|
2017-11-02 00:48:59 +08:00
|
|
|
bool isMifareClassic = true;
|
2014-06-30 14:21:50 +08:00
|
|
|
switch (card.sak) {
|
2015-04-29 03:35:23 +08:00
|
|
|
case 0x00:
|
2017-11-02 00:48:59 +08:00
|
|
|
isMifareClassic = false;
|
2015-05-12 12:19:44 +08:00
|
|
|
|
|
|
|
//***************************************test****************
|
|
|
|
// disconnect
|
|
|
|
c.arg[0] = 0;
|
|
|
|
c.arg[1] = 0;
|
|
|
|
c.arg[2] = 0;
|
|
|
|
SendCommand(&c);
|
|
|
|
|
2015-05-21 02:06:46 +08:00
|
|
|
uint32_t tagT = GetHF14AMfU_Type();
|
2015-05-12 12:19:44 +08:00
|
|
|
ul_print_type(tagT, 0);
|
|
|
|
|
|
|
|
//reconnect for further tests
|
|
|
|
c.arg[0] = ISO14A_CONNECT | ISO14A_NO_DISCONNECT;
|
|
|
|
c.arg[1] = 0;
|
|
|
|
c.arg[2] = 0;
|
|
|
|
|
|
|
|
SendCommand(&c);
|
|
|
|
|
|
|
|
UsbCommand resp;
|
|
|
|
WaitForResponse(CMD_ACK,&resp);
|
|
|
|
|
|
|
|
memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
|
|
|
|
|
|
|
|
select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
|
|
|
|
|
|
|
|
if(select_status == 0) {
|
|
|
|
//PrintAndLog("iso14443a card select failed");
|
|
|
|
// disconnect
|
|
|
|
c.arg[0] = 0;
|
|
|
|
c.arg[1] = 0;
|
|
|
|
c.arg[2] = 0;
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* orig
|
2015-04-29 03:35:23 +08:00
|
|
|
// check if the tag answers to GETVERSION (0x60)
|
|
|
|
c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
|
|
|
|
c.arg[1] = 1;
|
|
|
|
c.arg[2] = 0;
|
|
|
|
c.d.asBytes[0] = 0x60;
|
|
|
|
SendCommand(&c);
|
|
|
|
WaitForResponse(CMD_ACK,&resp);
|
|
|
|
|
2015-05-04 04:09:52 +08:00
|
|
|
uint8_t version[10] = {0};
|
|
|
|
memcpy(version, resp.d.asBytes, resp.arg[0] < sizeof(version) ? resp.arg[0] : sizeof(version));
|
2015-04-29 03:35:23 +08:00
|
|
|
uint8_t len = resp.arg[0] & 0xff;
|
|
|
|
switch ( len ){
|
|
|
|
// todo, identify "Magic UL-C tags". // they usually have a static nonce response to 0x1A command.
|
|
|
|
// UL-EV1, size, check version[6] == 0x0b (smaller) 0x0b * 4 == 48
|
|
|
|
case 0x0A:PrintAndLog("TYPE : NXP MIFARE Ultralight EV1 %d bytes", (version[6] == 0xB) ? 48 : 128);break;
|
|
|
|
case 0x01:PrintAndLog("TYPE : NXP MIFARE Ultralight C");break;
|
|
|
|
case 0x00:PrintAndLog("TYPE : NXP MIFARE Ultralight");break;
|
|
|
|
}
|
2015-05-12 12:19:44 +08:00
|
|
|
*/
|
2015-04-29 03:35:23 +08:00
|
|
|
break;
|
2015-01-05 22:51:27 +08:00
|
|
|
case 0x01: PrintAndLog("TYPE : NXP TNP3xxx Activision Game Appliance"); break;
|
2013-02-27 21:23:38 +08:00
|
|
|
case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
|
2013-11-20 02:52:40 +08:00
|
|
|
case 0x08: PrintAndLog("TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1"); break;
|
2013-02-27 21:23:38 +08:00
|
|
|
case 0x09: PrintAndLog("TYPE : NXP MIFARE Mini 0.3k"); break;
|
2013-11-20 02:52:40 +08:00
|
|
|
case 0x10: PrintAndLog("TYPE : NXP MIFARE Plus 2k SL2"); break;
|
|
|
|
case 0x11: PrintAndLog("TYPE : NXP MIFARE Plus 4k SL2"); break;
|
|
|
|
case 0x18: PrintAndLog("TYPE : NXP MIFARE Classic 4k | Plus 4k SL1"); break;
|
|
|
|
case 0x20: PrintAndLog("TYPE : NXP MIFARE DESFire 4k | DESFire EV1 2k/4k/8k | Plus 2k/4k SL3 | JCOP 31/41"); break;
|
2013-02-27 21:23:38 +08:00
|
|
|
case 0x24: PrintAndLog("TYPE : NXP MIFARE DESFire | DESFire EV1"); break;
|
|
|
|
case 0x28: PrintAndLog("TYPE : JCOP31 or JCOP41 v2.3.1"); break;
|
|
|
|
case 0x38: PrintAndLog("TYPE : Nokia 6212 or 6131 MIFARE CLASSIC 4K"); break;
|
|
|
|
case 0x88: PrintAndLog("TYPE : Infineon MIFARE CLASSIC 1K"); break;
|
|
|
|
case 0x98: PrintAndLog("TYPE : Gemplus MPCOS"); break;
|
2011-06-10 21:35:10 +08:00
|
|
|
default: ;
|
|
|
|
}
|
2014-06-30 14:21:50 +08:00
|
|
|
|
2015-04-29 03:35:23 +08:00
|
|
|
// Double & triple sized UID, can be mapped to a manufacturer.
|
|
|
|
// HACK: does this apply for Ultralight cards?
|
|
|
|
if ( card.uidlen > 4 ) {
|
|
|
|
PrintAndLog("MANUFACTURER : %s", getTagInfo(card.uid[0]));
|
|
|
|
}
|
|
|
|
|
2014-06-30 14:21:50 +08:00
|
|
|
// try to request ATS even if tag claims not to support it
|
|
|
|
if (select_status == 2) {
|
|
|
|
uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
|
|
|
|
c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
|
|
|
|
c.arg[1] = 2;
|
|
|
|
c.arg[2] = 0;
|
|
|
|
memcpy(c.d.asBytes, rats, 2);
|
|
|
|
SendCommand(&c);
|
|
|
|
WaitForResponse(CMD_ACK,&resp);
|
|
|
|
|
2015-05-04 04:09:52 +08:00
|
|
|
memcpy(card.ats, resp.d.asBytes, resp.arg[0]);
|
2014-07-15 14:35:27 +08:00
|
|
|
card.ats_len = resp.arg[0]; // note: ats_len includes CRC Bytes
|
2014-06-30 14:21:50 +08:00
|
|
|
}
|
|
|
|
|
2014-07-15 14:35:27 +08:00
|
|
|
if(card.ats_len >= 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
|
2012-07-26 00:19:56 +08:00
|
|
|
bool ta1 = 0, tb1 = 0, tc1 = 0;
|
|
|
|
int pos;
|
|
|
|
|
2014-07-15 14:35:27 +08:00
|
|
|
if (select_status == 2) {
|
2014-06-30 14:21:50 +08:00
|
|
|
PrintAndLog("SAK incorrectly claims that card doesn't support RATS");
|
|
|
|
}
|
|
|
|
PrintAndLog(" ATS : %s", sprint_hex(card.ats, card.ats_len));
|
2014-07-15 14:35:27 +08:00
|
|
|
PrintAndLog(" - TL : length is %d bytes", card.ats[0]);
|
|
|
|
if (card.ats[0] != card.ats_len - 2) {
|
|
|
|
PrintAndLog("ATS may be corrupted. Length of ATS (%d bytes incl. 2 Bytes CRC) doesn't match TL", card.ats_len);
|
2012-07-26 00:19:56 +08:00
|
|
|
}
|
2014-07-15 14:35:27 +08:00
|
|
|
|
|
|
|
if (card.ats[0] > 1) { // there is a format byte (T0)
|
2014-06-30 14:21:50 +08:00
|
|
|
ta1 = (card.ats[1] & 0x10) == 0x10;
|
|
|
|
tb1 = (card.ats[1] & 0x20) == 0x20;
|
|
|
|
tc1 = (card.ats[1] & 0x40) == 0x40;
|
2014-07-15 14:35:27 +08:00
|
|
|
int16_t fsci = card.ats[1] & 0x0f;
|
2012-07-26 00:19:56 +08:00
|
|
|
PrintAndLog(" - T0 : TA1 is%s present, TB1 is%s present, "
|
2014-07-15 14:35:27 +08:00
|
|
|
"TC1 is%s present, FSCI is %d (FSC = %ld)",
|
2012-07-26 00:19:56 +08:00
|
|
|
(ta1 ? "" : " NOT"), (tb1 ? "" : " NOT"), (tc1 ? "" : " NOT"),
|
2014-07-15 14:35:27 +08:00
|
|
|
fsci,
|
|
|
|
fsci < 5 ? (fsci - 2) * 8 :
|
|
|
|
fsci < 8 ? (fsci - 3) * 32 :
|
|
|
|
fsci == 8 ? 256 :
|
|
|
|
-1
|
|
|
|
);
|
2012-07-26 00:19:56 +08:00
|
|
|
}
|
|
|
|
pos = 2;
|
2014-07-15 14:35:27 +08:00
|
|
|
if (ta1) {
|
2012-07-26 00:19:56 +08:00
|
|
|
char dr[16], ds[16];
|
|
|
|
dr[0] = ds[0] = '\0';
|
2014-06-30 14:21:50 +08:00
|
|
|
if (card.ats[pos] & 0x10) strcat(ds, "2, ");
|
|
|
|
if (card.ats[pos] & 0x20) strcat(ds, "4, ");
|
|
|
|
if (card.ats[pos] & 0x40) strcat(ds, "8, ");
|
|
|
|
if (card.ats[pos] & 0x01) strcat(dr, "2, ");
|
|
|
|
if (card.ats[pos] & 0x02) strcat(dr, "4, ");
|
|
|
|
if (card.ats[pos] & 0x04) strcat(dr, "8, ");
|
2012-07-26 00:19:56 +08:00
|
|
|
if (strlen(ds) != 0) ds[strlen(ds) - 2] = '\0';
|
|
|
|
if (strlen(dr) != 0) dr[strlen(dr) - 2] = '\0';
|
|
|
|
PrintAndLog(" - TA1 : different divisors are%s supported, "
|
|
|
|
"DR: [%s], DS: [%s]",
|
2014-06-30 14:21:50 +08:00
|
|
|
(card.ats[pos] & 0x80 ? " NOT" : ""), dr, ds);
|
2012-07-26 00:19:56 +08:00
|
|
|
pos++;
|
|
|
|
}
|
2014-07-15 14:35:27 +08:00
|
|
|
if (tb1) {
|
|
|
|
uint32_t sfgi = card.ats[pos] & 0x0F;
|
|
|
|
uint32_t fwi = card.ats[pos] >> 4;
|
|
|
|
PrintAndLog(" - TB1 : SFGI = %d (SFGT = %s%ld/fc), FWI = %d (FWT = %ld/fc)",
|
|
|
|
(sfgi),
|
|
|
|
sfgi ? "" : "(not needed) ",
|
|
|
|
sfgi ? (1 << 12) << sfgi : 0,
|
|
|
|
fwi,
|
|
|
|
(1 << 12) << fwi
|
|
|
|
);
|
2012-07-26 00:19:56 +08:00
|
|
|
pos++;
|
|
|
|
}
|
2014-07-15 14:35:27 +08:00
|
|
|
if (tc1) {
|
2012-07-26 00:19:56 +08:00
|
|
|
PrintAndLog(" - TC1 : NAD is%s supported, CID is%s supported",
|
2014-06-30 14:21:50 +08:00
|
|
|
(card.ats[pos] & 0x01) ? "" : " NOT",
|
|
|
|
(card.ats[pos] & 0x02) ? "" : " NOT");
|
2012-07-26 00:19:56 +08:00
|
|
|
pos++;
|
|
|
|
}
|
2014-07-15 14:35:27 +08:00
|
|
|
if (card.ats[0] > pos) {
|
2012-07-26 00:19:56 +08:00
|
|
|
char *tip = "";
|
2014-07-15 14:35:27 +08:00
|
|
|
if (card.ats[0] - pos >= 7) {
|
2014-06-30 14:21:50 +08:00
|
|
|
if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
|
2012-07-26 00:19:56 +08:00
|
|
|
tip = "-> MIFARE Plus X 2K or 4K";
|
2014-06-30 14:21:50 +08:00
|
|
|
} else if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
|
2012-07-26 00:19:56 +08:00
|
|
|
tip = "-> MIFARE Plus S 2K or 4K";
|
|
|
|
}
|
|
|
|
}
|
2014-07-15 14:35:27 +08:00
|
|
|
PrintAndLog(" - HB : %s%s", sprint_hex(card.ats + pos, card.ats[0] - pos), tip);
|
2014-06-30 14:21:50 +08:00
|
|
|
if (card.ats[pos] == 0xC1) {
|
2012-07-26 00:19:56 +08:00
|
|
|
PrintAndLog(" c1 -> Mifare or (multiple) virtual cards of various type");
|
|
|
|
PrintAndLog(" %02x -> Length is %d bytes",
|
2014-06-30 14:21:50 +08:00
|
|
|
card.ats[pos + 1], card.ats[pos + 1]);
|
|
|
|
switch (card.ats[pos + 2] & 0xf0) {
|
2012-07-26 00:19:56 +08:00
|
|
|
case 0x10:
|
|
|
|
PrintAndLog(" 1x -> MIFARE DESFire");
|
|
|
|
break;
|
|
|
|
case 0x20:
|
|
|
|
PrintAndLog(" 2x -> MIFARE Plus");
|
|
|
|
break;
|
|
|
|
}
|
2014-06-30 14:21:50 +08:00
|
|
|
switch (card.ats[pos + 2] & 0x0f) {
|
2012-07-26 00:19:56 +08:00
|
|
|
case 0x00:
|
|
|
|
PrintAndLog(" x0 -> <1 kByte");
|
|
|
|
break;
|
|
|
|
case 0x01:
|
2015-11-10 04:06:58 +08:00
|
|
|
PrintAndLog(" x1 -> 1 kByte");
|
2012-07-26 00:19:56 +08:00
|
|
|
break;
|
|
|
|
case 0x02:
|
2015-11-10 04:06:58 +08:00
|
|
|
PrintAndLog(" x2 -> 2 kByte");
|
2012-07-26 00:19:56 +08:00
|
|
|
break;
|
|
|
|
case 0x03:
|
2015-11-10 04:06:58 +08:00
|
|
|
PrintAndLog(" x3 -> 4 kByte");
|
2012-07-26 00:19:56 +08:00
|
|
|
break;
|
|
|
|
case 0x04:
|
2015-11-10 04:06:58 +08:00
|
|
|
PrintAndLog(" x4 -> 8 kByte");
|
2012-07-26 00:19:56 +08:00
|
|
|
break;
|
|
|
|
}
|
2014-06-30 14:21:50 +08:00
|
|
|
switch (card.ats[pos + 3] & 0xf0) {
|
2012-07-26 00:19:56 +08:00
|
|
|
case 0x00:
|
|
|
|
PrintAndLog(" 0x -> Engineering sample");
|
|
|
|
break;
|
|
|
|
case 0x20:
|
|
|
|
PrintAndLog(" 2x -> Released");
|
|
|
|
break;
|
|
|
|
}
|
2014-06-30 14:21:50 +08:00
|
|
|
switch (card.ats[pos + 3] & 0x0f) {
|
2012-07-26 00:19:56 +08:00
|
|
|
case 0x00:
|
|
|
|
PrintAndLog(" x0 -> Generation 1");
|
|
|
|
break;
|
|
|
|
case 0x01:
|
|
|
|
PrintAndLog(" x1 -> Generation 2");
|
|
|
|
break;
|
|
|
|
case 0x02:
|
|
|
|
PrintAndLog(" x2 -> Generation 3");
|
|
|
|
break;
|
|
|
|
}
|
2014-06-30 14:21:50 +08:00
|
|
|
switch (card.ats[pos + 4] & 0x0f) {
|
2012-07-26 00:19:56 +08:00
|
|
|
case 0x00:
|
|
|
|
PrintAndLog(" x0 -> Only VCSL supported");
|
|
|
|
break;
|
|
|
|
case 0x01:
|
|
|
|
PrintAndLog(" x1 -> VCS, VCSL, and SVC supported");
|
|
|
|
break;
|
|
|
|
case 0x0E:
|
|
|
|
PrintAndLog(" xE -> no VCS command supported");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-02-27 21:23:38 +08:00
|
|
|
} else {
|
2014-06-30 14:21:50 +08:00
|
|
|
PrintAndLog("proprietary non iso14443-4 card found, RATS not supported");
|
|
|
|
}
|
2010-07-13 21:39:30 +08:00
|
|
|
|
2015-01-08 04:06:15 +08:00
|
|
|
|
|
|
|
// try to see if card responses to "chinese magic backdoor" commands.
|
2017-10-27 01:09:53 +08:00
|
|
|
mfCIdentify();
|
2015-01-08 04:06:15 +08:00
|
|
|
|
2017-11-02 00:48:59 +08:00
|
|
|
if (isMifareClassic) {
|
|
|
|
switch(DetectClassicPrng()) {
|
|
|
|
case 0:
|
|
|
|
PrintAndLog("Prng detection: HARDEND (hardnested)");
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
PrintAndLog("Prng detection: WEAK");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
PrintAndLog("Prng detection error.");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-30 14:21:50 +08:00
|
|
|
return select_status;
|
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
|
|
|
}
|
|
|
|
|
2012-08-14 22:56:09 +08:00
|
|
|
// Collect ISO14443 Type A UIDs
|
|
|
|
int CmdHF14ACUIDs(const char *Cmd)
|
|
|
|
{
|
|
|
|
// requested number of UIDs
|
|
|
|
int n = atoi(Cmd);
|
|
|
|
// collect at least 1 (e.g. if no parameter was given)
|
|
|
|
n = n > 0 ? n : 1;
|
|
|
|
|
|
|
|
PrintAndLog("Collecting %d UIDs", n);
|
2017-03-12 22:06:27 +08:00
|
|
|
PrintAndLog("Start: %" PRIu64, msclock()/1000);
|
2012-08-14 22:56:09 +08:00
|
|
|
// repeat n times
|
|
|
|
for (int i = 0; i < n; i++) {
|
|
|
|
// execute anticollision procedure
|
2017-10-01 23:52:10 +08:00
|
|
|
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0}};
|
2012-08-14 22:56:09 +08:00
|
|
|
SendCommand(&c);
|
2012-12-05 07:39:18 +08:00
|
|
|
|
2014-06-26 13:57:49 +08:00
|
|
|
UsbCommand resp;
|
|
|
|
WaitForResponse(CMD_ACK,&resp);
|
2012-12-05 07:39:18 +08:00
|
|
|
|
2014-06-26 13:57:49 +08:00
|
|
|
iso14a_card_select_t *card = (iso14a_card_select_t *) resp.d.asBytes;
|
2012-08-14 22:56:09 +08:00
|
|
|
|
|
|
|
// check if command failed
|
2012-12-05 07:39:18 +08:00
|
|
|
if (resp.arg[0] == 0) {
|
2012-08-14 22:56:09 +08:00
|
|
|
PrintAndLog("Card select failed.");
|
|
|
|
} else {
|
2014-06-26 13:57:49 +08:00
|
|
|
char uid_string[20];
|
|
|
|
for (uint16_t i = 0; i < card->uidlen; i++) {
|
|
|
|
sprintf(&uid_string[2*i], "%02X", card->uid[i]);
|
2012-08-14 22:56:09 +08:00
|
|
|
}
|
2014-06-26 13:57:49 +08:00
|
|
|
PrintAndLog("%s", uid_string);
|
2012-08-14 22:56:09 +08:00
|
|
|
}
|
|
|
|
}
|
2017-03-12 22:06:27 +08:00
|
|
|
PrintAndLog("End: %" PRIu64, msclock()/1000);
|
2012-08-14 22:56:09 +08:00
|
|
|
|
|
|
|
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
|
|
|
// ## simulate iso14443a tag
|
|
|
|
// ## greg - added ability to specify tag UID
|
|
|
|
int CmdHF14ASim(const char *Cmd)
|
2012-06-29 18:24:05 +08:00
|
|
|
{
|
|
|
|
UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{0,0,0}};
|
|
|
|
|
|
|
|
// Retrieve the tag type
|
|
|
|
uint8_t tagtype = param_get8ex(Cmd,0,0,10);
|
|
|
|
|
|
|
|
// When no argument was given, just print help message
|
|
|
|
if (tagtype == 0) {
|
|
|
|
PrintAndLog("");
|
|
|
|
PrintAndLog(" Emulating ISO/IEC 14443 type A tag with 4 or 7 byte UID");
|
|
|
|
PrintAndLog("");
|
|
|
|
PrintAndLog(" syntax: hf 14a sim <type> <uid>");
|
|
|
|
PrintAndLog(" types: 1 = MIFARE Classic");
|
|
|
|
PrintAndLog(" 2 = MIFARE Ultralight");
|
2015-01-21 04:23:04 +08:00
|
|
|
PrintAndLog(" 3 = MIFARE Desfire");
|
2012-06-29 18:24:05 +08:00
|
|
|
PrintAndLog(" 4 = ISO/IEC 14443-4");
|
2015-01-21 04:23:04 +08:00
|
|
|
PrintAndLog(" 5 = MIFARE Tnp3xxx");
|
2012-06-29 18:24:05 +08:00
|
|
|
PrintAndLog("");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Store the tag type
|
|
|
|
c.arg[0] = tagtype;
|
|
|
|
|
|
|
|
// Retrieve the full 4 or 7 byte long uid
|
|
|
|
uint64_t long_uid = param_get64ex(Cmd,1,0,16);
|
|
|
|
|
|
|
|
// Are we handling the (optional) second part uid?
|
|
|
|
if (long_uid > 0xffffffff) {
|
2017-02-23 05:45:00 +08:00
|
|
|
PrintAndLog("Emulating ISO/IEC 14443 type A tag with 7 byte UID (%014" PRIx64 ")",long_uid);
|
2012-06-29 18:24:05 +08:00
|
|
|
// Store the second part
|
|
|
|
c.arg[2] = (long_uid & 0xffffffff);
|
|
|
|
long_uid >>= 32;
|
|
|
|
// Store the first part, ignore the first byte, it is replaced by cascade byte (0x88)
|
|
|
|
c.arg[1] = (long_uid & 0xffffff);
|
|
|
|
} else {
|
|
|
|
PrintAndLog("Emulating ISO/IEC 14443 type A tag with 4 byte UID (%08x)",long_uid);
|
|
|
|
// Only store the first part
|
|
|
|
c.arg[1] = long_uid & 0xffffffff;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
// At lease save the mandatory first part of the UID
|
|
|
|
c.arg[0] = long_uid & 0xffffffff;
|
|
|
|
|
|
|
|
if (c.arg[1] == 0) {
|
|
|
|
PrintAndLog("Emulating ISO/IEC 14443 type A tag with UID %01d %08x %08x",c.arg[0],c.arg[1],c.arg[2]);
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (c.arg[0]) {
|
|
|
|
case 1: {
|
|
|
|
PrintAndLog("Emulating ISO/IEC 14443-3 type A tag with 4 byte UID");
|
|
|
|
UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16)};
|
|
|
|
} break;
|
|
|
|
case 2: {
|
|
|
|
PrintAndLog("Emulating ISO/IEC 14443-4 type A tag with 7 byte UID");
|
|
|
|
} break;
|
|
|
|
default: {
|
|
|
|
PrintAndLog("Error: unkown tag type (%d)",c.arg[0]);
|
|
|
|
PrintAndLog("syntax: hf 14a sim <uid>",c.arg[0]);
|
|
|
|
PrintAndLog(" type1: 4 ",c.arg[0]);
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
} break;
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
/*
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
unsigned int hi = 0, lo = 0;
|
|
|
|
int n = 0, i = 0;
|
|
|
|
while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
|
|
|
|
hi= (hi << 4) | (lo >> 28);
|
|
|
|
lo= (lo << 4) | (n & 0xf);
|
|
|
|
}
|
2012-06-29 18:24:05 +08:00
|
|
|
*/
|
|
|
|
// UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,param_get32ex(Cmd,0,0,10),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16)};
|
|
|
|
// PrintAndLog("Emulating ISO/IEC 14443 type A tag with UID %01d %08x %08x",c.arg[0],c.arg[1],c.arg[2]);
|
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
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-07-07 23:29:51 +08:00
|
|
|
int CmdHF14ASnoop(const char *Cmd) {
|
|
|
|
int param = 0;
|
|
|
|
|
2015-01-22 04:24:37 +08:00
|
|
|
uint8_t ctmp = param_getchar(Cmd, 0) ;
|
|
|
|
if (ctmp == 'h' || ctmp == 'H') {
|
2012-07-07 23:29:51 +08:00
|
|
|
PrintAndLog("It get data from the field and saves it into command buffer.");
|
2015-01-05 04:22:54 +08:00
|
|
|
PrintAndLog("Buffer accessible from command hf list 14a.");
|
2012-07-07 23:29:51 +08:00
|
|
|
PrintAndLog("Usage: hf 14a snoop [c][r]");
|
|
|
|
PrintAndLog("c - triggered by first data from card");
|
|
|
|
PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)");
|
|
|
|
PrintAndLog("sample: hf 14a snoop c r");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < 2; i++) {
|
2015-01-22 04:24:37 +08:00
|
|
|
ctmp = param_getchar(Cmd, i);
|
2012-07-07 23:29:51 +08:00
|
|
|
if (ctmp == 'c' || ctmp == 'C') param |= 0x01;
|
|
|
|
if (ctmp == 'r' || ctmp == 'R') param |= 0x02;
|
|
|
|
}
|
|
|
|
|
2017-06-07 00:45:00 +08:00
|
|
|
UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}};
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2017-11-09 22:39:40 +08:00
|
|
|
void DropField() {
|
|
|
|
UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
|
|
|
|
SendCommand(&c);
|
|
|
|
}
|
|
|
|
|
2017-10-31 22:08:58 +08:00
|
|
|
int ExchangeAPDU14a(uint8_t *datain, int datainlen, bool activateField, bool leaveSignalON, uint8_t *dataout, int *dataoutlen) {
|
2017-11-03 19:42:38 +08:00
|
|
|
uint16_t cmdc = 0;
|
2017-10-31 22:08:58 +08:00
|
|
|
|
2017-11-03 19:42:38 +08:00
|
|
|
if (activateField) {
|
|
|
|
cmdc |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;
|
|
|
|
}
|
2017-10-31 22:08:58 +08:00
|
|
|
if (leaveSignalON)
|
|
|
|
cmdc |= ISO14A_NO_DISCONNECT;
|
|
|
|
|
|
|
|
// "Command APDU" length should be 5+255+1, but javacard's APDU buffer might be smaller - 133 bytes
|
|
|
|
// https://stackoverflow.com/questions/32994936/safe-max-java-card-apdu-data-command-and-respond-size
|
|
|
|
// here length USB_CMD_DATA_SIZE=512
|
|
|
|
// timeout timeout14a * 1.06 / 100, true, size, &keyBlock[6 * c], e_sector); // timeout is (ms * 106)/10 or us*0.0106
|
2017-11-09 22:39:40 +08:00
|
|
|
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_APDU | ISO14A_SET_TIMEOUT | cmdc, (datainlen & 0xFFFF), 1000 * 1000 * 1.06 / 100}};
|
|
|
|
memcpy(c.d.asBytes, datain, datainlen);
|
2017-10-31 22:08:58 +08:00
|
|
|
SendCommand(&c);
|
|
|
|
|
|
|
|
uint8_t *recv;
|
|
|
|
UsbCommand resp;
|
|
|
|
|
|
|
|
if (activateField) {
|
2017-11-09 22:39:40 +08:00
|
|
|
if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
|
|
|
|
PrintAndLog("APDU ERROR: Proxmark connection timeout.");
|
2017-10-31 22:08:58 +08:00
|
|
|
return 1;
|
2017-11-09 22:39:40 +08:00
|
|
|
}
|
|
|
|
if (resp.arg[0] != 1) {
|
|
|
|
PrintAndLog("APDU ERROR: Proxmark error %d.", resp.arg[0]);
|
2017-10-31 22:08:58 +08:00
|
|
|
return 1;
|
2017-11-09 22:39:40 +08:00
|
|
|
}
|
2017-10-31 22:08:58 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
|
|
|
|
recv = resp.d.asBytes;
|
2017-11-09 22:39:40 +08:00
|
|
|
int iLen = resp.arg[0];
|
2017-10-31 22:08:58 +08:00
|
|
|
|
2017-11-09 22:39:40 +08:00
|
|
|
*dataoutlen = iLen - 2;
|
2017-10-31 22:08:58 +08:00
|
|
|
if (*dataoutlen < 0)
|
|
|
|
*dataoutlen = 0;
|
2017-11-09 22:39:40 +08:00
|
|
|
memcpy(dataout, recv, *dataoutlen);
|
2017-10-31 22:08:58 +08:00
|
|
|
|
2017-11-09 22:39:40 +08:00
|
|
|
if(!iLen) {
|
|
|
|
PrintAndLog("APDU ERROR: No APDU response.");
|
2017-10-31 22:08:58 +08:00
|
|
|
return 1;
|
|
|
|
}
|
2017-11-03 19:42:38 +08:00
|
|
|
|
2017-11-09 22:39:40 +08:00
|
|
|
// check block TODO
|
|
|
|
if (iLen == -2) {
|
|
|
|
PrintAndLog("APDU ERROR: Block type mismatch.");
|
2017-10-31 22:08:58 +08:00
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
// CRC Check
|
2017-11-09 22:39:40 +08:00
|
|
|
if (iLen == -1) {
|
2017-10-31 22:08:58 +08:00
|
|
|
PrintAndLog("APDU ERROR: ISO 14443A CRC error.");
|
|
|
|
return 3;
|
|
|
|
}
|
2017-11-09 22:39:40 +08:00
|
|
|
|
|
|
|
// check apdu length
|
|
|
|
if (iLen < 4) {
|
|
|
|
PrintAndLog("APDU ERROR: Small APDU response. Len=%d", iLen);
|
|
|
|
return 2;
|
|
|
|
}
|
2017-10-31 22:08:58 +08:00
|
|
|
|
|
|
|
} else {
|
|
|
|
PrintAndLog("APDU ERROR: Reply timeout.");
|
|
|
|
return 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHF14AAPDU(const char *cmd) {
|
|
|
|
uint8_t data[USB_CMD_DATA_SIZE];
|
|
|
|
int datalen = 0;
|
2017-10-30 23:29:03 +08:00
|
|
|
bool activateField = false;
|
|
|
|
bool leaveSignalON = false;
|
|
|
|
bool decodeTLV = false;
|
2017-10-28 00:02:45 +08:00
|
|
|
|
2017-10-31 21:15:57 +08:00
|
|
|
if (strlen(cmd) < 2) {
|
2017-10-27 23:45:42 +08:00
|
|
|
PrintAndLog("Usage: hf 14a apdu [-s] [-k] [-t] <APDU (hex)>");
|
|
|
|
PrintAndLog(" -s activate field and select card");
|
|
|
|
PrintAndLog(" -k leave the signal field ON after receive response");
|
2017-11-01 01:11:23 +08:00
|
|
|
PrintAndLog(" -t executes TLV decoder if it possible. TODO!!!!");
|
2017-10-27 23:45:42 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2017-10-30 23:29:03 +08:00
|
|
|
|
2017-10-31 21:15:57 +08:00
|
|
|
int cmdp = 0;
|
|
|
|
while(param_getchar(cmd, cmdp) != 0x00) {
|
|
|
|
char c = param_getchar(cmd, cmdp);
|
|
|
|
if ((c == '-') && (param_getlength(cmd, cmdp) == 2))
|
|
|
|
switch (param_getchar_indx(cmd, 1, cmdp)) {
|
2017-10-30 23:29:03 +08:00
|
|
|
case 's':
|
|
|
|
case 'S':
|
|
|
|
activateField = true;
|
|
|
|
break;
|
|
|
|
case 'k':
|
|
|
|
case 'K':
|
|
|
|
leaveSignalON = true;
|
|
|
|
break;
|
|
|
|
case 't':
|
|
|
|
case 'T':
|
|
|
|
decodeTLV = true;
|
|
|
|
break;
|
|
|
|
default:
|
2017-10-31 21:15:57 +08:00
|
|
|
PrintAndLog("Unknown parameter '%c'", param_getchar_indx(cmd, 1, cmdp));
|
2017-10-30 23:29:03 +08:00
|
|
|
return 1;
|
|
|
|
}
|
2017-10-31 21:15:57 +08:00
|
|
|
|
|
|
|
if (isxdigit(c)) {
|
2017-10-31 22:08:58 +08:00
|
|
|
// len = data + PCB(1b) + CRC(2b)
|
|
|
|
switch(param_gethex_to_eol(cmd, cmdp, data, sizeof(data) - 1 - 2, &datalen)) {
|
2017-10-31 21:15:57 +08:00
|
|
|
case 1:
|
|
|
|
PrintAndLog("Invalid HEX value.");
|
|
|
|
return 1;
|
|
|
|
case 2:
|
|
|
|
PrintAndLog("APDU too large.");
|
|
|
|
return 1;
|
|
|
|
case 3:
|
|
|
|
PrintAndLog("Hex must have even number of digits.");
|
|
|
|
return 1;
|
2017-10-30 23:29:03 +08:00
|
|
|
}
|
2017-10-31 21:15:57 +08:00
|
|
|
|
|
|
|
// we get all the hex to end of line with spaces
|
|
|
|
break;
|
2017-10-30 23:29:03 +08:00
|
|
|
}
|
2017-10-31 21:15:57 +08:00
|
|
|
|
|
|
|
cmdp++;
|
2017-10-30 23:29:03 +08:00
|
|
|
}
|
2017-10-31 19:28:16 +08:00
|
|
|
|
2017-11-09 22:39:40 +08:00
|
|
|
PrintAndLog(">>>>[%s%s%s] %s", activateField ? "sel ": "", leaveSignalON ? "keep ": "", decodeTLV ? "TLV": "", sprint_hex(data, datalen));
|
2017-10-27 23:45:42 +08:00
|
|
|
|
2017-11-09 22:39:40 +08:00
|
|
|
int res = ExchangeAPDU14a(data, datalen, activateField, leaveSignalON, data, &datalen);
|
|
|
|
|
|
|
|
if (res)
|
|
|
|
return res;
|
2017-10-30 23:29:03 +08:00
|
|
|
|
2017-10-31 22:08:58 +08:00
|
|
|
PrintAndLog("<<<< %s", sprint_hex(data, datalen));
|
|
|
|
|
2017-11-01 00:14:32 +08:00
|
|
|
PrintAndLog("APDU response: %02x %02x - %s", data[datalen - 2], data[datalen - 1], GetAPDUCodeDescription(data[datalen - 2], data[datalen - 1]));
|
2017-10-31 19:28:16 +08:00
|
|
|
|
2017-11-02 20:11:42 +08:00
|
|
|
// TLV decoder
|
2017-11-01 19:38:29 +08:00
|
|
|
if (decodeTLV && datalen > 4) {
|
|
|
|
TLVPrintFromBuffer(data, datalen - 2);
|
2017-10-31 22:08:58 +08:00
|
|
|
}
|
2017-10-27 23:45:42 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2015-03-21 04:06:51 +08:00
|
|
|
|
2013-09-29 03:28:55 +08:00
|
|
|
int CmdHF14ACmdRaw(const char *cmd) {
|
2017-06-07 00:45:00 +08:00
|
|
|
UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
|
|
|
|
bool reply=1;
|
|
|
|
bool crc = false;
|
|
|
|
bool power = false;
|
|
|
|
bool active = false;
|
|
|
|
bool active_select = false;
|
2017-10-01 23:52:10 +08:00
|
|
|
bool no_rats = false;
|
2017-06-07 00:45:00 +08:00
|
|
|
uint16_t numbits = 0;
|
2017-03-07 03:07:02 +08:00
|
|
|
bool bTimeout = false;
|
2015-03-21 04:06:51 +08:00
|
|
|
uint32_t timeout = 0;
|
2017-03-07 03:07:02 +08:00
|
|
|
bool topazmode = false;
|
2017-06-07 00:45:00 +08:00
|
|
|
char buf[5]="";
|
|
|
|
int i = 0;
|
|
|
|
uint8_t data[USB_CMD_DATA_SIZE];
|
2015-03-21 04:06:51 +08:00
|
|
|
uint16_t datalen = 0;
|
2015-02-12 01:30:36 +08:00
|
|
|
uint32_t temp;
|
2013-09-29 03:28:55 +08:00
|
|
|
|
2017-06-07 00:45:00 +08:00
|
|
|
if (strlen(cmd)<2) {
|
|
|
|
PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-f] [-b] [-t] <number of bits> <0A 0B 0C ... hex>");
|
|
|
|
PrintAndLog(" -r do not read response");
|
|
|
|
PrintAndLog(" -c calculate and append CRC");
|
|
|
|
PrintAndLog(" -p leave the signal field ON after receive");
|
|
|
|
PrintAndLog(" -a active signal field ON without select");
|
|
|
|
PrintAndLog(" -s active signal field ON with select");
|
|
|
|
PrintAndLog(" -b number of bits to send. Useful for send partial byte");
|
2015-02-12 01:30:36 +08:00
|
|
|
PrintAndLog(" -t timeout in ms");
|
2015-03-21 04:06:51 +08:00
|
|
|
PrintAndLog(" -T use Topaz protocol to send command");
|
2017-10-01 23:52:10 +08:00
|
|
|
PrintAndLog(" -3 ISO14443-3 select only (skip RATS)");
|
2017-06-07 00:45:00 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2013-09-29 03:28:55 +08:00
|
|
|
|
2017-06-07 00:45:00 +08:00
|
|
|
|
|
|
|
// strip
|
|
|
|
while (*cmd==' ' || *cmd=='\t') cmd++;
|
|
|
|
|
|
|
|
while (cmd[i]!='\0') {
|
|
|
|
if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
|
|
|
|
if (cmd[i]=='-') {
|
|
|
|
switch (cmd[i+1]) {
|
|
|
|
case 'r':
|
|
|
|
reply = false;
|
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
crc = true;
|
|
|
|
break;
|
|
|
|
case 'p':
|
|
|
|
power = true;
|
|
|
|
break;
|
|
|
|
case 'a':
|
|
|
|
active = true;
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
active_select = true;
|
|
|
|
break;
|
|
|
|
case 'b':
|
|
|
|
sscanf(cmd+i+2,"%d",&temp);
|
|
|
|
numbits = temp & 0xFFFF;
|
|
|
|
i+=3;
|
|
|
|
while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
|
|
|
|
i-=2;
|
|
|
|
break;
|
2015-01-08 06:23:17 +08:00
|
|
|
case 't':
|
2017-03-07 03:07:02 +08:00
|
|
|
bTimeout = true;
|
2015-01-08 06:23:17 +08:00
|
|
|
sscanf(cmd+i+2,"%d",&temp);
|
2015-02-12 01:30:36 +08:00
|
|
|
timeout = temp;
|
2015-01-08 06:23:17 +08:00
|
|
|
i+=3;
|
|
|
|
while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
|
2015-03-12 03:17:24 +08:00
|
|
|
i-=2;
|
2015-01-08 06:23:17 +08:00
|
|
|
break;
|
2017-06-07 00:45:00 +08:00
|
|
|
case 'T':
|
2017-03-07 03:07:02 +08:00
|
|
|
topazmode = true;
|
2015-03-21 04:06:51 +08:00
|
|
|
break;
|
2017-10-01 23:52:10 +08:00
|
|
|
case '3':
|
|
|
|
no_rats = true;
|
|
|
|
break;
|
2017-06-07 00:45:00 +08:00
|
|
|
default:
|
|
|
|
PrintAndLog("Invalid option");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
i+=2;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if ((cmd[i]>='0' && cmd[i]<='9') ||
|
|
|
|
(cmd[i]>='a' && cmd[i]<='f') ||
|
|
|
|
(cmd[i]>='A' && cmd[i]<='F') ) {
|
|
|
|
buf[strlen(buf)+1]=0;
|
|
|
|
buf[strlen(buf)]=cmd[i];
|
|
|
|
i++;
|
|
|
|
|
|
|
|
if (strlen(buf)>=2) {
|
|
|
|
sscanf(buf,"%x",&temp);
|
|
|
|
data[datalen]=(uint8_t)(temp & 0xff);
|
|
|
|
*buf=0;
|
|
|
|
if (datalen > sizeof(data)-1) {
|
2015-01-08 06:23:17 +08:00
|
|
|
if (crc)
|
|
|
|
PrintAndLog("Buffer is full, we can't add CRC to your data");
|
|
|
|
break;
|
2017-06-07 00:45:00 +08:00
|
|
|
} else {
|
2017-06-07 00:57:11 +08:00
|
|
|
datalen++;
|
2015-01-08 06:23:17 +08:00
|
|
|
}
|
2017-06-07 00:45:00 +08:00
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
PrintAndLog("Invalid char on input");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(crc && datalen>0 && datalen<sizeof(data)-2)
|
|
|
|
{
|
|
|
|
uint8_t first, second;
|
2015-03-21 04:06:51 +08:00
|
|
|
if (topazmode) {
|
|
|
|
ComputeCrc14443(CRC_14443_B, data, datalen, &first, &second);
|
|
|
|
} else {
|
|
|
|
ComputeCrc14443(CRC_14443_A, data, datalen, &first, &second);
|
|
|
|
}
|
2017-06-07 00:45:00 +08:00
|
|
|
data[datalen++] = first;
|
|
|
|
data[datalen++] = second;
|
|
|
|
}
|
2013-09-29 03:28:55 +08:00
|
|
|
|
2017-06-07 00:45:00 +08:00
|
|
|
if(active || active_select)
|
|
|
|
{
|
2017-11-03 19:42:38 +08:00
|
|
|
c.arg[0] |= ISO14A_CONNECT | ISO14A_CLEAR_TRACE;
|
2017-06-07 00:45:00 +08:00
|
|
|
if(active)
|
|
|
|
c.arg[0] |= ISO14A_NO_SELECT;
|
|
|
|
}
|
2015-03-12 03:17:24 +08:00
|
|
|
|
2015-01-08 06:23:17 +08:00
|
|
|
if(bTimeout){
|
2017-06-07 00:45:00 +08:00
|
|
|
#define MAX_TIMEOUT 40542464 // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
|
|
|
|
c.arg[0] |= ISO14A_SET_TIMEOUT;
|
|
|
|
if(timeout > MAX_TIMEOUT) {
|
|
|
|
timeout = MAX_TIMEOUT;
|
|
|
|
PrintAndLog("Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
|
|
|
|
}
|
2015-03-12 03:17:24 +08:00
|
|
|
c.arg[2] = 13560000 / 1000 / (8*16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
|
2015-01-08 06:23:17 +08:00
|
|
|
}
|
2015-03-21 04:06:51 +08:00
|
|
|
|
2017-06-07 00:45:00 +08:00
|
|
|
if(power) {
|
|
|
|
c.arg[0] |= ISO14A_NO_DISCONNECT;
|
|
|
|
}
|
2015-03-21 04:06:51 +08:00
|
|
|
|
2016-09-27 03:15:49 +08:00
|
|
|
if(datalen > 0) {
|
2017-06-07 00:45:00 +08:00
|
|
|
c.arg[0] |= ISO14A_RAW;
|
|
|
|
}
|
2013-09-29 03:28:55 +08:00
|
|
|
|
2016-09-27 03:15:49 +08:00
|
|
|
if(topazmode) {
|
2015-03-21 04:06:51 +08:00
|
|
|
c.arg[0] |= ISO14A_TOPAZMODE;
|
2017-06-07 00:45:00 +08:00
|
|
|
}
|
|
|
|
|
2017-10-01 23:52:10 +08:00
|
|
|
if(no_rats) {
|
|
|
|
c.arg[0] |= ISO14A_NO_RATS;
|
|
|
|
}
|
|
|
|
|
2017-06-07 00:45:00 +08:00
|
|
|
// Max buffer is USB_CMD_DATA_SIZE (512)
|
|
|
|
c.arg[1] = (datalen & 0xFFFF) | ((uint32_t)numbits << 16);
|
|
|
|
memcpy(c.d.asBytes,data,datalen);
|
|
|
|
|
|
|
|
SendCommand(&c);
|
|
|
|
|
|
|
|
if (reply) {
|
2017-10-30 23:58:43 +08:00
|
|
|
int res = 0;
|
|
|
|
if (active_select)
|
|
|
|
res = waitCmd(1);
|
|
|
|
if (!res && datalen > 0)
|
2017-06-07 00:45:00 +08:00
|
|
|
waitCmd(0);
|
|
|
|
} // if reply
|
|
|
|
return 0;
|
2013-09-29 03:28:55 +08:00
|
|
|
}
|
|
|
|
|
2015-03-21 04:06:51 +08:00
|
|
|
|
2017-10-30 23:58:43 +08:00
|
|
|
static int waitCmd(uint8_t iSelect) {
|
2013-09-29 03:28:55 +08:00
|
|
|
uint8_t *recv;
|
|
|
|
UsbCommand resp;
|
|
|
|
char *hexout;
|
|
|
|
|
2015-01-08 05:00:29 +08:00
|
|
|
if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
|
2013-09-29 03:28:55 +08:00
|
|
|
recv = resp.d.asBytes;
|
2017-10-29 23:34:51 +08:00
|
|
|
uint8_t iLen = resp.arg[0];
|
|
|
|
if (iSelect){
|
|
|
|
iLen = resp.arg[1];
|
|
|
|
if (iLen){
|
|
|
|
PrintAndLog("Card selected. UID[%i]:", iLen);
|
|
|
|
} else {
|
|
|
|
PrintAndLog("Can't select card.");
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
PrintAndLog("received %i bytes:", iLen);
|
|
|
|
}
|
2013-09-29 03:28:55 +08:00
|
|
|
if(!iLen)
|
2017-10-30 23:58:43 +08:00
|
|
|
return 1;
|
2013-09-29 03:28:55 +08:00
|
|
|
hexout = (char *)malloc(iLen * 3 + 1);
|
|
|
|
if (hexout != NULL) {
|
|
|
|
for (int i = 0; i < iLen; i++) { // data in hex
|
2013-10-03 22:36:42 +08:00
|
|
|
sprintf(&hexout[i * 3], "%02X ", recv[i]);
|
2013-09-29 03:28:55 +08:00
|
|
|
}
|
|
|
|
PrintAndLog("%s", hexout);
|
|
|
|
free(hexout);
|
|
|
|
} else {
|
|
|
|
PrintAndLog("malloc failed your client has low memory?");
|
2017-10-30 23:58:43 +08:00
|
|
|
return 2;
|
2013-09-29 03:28:55 +08:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
PrintAndLog("timeout while waiting for reply.");
|
2017-10-30 23:58:43 +08:00
|
|
|
return 3;
|
2013-09-29 03:28:55 +08:00
|
|
|
}
|
2017-10-30 23:58:43 +08:00
|
|
|
return 0;
|
2013-09-29 03:28:55 +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
|
|
|
static command_t CommandTable[] =
|
|
|
|
{
|
2012-08-29 05:39:50 +08:00
|
|
|
{"help", CmdHelp, 1, "This help"},
|
2015-01-05 04:22:54 +08:00
|
|
|
{"list", CmdHF14AList, 0, "[Deprecated] List ISO 14443a history"},
|
2017-11-01 15:51:05 +08:00
|
|
|
{"reader", CmdHF14AReader, 0, "Start acting like an ISO14443 Type A reader"},
|
|
|
|
{"info", CmdHF14AInfo, 0, "Reads card and shows information about it"},
|
2012-08-29 05:39:50 +08:00
|
|
|
{"cuids", CmdHF14ACUIDs, 0, "<n> Collect n>0 ISO14443 Type A UIDs in one go"},
|
2015-01-22 04:24:37 +08:00
|
|
|
{"sim", CmdHF14ASim, 0, "<UID> -- Simulate ISO 14443a tag"},
|
2012-08-29 05:39:50 +08:00
|
|
|
{"snoop", CmdHF14ASnoop, 0, "Eavesdrop ISO 14443 Type A"},
|
2017-10-27 23:45:42 +08:00
|
|
|
{"apdu", CmdHF14AAPDU, 0, "Send ISO 1443-4 APDU to tag"},
|
2013-09-29 03:28:55 +08:00
|
|
|
{"raw", CmdHF14ACmdRaw, 0, "Send raw hex data to tag"},
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
{NULL, NULL, 0, NULL}
|
|
|
|
};
|
|
|
|
|
2012-12-05 07:39:18 +08:00
|
|
|
int CmdHF14A(const char *Cmd) {
|
2011-06-07 20:35:52 +08:00
|
|
|
// flush
|
2012-12-05 07:39:18 +08:00
|
|
|
WaitForResponseTimeout(CMD_ACK,NULL,100);
|
2011-06-07 20:35:52 +08:00
|
|
|
|
|
|
|
// parse
|
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
|
|
|
CmdsParse(CommandTable, Cmd);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHelp(const char *Cmd)
|
|
|
|
{
|
|
|
|
CmdsHelp(CommandTable);
|
|
|
|
return 0;
|
|
|
|
}
|