2010-02-21 08:47:22 +08:00
|
|
|
//-----------------------------------------------------------------------------
|
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 <stdio.h>
|
2010-02-07 08:31:32 +08:00
|
|
|
#include <stdlib.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 <string.h>
|
2011-05-26 20:55:15 +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 "iso14443crc.h"
|
|
|
|
#include "data.h"
|
|
|
|
#include "proxusb.h"
|
|
|
|
#include "ui.h"
|
|
|
|
#include "cmdparser.h"
|
|
|
|
#include "cmdhf14a.h"
|
2010-07-13 21:39:30 +08:00
|
|
|
#include "common.h"
|
2011-05-26 20:55:15 +08:00
|
|
|
#include "cmdmain.h"
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
|
|
|
|
static int CmdHelp(const char *Cmd);
|
|
|
|
|
|
|
|
int CmdHF14AList(const char *Cmd)
|
|
|
|
{
|
|
|
|
uint8_t got[1920];
|
|
|
|
GetFromBigBuf(got, sizeof(got));
|
|
|
|
|
|
|
|
PrintAndLog("recorded activity:");
|
|
|
|
PrintAndLog(" ETU :rssi: who bytes");
|
|
|
|
PrintAndLog("---------+----+----+-----------");
|
|
|
|
|
|
|
|
int i = 0;
|
|
|
|
int prev = -1;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
if(i >= 1900) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool isResponse;
|
|
|
|
int timestamp = *((uint32_t *)(got+i));
|
|
|
|
if (timestamp & 0x80000000) {
|
|
|
|
timestamp &= 0x7fffffff;
|
|
|
|
isResponse = 1;
|
|
|
|
} else {
|
|
|
|
isResponse = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int metric = 0;
|
|
|
|
int parityBits = *((uint32_t *)(got+i+4));
|
|
|
|
// 4 bytes of additional information...
|
|
|
|
// maximum of 32 additional parity bit information
|
|
|
|
//
|
|
|
|
// TODO:
|
|
|
|
// at each quarter bit period we can send power level (16 levels)
|
|
|
|
// or each half bit period in 256 levels.
|
|
|
|
|
|
|
|
|
|
|
|
int len = got[i+8];
|
|
|
|
|
|
|
|
if (len > 100) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (i + len >= 1900) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint8_t *frame = (got+i+9);
|
|
|
|
|
|
|
|
// Break and stick with current result if buffer was not completely full
|
|
|
|
if (frame[0] == 0x44 && frame[1] == 0x44 && frame[3] == 0x44) { break; }
|
|
|
|
|
|
|
|
char line[1000] = "";
|
|
|
|
int j;
|
|
|
|
for (j = 0; j < len; j++) {
|
|
|
|
int oddparity = 0x01;
|
|
|
|
int k;
|
|
|
|
|
|
|
|
for (k=0;k<8;k++) {
|
|
|
|
oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
|
|
|
|
}
|
|
|
|
|
|
|
|
//if((parityBits >> (len - j - 1)) & 0x01) {
|
|
|
|
if (isResponse && (oddparity != ((parityBits >> (len - j - 1)) & 0x01))) {
|
|
|
|
sprintf(line+(j*4), "%02x! ", frame[j]);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
sprintf(line+(j*4), "%02x ", frame[j]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
char *crc;
|
|
|
|
crc = "";
|
|
|
|
if (len > 2) {
|
|
|
|
uint8_t b1, b2;
|
|
|
|
for (j = 0; j < (len - 1); j++) {
|
|
|
|
// gives problems... search for the reason..
|
|
|
|
/*if(frame[j] == 0xAA) {
|
|
|
|
switch(frame[j+1]) {
|
|
|
|
case 0x01:
|
|
|
|
crc = "[1] Two drops close after each other";
|
|
|
|
break;
|
|
|
|
case 0x02:
|
|
|
|
crc = "[2] Potential SOC with a drop in second half of bitperiod";
|
|
|
|
break;
|
|
|
|
case 0x03:
|
|
|
|
crc = "[3] Segment Z after segment X is not possible";
|
|
|
|
break;
|
|
|
|
case 0x04:
|
|
|
|
crc = "[4] Parity bit of a fully received byte was wrong";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
crc = "[?] Unknown error";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}*/
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strlen(crc)==0) {
|
|
|
|
ComputeCrc14443(CRC_14443_A, frame, len-2, &b1, &b2);
|
|
|
|
if (b1 != frame[len-2] || b2 != frame[len-1]) {
|
|
|
|
crc = (isResponse & (len < 6)) ? "" : " !crc";
|
|
|
|
} else {
|
|
|
|
crc = "";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
crc = ""; // SHORT
|
|
|
|
}
|
|
|
|
|
|
|
|
char metricString[100];
|
|
|
|
if (isResponse) {
|
|
|
|
sprintf(metricString, "%3d", metric);
|
|
|
|
} else {
|
|
|
|
strcpy(metricString, " ");
|
|
|
|
}
|
|
|
|
|
|
|
|
PrintAndLog(" +%7d: %s: %s %s %s",
|
|
|
|
(prev < 0 ? 0 : (timestamp - prev)),
|
|
|
|
metricString,
|
|
|
|
(isResponse ? "TAG" : " "), line, crc);
|
|
|
|
|
|
|
|
prev = timestamp;
|
|
|
|
i += (len + 9);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-07-13 21:39:30 +08:00
|
|
|
void iso14a_set_timeout(uint32_t timeout) {
|
|
|
|
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_SET_TIMEOUT, 0, timeout}};
|
|
|
|
SendCommand(&c);
|
|
|
|
}
|
|
|
|
|
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 CmdHF14AMifare(const char *Cmd)
|
|
|
|
{
|
|
|
|
UsbCommand c = {CMD_READER_MIFARE, {strtol(Cmd, NULL, 0), 0, 0}};
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-05-26 20:55:15 +08:00
|
|
|
int CmdHF14AMfWrBl(const char *Cmd)
|
|
|
|
{
|
|
|
|
int i, temp;
|
|
|
|
uint8_t blockNo = 0;
|
|
|
|
uint8_t keyType = 0;
|
|
|
|
uint8_t key[6] = {0, 0, 0, 0, 0, 0};
|
|
|
|
uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
|
|
|
|
|
|
|
|
const char *cmdp = Cmd;
|
|
|
|
const char *cmdpe = Cmd;
|
|
|
|
|
|
|
|
if (strlen(Cmd)<3) {
|
|
|
|
PrintAndLog("Usage: hf 14 mfwrbl <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");
|
|
|
|
PrintAndLog(" sample: hf 14a mfwrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
PrintAndLog("l: %s", Cmd);
|
|
|
|
|
|
|
|
// skip spaces
|
|
|
|
while (*cmdp==' ' || *cmdp=='\t') cmdp++;
|
|
|
|
blockNo = strtol(cmdp, NULL, 0) & 0xff;
|
|
|
|
|
|
|
|
// next value
|
|
|
|
while (*cmdp!=' ' && *cmdp!='\t') cmdp++;
|
|
|
|
while (*cmdp==' ' || *cmdp=='\t') cmdp++;
|
|
|
|
if (*cmdp != 'A' && *cmdp != 'a') {
|
|
|
|
keyType = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// next value
|
|
|
|
while (*cmdp!=' ' && *cmdp!='\t') cmdp++;
|
|
|
|
while (*cmdp==' ' || *cmdp=='\t') cmdp++;
|
|
|
|
|
|
|
|
// next value here:cmdpe
|
|
|
|
cmdpe = cmdp;
|
|
|
|
while (*cmdpe!=' ' && *cmdpe!='\t') cmdpe++;
|
|
|
|
while (*cmdpe==' ' || *cmdpe=='\t') cmdpe++;
|
|
|
|
|
|
|
|
if ((int)cmdpe - (int)cmdp != 13) {
|
|
|
|
PrintAndLog("Length of key must be 12 hex symbols");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(i = 0; i < 6; i++) {
|
|
|
|
sscanf((char[]){cmdp[0],cmdp[1],0},"%X",&temp);
|
|
|
|
key[i] = temp & 0xff;
|
|
|
|
cmdp++;
|
|
|
|
cmdp++;
|
|
|
|
}
|
|
|
|
|
|
|
|
// next value
|
|
|
|
while (*cmdp!=' ' && *cmdp!='\t') cmdp++;
|
|
|
|
while (*cmdp==' ' || *cmdp=='\t') cmdp++;
|
|
|
|
|
|
|
|
if (strlen(cmdp) != 32) {
|
|
|
|
PrintAndLog("Length of block data must be 32 hex symbols");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(i = 0; i < 16; i++) {
|
|
|
|
sscanf((char[]){cmdp[0],cmdp[1],0},"%X",&temp);
|
|
|
|
bldata[i] = temp & 0xff;
|
|
|
|
cmdp++;
|
|
|
|
cmdp++;
|
|
|
|
}
|
|
|
|
PrintAndLog(" block no:%02x key type:%02x key:%s", blockNo, keyType, sprint_hex(key, 6));
|
|
|
|
PrintAndLog(" data: %s", sprint_hex(bldata, 16));
|
|
|
|
|
|
|
|
UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};
|
|
|
|
memcpy(c.d.asBytes, key, 6);
|
|
|
|
memcpy(c.d.asBytes + 10, bldata, 16);
|
|
|
|
SendCommand(&c);
|
|
|
|
UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);
|
|
|
|
|
|
|
|
if (resp != NULL) {
|
|
|
|
uint8_t isOK = resp->arg[0] & 0xff;
|
|
|
|
|
|
|
|
PrintAndLog("isOk:%02x", isOK);
|
|
|
|
} else {
|
|
|
|
PrintAndLog("Command execute timeout");
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHF14AMfRdBl(const char *Cmd)
|
|
|
|
{
|
|
|
|
int i, temp;
|
|
|
|
uint8_t blockNo = 0;
|
|
|
|
uint8_t keyType = 0;
|
|
|
|
uint8_t key[6] = {0, 0, 0, 0, 0, 0};
|
|
|
|
|
|
|
|
const char *cmdp = Cmd;
|
|
|
|
|
|
|
|
|
|
|
|
if (strlen(Cmd)<3) {
|
|
|
|
PrintAndLog("Usage: hf 14 mfrdbl <block number> <key A/B> <key (12 hex symbols)>");
|
|
|
|
PrintAndLog(" sample: hf 14a mfrdbl 0 A FFFFFFFFFFFF ");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// skip spaces
|
|
|
|
while (*cmdp==' ' || *cmdp=='\t') cmdp++;
|
|
|
|
blockNo = strtol(cmdp, NULL, 0) & 0xff;
|
|
|
|
|
|
|
|
// next value
|
|
|
|
while (*cmdp!=' ' && *cmdp!='\t') cmdp++;
|
|
|
|
while (*cmdp==' ' || *cmdp=='\t') cmdp++;
|
|
|
|
if (*cmdp != 'A' && *cmdp != 'a') {
|
|
|
|
keyType = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// next value
|
|
|
|
while (*cmdp!=' ' && *cmdp!='\t') cmdp++;
|
|
|
|
while (*cmdp==' ' || *cmdp=='\t') cmdp++;
|
|
|
|
|
|
|
|
if (strlen(cmdp) != 12) {
|
|
|
|
PrintAndLog("Length of key must be 12 hex symbols");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(i = 0; i < 6; i++) {
|
|
|
|
sscanf((char[]){cmdp[0],cmdp[1],0},"%X",&temp);
|
|
|
|
key[i] = temp & 0xff;
|
|
|
|
cmdp++;
|
|
|
|
cmdp++;
|
|
|
|
}
|
|
|
|
PrintAndLog(" block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));
|
|
|
|
|
|
|
|
UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};
|
|
|
|
memcpy(c.d.asBytes, key, 6);
|
|
|
|
SendCommand(&c);
|
|
|
|
UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);
|
|
|
|
|
|
|
|
if (resp != NULL) {
|
|
|
|
uint8_t isOK = resp->arg[0] & 0xff;
|
|
|
|
uint8_t * data = resp->d.asBytes;
|
|
|
|
|
|
|
|
PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 16));
|
|
|
|
} else {
|
|
|
|
PrintAndLog("Command execute timeout");
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHF14AMfRdSc(const char *Cmd)
|
|
|
|
{
|
|
|
|
int i, temp;
|
|
|
|
uint8_t sectorNo = 0;
|
|
|
|
uint8_t keyType = 0;
|
|
|
|
uint8_t key[6] = {0, 0, 0, 0, 0, 0};
|
|
|
|
|
|
|
|
const char *cmdp = Cmd;
|
|
|
|
|
|
|
|
|
|
|
|
if (strlen(Cmd)<3) {
|
|
|
|
PrintAndLog("Usage: hf 14 mfrdsc <sector number> <key A/B> <key (12 hex symbols)>");
|
|
|
|
PrintAndLog(" sample: hf 14a mfrdsc 0 A FFFFFFFFFFFF ");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// skip spaces
|
|
|
|
while (*cmdp==' ' || *cmdp=='\t') cmdp++;
|
|
|
|
sectorNo = strtol(cmdp, NULL, 0) & 0xff;
|
|
|
|
|
|
|
|
// next value
|
|
|
|
while (*cmdp!=' ' && *cmdp!='\t') cmdp++;
|
|
|
|
while (*cmdp==' ' || *cmdp=='\t') cmdp++;
|
|
|
|
if (*cmdp != 'A' && *cmdp != 'a') {
|
|
|
|
keyType = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// next value
|
|
|
|
while (*cmdp!=' ' && *cmdp!='\t') cmdp++;
|
|
|
|
while (*cmdp==' ' || *cmdp=='\t') cmdp++;
|
|
|
|
|
|
|
|
if (strlen(cmdp) != 12) {
|
|
|
|
PrintAndLog("Length of key must be 12 hex symbols");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(i = 0; i < 6; i++) {
|
|
|
|
sscanf((char[]){cmdp[0],cmdp[1],0},"%X",&temp);
|
|
|
|
key[i] = temp & 0xff;
|
|
|
|
cmdp++;
|
|
|
|
cmdp++;
|
|
|
|
}
|
|
|
|
PrintAndLog(" sector no:%02x key type:%02x key:%s ", sectorNo, keyType, sprint_hex(key, 6));
|
|
|
|
|
|
|
|
UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};
|
|
|
|
memcpy(c.d.asBytes, key, 6);
|
|
|
|
SendCommand(&c);
|
|
|
|
UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);
|
|
|
|
PrintAndLog(" ");
|
|
|
|
|
|
|
|
if (resp != NULL) {
|
|
|
|
uint8_t isOK = resp->arg[0] & 0xff;
|
|
|
|
uint8_t * data = resp->d.asBytes;
|
|
|
|
|
|
|
|
PrintAndLog("isOk:%02x", isOK);
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
PrintAndLog("data:%s", sprint_hex(data + i * 16, 16));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
PrintAndLog("Command1 execute timeout");
|
|
|
|
}
|
|
|
|
|
|
|
|
// response2
|
|
|
|
resp = WaitForResponseTimeout(CMD_ACK, 500);
|
|
|
|
PrintAndLog(" ");
|
|
|
|
|
|
|
|
if (resp != NULL) {
|
|
|
|
uint8_t * data = resp->d.asBytes;
|
|
|
|
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
PrintAndLog("data:%s", sprint_hex(data + i * 16, 16));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
PrintAndLog("Command2 execute timeout");
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-05-26 23:20:03 +08:00
|
|
|
int CmdHF14AMfNested(const char *Cmd)
|
|
|
|
{
|
|
|
|
int i, temp;
|
|
|
|
uint8_t sectorNo = 0;
|
|
|
|
uint8_t keyType = 0;
|
|
|
|
uint8_t key[6] = {0, 0, 0, 0, 0, 0};
|
|
|
|
|
|
|
|
const char *cmdp = Cmd;
|
|
|
|
|
|
|
|
|
|
|
|
if (strlen(Cmd)<3) {
|
|
|
|
PrintAndLog("Usage: hf 14a nested <sector number> <key A/B> <key (12 hex symbols)>");
|
|
|
|
PrintAndLog(" sample: hf 14a nested 0 A FFFFFFFFFFFF ");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// skip spaces
|
|
|
|
while (*cmdp==' ' || *cmdp=='\t') cmdp++;
|
|
|
|
sectorNo = strtol(cmdp, NULL, 0) & 0xff;
|
|
|
|
|
|
|
|
// next value
|
|
|
|
while (*cmdp!=' ' && *cmdp!='\t') cmdp++;
|
|
|
|
while (*cmdp==' ' || *cmdp=='\t') cmdp++;
|
|
|
|
if (*cmdp != 'A' && *cmdp != 'a') {
|
|
|
|
keyType = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// next value
|
|
|
|
while (*cmdp!=' ' && *cmdp!='\t') cmdp++;
|
|
|
|
while (*cmdp==' ' || *cmdp=='\t') cmdp++;
|
|
|
|
|
|
|
|
if (strlen(cmdp) != 12) {
|
|
|
|
PrintAndLog("Length of key must be 12 hex symbols");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(i = 0; i < 6; i++) {
|
|
|
|
sscanf((char[]){cmdp[0],cmdp[1],0},"%X",&temp);
|
|
|
|
key[i] = temp & 0xff;
|
|
|
|
cmdp++;
|
|
|
|
cmdp++;
|
|
|
|
}
|
|
|
|
PrintAndLog(" sector no:%02x key type:%02x key:%s ", sectorNo, keyType, sprint_hex(key, 6));
|
|
|
|
|
|
|
|
UsbCommand c = {CMD_MIFARE_NESTED, {sectorNo, keyType, 0}};
|
|
|
|
memcpy(c.d.asBytes, key, 6);
|
|
|
|
SendCommand(&c);
|
|
|
|
UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);
|
|
|
|
PrintAndLog(" ");
|
|
|
|
|
|
|
|
if (resp != NULL) {
|
|
|
|
uint8_t isOK = resp->arg[0] & 0xff;
|
|
|
|
uint8_t * data = resp->d.asBytes;
|
|
|
|
|
|
|
|
PrintAndLog("isOk:%02x", isOK);
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
PrintAndLog("data:%s", sprint_hex(data + i * 16, 16));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
PrintAndLog("Command execute timeout");
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHF14AMf1kSim(const char *Cmd)
|
|
|
|
{
|
|
|
|
int i, temp;
|
|
|
|
uint8_t uid[4] = {0, 0, 0, 0};
|
|
|
|
|
|
|
|
const char *cmdp = Cmd;
|
|
|
|
|
|
|
|
|
|
|
|
if (strlen(Cmd)<3) {
|
|
|
|
PrintAndLog("Usage: hf 14a mfsim <uid (8 hex symbols)>");
|
|
|
|
PrintAndLog(" sample: hf 14a mfsim 0a0a0a0a ");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// skip spaces
|
|
|
|
while (*cmdp==' ' || *cmdp=='\t') cmdp++;
|
|
|
|
|
|
|
|
if (strlen(cmdp) != 8) {
|
|
|
|
PrintAndLog("Length of UID must be 8 hex symbols");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
for(i = 0; i < 4; i++) {
|
|
|
|
sscanf((char[]){cmdp[0],cmdp[1],0},"%X",&temp);
|
|
|
|
uid[i] = temp & 0xff;
|
|
|
|
cmdp++;
|
|
|
|
cmdp++;
|
|
|
|
}
|
|
|
|
PrintAndLog(" uid:%s ", sprint_hex(uid, 4));
|
|
|
|
|
|
|
|
UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {0, 0, 0}};
|
|
|
|
memcpy(c.d.asBytes, uid, 6);
|
|
|
|
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 CmdHF14AReader(const char *Cmd)
|
|
|
|
{
|
2010-07-13 21:39:30 +08:00
|
|
|
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
|
|
|
|
SendCommand(&c);
|
|
|
|
UsbCommand * resp = WaitForResponse(CMD_ACK);
|
|
|
|
uint8_t * uid = resp->d.asBytes;
|
|
|
|
iso14a_card_select_t * card = uid + 12;
|
|
|
|
|
|
|
|
if(resp->arg[0] == 0) {
|
|
|
|
PrintAndLog("iso14443a card select failed");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
PrintAndLog("ATQA : %02x %02x", card->atqa[0], card->atqa[1]);
|
|
|
|
PrintAndLog(" UID : %s", sprint_hex(uid, 12));
|
|
|
|
PrintAndLog(" SAK : %02x [%d]", card->sak, resp->arg[0]);
|
|
|
|
if(resp->arg[0] == 1)
|
|
|
|
PrintAndLog(" ATS : %s", sprint_hex(card->ats, card->ats_len));
|
|
|
|
else
|
|
|
|
PrintAndLog("proprietary non-iso14443a card found, RATS not supported");
|
|
|
|
|
|
|
|
return resp->arg[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
|
|
|
}
|
|
|
|
|
|
|
|
// ## simulate iso14443a tag
|
|
|
|
// ## greg - added ability to specify tag UID
|
|
|
|
int CmdHF14ASim(const char *Cmd)
|
|
|
|
{
|
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
// c.arg should be set to *Cmd or convert *Cmd to the correct format for a uid
|
|
|
|
UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a, {hi, lo, 0}};
|
|
|
|
PrintAndLog("Emulating 14443A TAG with UID %x%16x", hi, lo);
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHF14ASnoop(const char *Cmd)
|
|
|
|
{
|
|
|
|
UsbCommand c = {CMD_SNOOP_ISO_14443a};
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static command_t CommandTable[] =
|
|
|
|
{
|
2011-05-26 23:20:03 +08:00
|
|
|
{"help", CmdHelp, 1, "This help"},
|
|
|
|
{"list", CmdHF14AList, 0, "List ISO 14443a history"},
|
|
|
|
{"mifare", CmdHF14AMifare, 0, "Read out sector 0 parity error messages"},
|
|
|
|
{"mfrdbl", CmdHF14AMfRdBl, 0, "Read MIFARE classic block"},
|
|
|
|
{"mfrdsc", CmdHF14AMfRdSc, 0, "Read MIFARE classic sector"},
|
|
|
|
{"mfwrbl", CmdHF14AMfWrBl, 0, "Write MIFARE classic block"},
|
|
|
|
{"nested", CmdHF14AMfNested, 0, "Test nested authentication"},
|
|
|
|
{"mfsim", CmdHF14AMf1kSim, 0, "Simulate MIFARE 1k card - NOT WORKING!!!"},
|
|
|
|
{"reader", CmdHF14AReader, 0, "Act like an ISO14443 Type A reader"},
|
|
|
|
{"sim", CmdHF14ASim, 0, "<UID> -- Fake ISO 14443a tag"},
|
|
|
|
{"snoop", CmdHF14ASnoop, 0, "Eavesdrop ISO 14443 Type A"},
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
{NULL, NULL, 0, NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
int CmdHF14A(const char *Cmd)
|
|
|
|
{
|
|
|
|
CmdsParse(CommandTable, Cmd);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int CmdHelp(const char *Cmd)
|
|
|
|
{
|
|
|
|
CmdsHelp(CommandTable);
|
|
|
|
return 0;
|
|
|
|
}
|