github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-06 13:11:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

'hf 14b' formatting

Browse source 
* renaming a few functions
* whitespace
* moving a bit towards RRG repo
This commit is contained in:
pwpiwi 2019-10-22 21:02:02 +02:00
parent c41dd5f9f6
commit a334de73d2
3 changed files with 226 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/cmdhf.c
View file

@ -61,7 +61,7 @@ int CmdHFSearch(const char *Cmd){
return ans; return ans;
} }
//14b is longest test currently (and rarest chip type) ... put last //14b is longest test currently (and rarest chip type) ... put last
ans = HF14BInfo(false); ans = infoHF14B(false);
if (ans) { if (ans) {
PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n"); PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");
return ans; return ans;

217
client/cmdhf14b.c
View file

@ -15,6 +15,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include <ctype.h>
#include "iso14443crc.h" #include "iso14443crc.h"
#include "comms.h" #include "comms.h"
#include "graph.h" #include "graph.h"
@ -25,71 +26,68 @@
#include "taginfo.h" #include "taginfo.h"
static int CmdHelp(const char *Cmd); int CmdHF14BList(const char *Cmd) {
int CmdHF14BList(const char *Cmd)
{
PrintAndLog("Deprecated command, use 'hf list 14b' instead"); PrintAndLog("Deprecated command, use 'hf list 14b' instead");
return 0; return 0;
} }
int CmdHF14BSim(const char *Cmd)
{ int CmdHF14BSim(const char *Cmd) {
UsbCommand c={CMD_SIMULATE_TAG_ISO_14443B}; UsbCommand c={CMD_SIMULATE_TAG_ISO_14443B};
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }
int CmdHF14BSnoop(const char *Cmd)
{ int CmdHF14BSnoop(const char *Cmd) {
UsbCommand c = {CMD_SNOOP_ISO_14443B}; UsbCommand c = {CMD_SNOOP_ISO_14443B};
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }
/* New command to read the contents of a SRI512 tag /* New command to read the contents of a SRI512 tag
* SRI512 tags are ISO14443-B modulated memory tags, * SRI512 tags are ISO14443-B modulated memory tags,
* this command just dumps the contents of the memory * this command just dumps the contents of the memory
*/ */
int CmdSri512Read(const char *Cmd) int CmdSri512Read(const char *Cmd) {
{
UsbCommand c = {CMD_READ_SRI512_TAG, {strtol(Cmd, NULL, 0), 0, 0}}; UsbCommand c = {CMD_READ_SRI512_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }
/* New command to read the contents of a SRIX4K tag /* New command to read the contents of a SRIX4K tag
* SRIX4K tags are ISO14443-B modulated memory tags, * SRIX4K tags are ISO14443-B modulated memory tags,
* this command just dumps the contents of the memory/ * this command just dumps the contents of the memory/
*/ */
int CmdSrix4kRead(const char *Cmd) int CmdSrix4kRead(const char *Cmd) {
{
UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}}; UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }
int rawClose(void){
static bool switch_off_field_14b(void) {
UsbCommand resp; UsbCommand resp;
UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
return 0; return false;
} }
return 0; return false;
} }
int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose) { int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose) {
UsbCommand resp; UsbCommand resp;
UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv,power UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv,power
if(*crc) if (*crc) {
{
uint8_t first, second; uint8_t first, second;
ComputeCrc14443(CRC_14443_B, data, *datalen, &first, &second); ComputeCrc14443(CRC_14443_B, data, *datalen, &first, &second);
data[*datalen] = first; data[*datalen] = first;
@ -129,7 +127,8 @@ int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datal
return 1; return 1;
} }
int CmdHF14BCmdRaw (const char *Cmd) {
static int CmdHF14BCmdRaw (const char *Cmd) {
bool reply = true; bool reply = true;
bool crc = false; bool crc = false;
bool power = false; bool power = false;
@ -201,8 +200,7 @@ int CmdHF14BCmdRaw (const char *Cmd) {
PrintAndLog("Invalid char on input"); PrintAndLog("Invalid char on input");
return 0; return 0;
} }
if (datalen == 0) if (datalen == 0) {
{
PrintAndLog("Missing data input"); PrintAndLog("Missing data input");
return 0; return 0;
} }
@ -225,10 +223,10 @@ int CmdHF14BCmdRaw (const char *Cmd) {
cmd2[2] = 0x08; cmd2[2] = 0x08;
} }
if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose(); if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false) == 0) return switch_off_field_14b();
if ( SRx && (cmdLen != 3 || !crc2) ) return rawClose(); if (SRx && (cmdLen != 3 || !crc2) ) return switch_off_field_14b();
else if (cmd2[0] != 0x50 || cmdLen != 14 || !crc2) return rawClose(); else if (cmd2[0] != 0x50 || cmdLen != 14 || !crc2) return switch_off_field_14b();
uint8_t chipID = 0; uint8_t chipID = 0;
if (SRx) { if (SRx) {
@ -248,14 +246,15 @@ int CmdHF14BCmdRaw (const char *Cmd) {
cmdLen = 9; cmdLen = 9;
} }
if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose(); if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false) == 0) return switch_off_field_14b();
if (cmdLen != 3 || !crc2) return rawClose(); if (cmdLen != 3 || !crc2) return switch_off_field_14b();
if (SRx && cmd2[0] != chipID) return rawClose(); if (SRx && cmd2[0] != chipID) return switch_off_field_14b();
} }
return HF14BCmdRaw(reply, &crc, power, data, &datalen, true); return HF14BCmdRaw(reply, &crc, power, data, &datalen, true);
} }
// print full atqb info // print full atqb info
static void print_atqb_resp(uint8_t *data) { static void print_atqb_resp(uint8_t *data) {
//PrintAndLog (" UID: %s", sprint_hex(data+1,4)); //PrintAndLog (" UID: %s", sprint_hex(data+1,4));
@ -316,8 +315,8 @@ int print_ST_Lock_info(uint8_t model){
uint8_t blk1; uint8_t blk1;
data[0] = 0x08; data[0] = 0x08;
if (model == 0x2) { //SR176 has special command: if (model == 0x02) { //SR176 has special command:
data[1] = 0xf; data[1] = 0x0f;
resplen = 4; resplen = 4;
} else { } else {
data[1] = 0xff; data[1] = 0xff;
@ -325,9 +324,9 @@ int print_ST_Lock_info(uint8_t model){
} }
//std read cmd //std read cmd
if (HF14BCmdRaw(true, &crc, true, data, &datalen, false)==0) return rawClose(); if (HF14BCmdRaw(true, &crc, true, data, &datalen, false) == 0) return switch_off_field_14b();
if (datalen != resplen || !crc) return rawClose(); if (datalen != resplen || !crc) return switch_off_field_14b();
PrintAndLog("Chip Write Protection Bits:"); PrintAndLog("Chip Write Protection Bits:");
// now interpret the data // now interpret the data
@ -367,11 +366,12 @@ int print_ST_Lock_info(uint8_t model){
} }
break; break;
default: default:
return rawClose(); return switch_off_field_14b();
} }
return 1; return 1;
} }
// print UID info from SRx chips (ST Microelectronics) // print UID info from SRx chips (ST Microelectronics)
static void print_st_general_info(uint8_t *data) { static void print_st_general_info(uint8_t *data) {
//uid = first 8 bytes in data //uid = first 8 bytes in data
@ -381,6 +381,7 @@ static void print_st_general_info(uint8_t *data){
return; return;
} }
// 14b get and print UID only (general info) // 14b get and print UID only (general info)
int HF14BStdReader(uint8_t *data, uint8_t *datalen) { int HF14BStdReader(uint8_t *data, uint8_t *datalen) {
//05 00 00 = find one tag in field //05 00 00 = find one tag in field
@ -407,9 +408,9 @@ int HF14BStdReader(uint8_t *data, uint8_t *datalen){
data[1] = 0x00; data[1] = 0x00;
data[2] = 0x08; data[2] = 0x08;
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose(); if (HF14BCmdRaw(true, &crc, true, data, datalen, false) == 0) return switch_off_field_14b();
if (data[0] != 0x50 || *datalen != 14 || !crc) return rawClose(); if (data[0] != 0x50 || *datalen != 14 || !crc) return switch_off_field_14b();
PrintAndLog ("\n14443-3b tag found:"); PrintAndLog ("\n14443-3b tag found:");
PrintAndLog (" UID: %s", sprint_hex(data+1, 4)); PrintAndLog (" UID: %s", sprint_hex(data+1, 4));
@ -431,28 +432,29 @@ int HF14BStdReader(uint8_t *data, uint8_t *datalen){
cmdLen = 9; cmdLen = 9;
// attrib // attrib
if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose(); if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false) == 0) return switch_off_field_14b();
if (cmdLen != 3 || !crc2) return rawClose(); if (cmdLen != 3 || !crc2) return switch_off_field_14b();
// add attrib responce to data // add attrib responce to data
data[14] = cmd2[0]; data[14] = cmd2[0];
rawClose(); switch_off_field_14b();
return 1; return 1;
} }
// 14b get and print Full Info (as much as we know) // 14b get and print Full Info (as much as we know)
int HF14BStdInfo(uint8_t *data, uint8_t *datalen){ static bool HF14B_Std_Info(uint8_t *data, uint8_t *datalen) {
if (!HF14BStdReader(data,datalen)) return 0; if (!HF14BStdReader(data, datalen)) return false;
//add more info here //add more info here
print_atqb_resp(data); print_atqb_resp(data);
return true;
return 1;
} }
// SRx get and print general info about SRx chip from UID // SRx get and print general info about SRx chip from UID
int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){ static bool HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){
bool crc = true; bool crc = true;
*datalen = 2; *datalen = 2;
//wake cmd //wake cmd
@ -461,9 +463,9 @@ int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){
//leave power on //leave power on
// verbose on for now for testing - turn off when functional // verbose on for now for testing - turn off when functional
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose(); if (HF14BCmdRaw(true, &crc, true, data, datalen, false) == 0) return switch_off_field_14b();
if (*datalen != 3 || !crc) return rawClose(); if (*datalen != 3 || !crc) return switch_off_field_14b();
uint8_t chipID = data[0]; uint8_t chipID = data[0];
// select // select
@ -472,115 +474,140 @@ int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){
*datalen = 2; *datalen = 2;
//leave power on //leave power on
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose(); if (HF14BCmdRaw(true, &crc, true, data, datalen, false) == 0) return switch_off_field_14b();
if (*datalen != 3 || !crc || data[0] != chipID) return rawClose(); if (*datalen != 3 || !crc || data[0] != chipID) return switch_off_field_14b();
// get uid // get uid
data[0] = 0x0B; data[0] = 0x0B;
*datalen = 1; *datalen = 1;
//leave power on //leave power on
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose(); if (HF14BCmdRaw(true, &crc, true, data, datalen, false) == 0) return switch_off_field_14b();
if (*datalen != 10 || !crc) return rawClose(); if (*datalen != 10 || !crc) return switch_off_field_14b();
//power off ? //power off ?
if (closeCon) rawClose(); if (closeCon) switch_off_field_14b();
PrintAndLog("\n14443-3b ST tag found:"); PrintAndLog("\n14443-3b ST tag found:");
print_st_general_info(data); print_st_general_info(data);
return 1; return 1;
} }
// SRx get and print full info (needs more info...) // SRx get and print full info (needs more info...)
int HF14B_ST_Info(uint8_t *data, uint8_t *datalen){ static bool HF14B_ST_Info(bool verbose) {
if (!HF14B_ST_Reader(data, datalen, false)) return 0; uint8_t data[100];
uint8_t datalen;
if (!HF14B_ST_Reader(data, &datalen, false)) return false;
//add locking bit information here. //add locking bit information here.
if (print_ST_Lock_info(data[5] >> 2)) if (print_ST_Lock_info(data[5] >> 2))
rawClose(); switch_off_field_14b();
return 1; return true;
} }
// test for other 14b type tags (mimic another reader - don't have tags to identify) // test for other 14b type tags (mimic another reader - don't have tags to identify)
int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen){ static bool HF14B_Other_Reader(bool verbose) {
uint8_t data[4];
uint8_t datalen;
bool crc = true; bool crc = true;
*datalen = 4; datalen = 4;
//std read cmd //std read cmd
data[0] = 0x00; data[0] = 0x00;
data[1] = 0x0b; data[1] = 0x0b;
data[2] = 0x3f; data[2] = 0x3f;
data[3] = 0x80; data[3] = 0x80;
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)!=0) { if (HF14BCmdRaw(true, &crc, true, data, &datalen, false) != 0) {
if (*datalen > 2 || !crc) { if (datalen > 2 || !crc) {
PrintAndLog ("\n14443-3b tag found:"); PrintAndLog ("\n14443-3b tag found:");
PrintAndLog ("Unknown tag type answered to a 0x000b3f80 command ans:"); PrintAndLog ("Unknown tag type answered to a 0x000b3f80 command ans:");
PrintAndLog ("%s",sprint_hex(data,*datalen)); PrintAndLog ("%s", sprint_hex(data, datalen));
rawClose(); switch_off_field_14b();
return 1; return true;
} }
} }
crc = false; crc = false;
*datalen = 1; datalen = 1;
data[0] = 0x0a; data[0] = 0x0a;
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)!=0) { if (HF14BCmdRaw(true, &crc, true, data, &datalen, false) != 0) {
if (*datalen > 0) { if (datalen > 0) {
PrintAndLog ("\n14443-3b tag found:"); PrintAndLog ("\n14443-3b tag found:");
PrintAndLog ("Unknown tag type answered to a 0x0A command ans:"); PrintAndLog ("Unknown tag type answered to a 0x0A command ans:");
PrintAndLog ("%s",sprint_hex(data,*datalen)); PrintAndLog ("%s", sprint_hex(data, datalen));
rawClose(); switch_off_field_14b();
return 1; return true;
} }
} }
crc = false; crc = false;
*datalen = 1; datalen = 1;
data[0] = 0x0c; data[0] = 0x0c;
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)!=0) { if (HF14BCmdRaw(true, &crc, true, data, &datalen, false) != 0) {
if (*datalen > 0) { if (datalen > 0) {
PrintAndLog ("\n14443-3b tag found:"); PrintAndLog ("\n14443-3b tag found:");
PrintAndLog ("Unknown tag type answered to a 0x0C command ans:"); PrintAndLog ("Unknown tag type answered to a 0x0C command ans:");
PrintAndLog ("%s",sprint_hex(data,*datalen)); PrintAndLog ("%s", sprint_hex(data, datalen));
rawClose(); switch_off_field_14b();
return 1; return true;
} }
} }
rawClose(); switch_off_field_14b();
return false;
}
// get and print all info known about any known 14b tag
static int usage_hf_14b_info(void) {
PrintAndLogEx(NORMAL, "Usage: hf 14b info [h] [s]");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h this help");
PrintAndLogEx(NORMAL, " s silently");
PrintAndLogEx(NORMAL, "Example:");
PrintAndLogEx(NORMAL, " hf 14b info");
return 0; return 0;
} }
// get and print all info known about any known 14b tag int infoHF14B(bool verbose) {
int HF14BInfo(bool verbose){
uint8_t data[100]; uint8_t data[100];
uint8_t datalen = 5; uint8_t datalen;
// try std 14b (atqb) // try std 14b (atqb)
if (HF14BStdInfo(data, &datalen)) return 1; if (HF14B_Std_Info(data, &datalen)) return 1;
// try st 14b // try st 14b
if (HF14B_ST_Info(data, &datalen)) return 1; if (HF14B_ST_Info(verbose)) return 1;
// try unknown 14b read commands (to be identified later) // try unknown 14b read commands (to be identified later)
// could be read of calypso, CEPAS, moneo, or pico pass. // could be read of calypso, CEPAS, moneo, or pico pass.
if (HF14B_Other_Reader(data, &datalen)) return 1; if (HF14B_Other_Reader(verbose)) return 1;
if (verbose) PrintAndLog("no 14443B tag found"); if (verbose) PrintAndLog("no 14443B tag found");
return 0; return 0;
} }
// menu command to get and print all info known about any known 14b tag // menu command to get and print all info known about any known 14b tag
int CmdHF14Binfo(const char *Cmd){ static int CmdHF14Binfo(const char *Cmd){
return HF14BInfo(true); char cmdp = tolower(param_getchar(Cmd, 0));
if (cmdp == 'h') return usage_hf_14b_info();
bool verbose = !(cmdp == 's');
return infoHF14B(verbose);
} }
// get and print general info about all known 14b chips // get and print general info about all known 14b chips
int HF14BReader(bool verbose){ int readHF14B(bool verbose){
uint8_t data[100]; uint8_t data[100];
uint8_t datalen = 5; uint8_t datalen = 5;
@ -592,17 +619,34 @@ int HF14BReader(bool verbose){
// try unknown 14b read commands (to be identified later) // try unknown 14b read commands (to be identified later)
// could be read of calypso, CEPAS, moneo, or pico pass. // could be read of calypso, CEPAS, moneo, or pico pass.
if (HF14B_Other_Reader(data, &datalen)) return 1; if (HF14B_Other_Reader(verbose)) return 1;
if (verbose) PrintAndLog("no 14443B tag found"); if (verbose) PrintAndLog("no 14443B tag found");
return 0; return 0;
} }
// menu command to get and print general info about all known 14b chips // menu command to get and print general info about all known 14b chips
int CmdHF14BReader(const char *Cmd){ static int usage_hf_14b_reader(void) {
return HF14BReader(true); PrintAndLogEx(NORMAL, "Usage: hf 14b reader [h] [s]");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h this help");
PrintAndLogEx(NORMAL, " s silently");
PrintAndLogEx(NORMAL, "Example:");
PrintAndLogEx(NORMAL, " hf 14b reader");
return 0;
} }
static int CmdHF14BReader(const char *Cmd) {
char cmdp = tolower(param_getchar(Cmd, 0));
if (cmdp == 'h') return usage_hf_14b_reader();
bool verbose = !(cmdp == 's');
return readHF14B(verbose);
}
int CmdSriWrite(const char *Cmd) { int CmdSriWrite(const char *Cmd) {
/* /*
* For SRIX4K blocks 00 - 7F * For SRIX4K blocks 00 - 7F
@ -670,6 +714,9 @@ int CmdSriWrite( const char *Cmd){
return 0; return 0;
} }
static int CmdHelp(const char *Cmd);
static command_t CommandTable[] = static command_t CommandTable[] =
{ {
{"help", CmdHelp, 1, "This help"}, {"help", CmdHelp, 1, "This help"},

2
client/cmdhf14b.h
View file

@ -21,6 +21,6 @@ int CmdHF14BSnoop(const char *Cmd);
int CmdSri512Read(const char *Cmd); int CmdSri512Read(const char *Cmd);
int CmdSrix4kRead(const char *Cmd); int CmdSrix4kRead(const char *Cmd);
int CmdHF14BWrite( const char *cmd); int CmdHF14BWrite( const char *cmd);
int HF14BInfo(bool verbose); int infoHF14B(bool verbose);
#endif #endif