git.zerfleddert.de Git - proxmark3-svn/blobdiff

index 4b69ab4c344a52ea10661d5c46177eea8c54db45..7cd5547612eed52cded64be4c54ad5e31bb8e6b6 100644 (file)

--- a/client/cmdhf14b.c

+++ b/client/cmdhf14b.c

@@ -8,21 +8,22 @@

// High frequency ISO14443B commands

//-----------------------------------------------------------------------------

// High frequency ISO14443B commands

//-----------------------------------------------------------------------------

+#include "cmdhf14b.h"

#include <stdio.h>

#include <stdlib.h>

#include <stdbool.h>

#include <string.h>

#include <stdint.h>

#include "iso14443crc.h"

#include <stdio.h>

#include <stdlib.h>

#include <stdbool.h>

#include <string.h>

#include <stdint.h>

#include "iso14443crc.h"

-#include "proxmark3.h"

-#include "data.h"

+#include "comms.h"

#include "graph.h"

#include "util.h"

#include "ui.h"

#include "cmdparser.h"

#include "graph.h"

#include "util.h"

#include "ui.h"

#include "cmdparser.h"

-#include "cmdhf14b.h"

#include "cmdmain.h"

-#include "cmdhf14a.h"

+#include "taginfo.h"

static int CmdHelp(const char *Cmd);

@@ -133,17 +134,19 @@ int CmdHF14BCmdRaw (const char *Cmd) {

bool crc = false;

bool power = false;

bool select = false;

bool crc = false;

bool power = false;

bool select = false;

+ bool SRx = false;

char buf[5] = "";

uint8_t data[100] = {0x00};

uint8_t datalen = 0;

unsigned int temp;

int i = 0;

if (strlen(Cmd)<3) {

char buf[5] = "";

uint8_t data[100] = {0x00};

uint8_t datalen = 0;

unsigned int temp;

int i = 0;

if (strlen(Cmd)<3) {

- PrintAndLog("Usage: hf 14b raw [-r] [-c] [-p] <0A 0B 0C ... hex>");

+ PrintAndLog("Usage: hf 14b raw [-r] [-c] [-p] [-s || -ss] <0A 0B 0C ... hex>");

PrintAndLog(" -r do not read response");

PrintAndLog(" -c calculate and append CRC");

PrintAndLog(" -p leave the field on after receive");

PrintAndLog(" -s active signal field ON with select");

PrintAndLog(" -r do not read response");

PrintAndLog(" -c calculate and append CRC");

PrintAndLog(" -p leave the field on after receive");

PrintAndLog(" -s active signal field ON with select");

+ PrintAndLog(" -ss active signal field ON with select for SRx ST Microelectronics tags");

return 0;

}

return 0;

}

@@ -169,6 +172,10 @@ int CmdHF14BCmdRaw (const char *Cmd) {

case 's':

case 'S':

select = true;

case 's':

case 'S':

select = true;

+ if (Cmd[i+2]=='s' || Cmd[i+2]=='S') {

+ SRx = true;

+ i++;

+ }

break;

default:

PrintAndLog("Invalid option");

break;

default:

PrintAndLog("Invalid option");

@@ -192,7 +199,7 @@ int CmdHF14BCmdRaw (const char *Cmd) {

continue;

}

PrintAndLog("Invalid char on input");

continue;

}

PrintAndLog("Invalid char on input");

- return 1;

+ return 0;

}

if (datalen == 0)

{

}

if (datalen == 0)

{

@@ -202,31 +209,50 @@ int CmdHF14BCmdRaw (const char *Cmd) {

if (select){ //auto select 14b tag

uint8_t cmd2[16];

if (select){ //auto select 14b tag

uint8_t cmd2[16];

- uint8_t cmdLen = 3;

bool crc2 = true;

- cmd2[0] = 0x05;

- cmd2[1] = 0x00;

- cmd2[2] = 0x08;

+ uint8_t cmdLen;

+ if (SRx) {

+ // REQ SRx

+ cmdLen = 2;

+ cmd2[0] = 0x06;

+ cmd2[1] = 0x00;

+ } else {

+ cmdLen = 3;

+ // REQB

+ cmd2[0] = 0x05;

+ cmd2[1] = 0x00;

+ cmd2[2] = 0x08;

+ }

- // REQB

if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();

- if (cmd2[0] != 0x50 || cmdLen != 14 || !crc2) return rawClose();

- cmd2[0] = 0x1D;

- // UID from data[1 - 4]

- cmd2[5] = 0x00;

- cmd2[6] = 0x08;

- cmd2[7] = 0x01;

- cmd2[8] = 0x00;

- cmdLen = 9;

+ if ( SRx && (cmdLen != 3 || !crc2) ) return rawClose();

+ else if (cmd2[0] != 0x50 || cmdLen != 14 || !crc2) return rawClose();

+ uint8_t chipID = 0;

+ if (SRx) {

+ // select

+ chipID = cmd2[0];

+ cmd2[0] = 0x0E;

+ cmd2[1] = chipID;

+ cmdLen = 2;

+ } else {

+ // attrib

+ cmd2[0] = 0x1D;

+ // UID from cmd2[1 - 4]

+ cmd2[5] = 0x00;

+ cmd2[6] = 0x08;

+ cmd2[7] = 0x01;

+ cmd2[8] = 0x00;

+ cmdLen = 9;

+ }

- // attrib

if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();

if (cmdLen != 3 || !crc2) return rawClose();

if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();

if (cmdLen != 3 || !crc2) return rawClose();

+ if (SRx && cmd2[0] != chipID) return rawClose();

}

return HF14BCmdRaw(reply, &crc, power, data, &datalen, true);

}

return HF14BCmdRaw(reply, &crc, power, data, &datalen, true);

}

@@ -280,24 +306,6 @@ static void print_atqb_resp(uint8_t *data){

return;

}

return;

}

-// get SRx chip model (from UID) // from ST Microelectronics

-char *get_ST_Chip_Model(uint8_t data){

- static char model[20];

- char *retStr = model;

- memset(model,0, sizeof(model));

- switch (data) {

- case 0x0: sprintf(retStr, "SRIX4K (Special)"); break;

- case 0x2: sprintf(retStr, "SR176"); break;

- case 0x3: sprintf(retStr, "SRIX4K"); break;

- case 0x4: sprintf(retStr, "SRIX512"); break;

- case 0x6: sprintf(retStr, "SRI512"); break;

- case 0x7: sprintf(retStr, "SRI4K"); break;

- case 0xC: sprintf(retStr, "SRT512"); break;

- default : sprintf(retStr, "Unknown"); break;

- }

- return retStr;

int print_ST_Lock_info(uint8_t model){

//assume connection open and tag selected...

int print_ST_Lock_info(uint8_t model){

//assume connection open and tag selected...

@@ -368,8 +376,8 @@ int print_ST_Lock_info(uint8_t model){

static void print_st_general_info(uint8_t *data){

//uid = first 8 bytes in data

PrintAndLog(" UID: %s", sprint_hex(SwapEndian64(data,8,8),8));

static void print_st_general_info(uint8_t *data){

//uid = first 8 bytes in data

PrintAndLog(" UID: %s", sprint_hex(SwapEndian64(data,8,8),8));

- PrintAndLog(" MFG: %02X, %s", data[6], getTagInfo(data[6]));

- PrintAndLog(" Chip: %02X, %s", data[5]>>2, get_ST_Chip_Model(data[5]>>2));

+ PrintAndLog(" MFG: %02X, %s", data[6], getManufacturerName(data[6]));

+ PrintAndLog(" Chip: %02X, %s", data[5], getChipInfo(data[6], data[5]));

return;

}

return;

}