#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
-#include <string.h>
+//#include <string.h>
#include <stdint.h>
#include "iso14443crc.h"
-//#include "proxusb.h"
#include "proxmark3.h"
#include "data.h"
#include "graph.h"
+#include "util.h"
#include "ui.h"
#include "cmdparser.h"
#include "cmdhf14b.h"
#include "cmdmain.h"
+#include "cmdhf14a.h"
static int CmdHelp(const char *Cmd);
-int CmdHF14BDemod(const char *Cmd)
-{
- int i, j, iold;
- int isum, qsum;
- int outOfWeakAt;
- bool negateI, negateQ;
-
- uint8_t data[256];
- int dataLen = 0;
-
- // As received, the samples are pairs, correlations against I and Q
- // square waves. So estimate angle of initial carrier (or just
- // quadrant, actually), and then do the demod.
-
- // First, estimate where the tag starts modulating.
- for (i = 0; i < GraphTraceLen; i += 2) {
- if (abs(GraphBuffer[i]) + abs(GraphBuffer[i + 1]) > 40) {
- break;
- }
- }
- if (i >= GraphTraceLen) {
- PrintAndLog("too weak to sync");
- return 0;
- }
- PrintAndLog("out of weak at %d", i);
- outOfWeakAt = i;
-
- // Now, estimate the phase in the initial modulation of the tag
- isum = 0;
- qsum = 0;
- for (; i < (outOfWeakAt + 16); i += 2) {
- isum += GraphBuffer[i + 0];
- qsum += GraphBuffer[i + 1];
- }
- negateI = (isum < 0);
- negateQ = (qsum < 0);
-
- // Turn the correlation pairs into soft decisions on the bit.
- j = 0;
- for (i = 0; i < GraphTraceLen / 2; i++) {
- int si = GraphBuffer[j];
- int sq = GraphBuffer[j + 1];
- if (negateI) si = -si;
- if (negateQ) sq = -sq;
- GraphBuffer[i] = si + sq;
- j += 2;
- }
- GraphTraceLen = i;
-
- i = outOfWeakAt / 2;
- while (GraphBuffer[i] > 0 && i < GraphTraceLen)
- i++;
- if (i >= GraphTraceLen) goto demodError;
-
- iold = i;
- while (GraphBuffer[i] < 0 && i < GraphTraceLen)
- i++;
- if (i >= GraphTraceLen) goto demodError;
- if ((i - iold) > 23) goto demodError;
-
- PrintAndLog("make it to demod loop");
-
- for (;;) {
- iold = i;
- while (GraphBuffer[i] >= 0 && i < GraphTraceLen)
- i++;
- if (i >= GraphTraceLen) goto demodError;
- if ((i - iold) > 6) goto demodError;
-
- uint16_t shiftReg = 0;
- if (i + 20 >= GraphTraceLen) goto demodError;
-
- for (j = 0; j < 10; j++) {
- int soft = GraphBuffer[i] + GraphBuffer[i + 1];
-
- if (abs(soft) < (abs(isum) + abs(qsum)) / 20) {
- PrintAndLog("weak bit");
- }
-
- shiftReg >>= 1;
- if(GraphBuffer[i] + GraphBuffer[i+1] >= 0) {
- shiftReg |= 0x200;
- }
-
- i+= 2;
- }
-
- if ((shiftReg & 0x200) && !(shiftReg & 0x001))
- {
- // valid data byte, start and stop bits okay
- PrintAndLog(" %02x", (shiftReg >> 1) & 0xff);
- data[dataLen++] = (shiftReg >> 1) & 0xff;
- if (dataLen >= sizeof(data)) {
- return 0;
- }
- } else if (shiftReg == 0x000) {
- // this is EOF
- break;
- } else {
- goto demodError;
- }
- }
-
- uint8_t first, second;
- ComputeCrc14443(CRC_14443_B, data, dataLen-2, &first, &second);
- PrintAndLog("CRC: %02x %02x (%s)\n", first, second,
- (first == data[dataLen-2] && second == data[dataLen-1]) ?
- "ok" : "****FAIL****");
-
- RepaintGraphWindow();
- return 0;
-
-demodError:
- PrintAndLog("demod error");
- RepaintGraphWindow();
- return 0;
-}
-
int CmdHF14BList(const char *Cmd)
{
- uint8_t got[960];
- GetFromBigBuf(got,sizeof(got),0);
-
- PrintAndLog("recorded activity:");
- PrintAndLog(" time :rssi: who bytes");
- PrintAndLog("---------+----+----+-----------");
-
- int i = 0;
- int prev = -1;
-
- for(;;) {
- if(i >= 900) {
- break;
- }
+ PrintAndLog("Deprecated command, use 'hf list 14b' instead");
- bool isResponse;
- int timestamp = *((uint32_t *)(got+i));
- if(timestamp & 0x80000000) {
- timestamp &= 0x7fffffff;
- isResponse = 1;
- } else {
- isResponse = 0;
- }
- int metric = *((uint32_t *)(got+i+4));
-
- int len = got[i+8];
-
- if(len > 100) {
- break;
- }
- if(i + len >= 900) {
- break;
- }
-
- uint8_t *frame = (got+i+9);
-
- char line[1000] = "";
- int j;
- for(j = 0; j < len; j++) {
- sprintf(line+(j*3), "%02x ", frame[j]);
- }
-
- char *crc;
- if(len > 2) {
- uint8_t b1, b2;
- ComputeCrc14443(CRC_14443_B, frame, len-2, &b1, &b2);
- if(b1 != frame[len-2] || b2 != frame[len-1]) {
- crc = "**FAIL 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;
+ return 0;
}
-int CmdHF14BRead(const char *Cmd)
+int CmdHF14BSim(const char *Cmd)
{
- UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443, {strtol(Cmd, NULL, 0), 0, 0}};
- SendCommand(&c);
- return 0;
-}
-
-int CmdHF14Sim(const char *Cmd)
-{
- UsbCommand c={CMD_SIMULATE_TAG_ISO_14443};
- SendCommand(&c);
- return 0;
-}
-
-int CmdHFSimlisten(const char *Cmd)
-{
- UsbCommand c = {CMD_SIMULATE_TAG_HF_LISTEN};
- SendCommand(&c);
- return 0;
+ UsbCommand c={CMD_SIMULATE_TAG_ISO_14443B};
+ clearCommandBuffer();
+ SendCommand(&c);
+ return 0;
}
int CmdHF14BSnoop(const char *Cmd)
{
- UsbCommand c = {CMD_SNOOP_ISO_14443};
- SendCommand(&c);
- return 0;
+ UsbCommand c = {CMD_SNOOP_ISO_14443B};
+ clearCommandBuffer();
+ SendCommand(&c);
+ return 0;
}
/* New command to read the contents of a SRI512 tag
*/
int CmdSri512Read(const char *Cmd)
{
- UsbCommand c = {CMD_READ_SRI512_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
- SendCommand(&c);
- return 0;
+ UsbCommand c = {CMD_READ_SRI512_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
+ clearCommandBuffer();
+ SendCommand(&c);
+ return 0;
}
/* New command to read the contents of a SRIX4K tag
*/
int CmdSrix4kRead(const char *Cmd)
{
- UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
- SendCommand(&c);
- return 0;
+ UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
+ clearCommandBuffer();
+ SendCommand(&c);
+ return 0;
+}
+
+int rawClose(void){
+ UsbCommand resp;
+ UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};
+ clearCommandBuffer();
+ SendCommand(&c);
+ if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+ return 0;
+ }
+ return 0;
+}
+
+int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose){
+ UsbCommand resp;
+ UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv,power
+ if(*crc)
+ {
+ uint8_t first, second;
+ ComputeCrc14443(CRC_14443_B, data, *datalen, &first, &second);
+ data[*datalen] = first;
+ data[*datalen + 1] = second;
+ *datalen += 2;
+ }
+
+ c.arg[0] = *datalen;
+ c.arg[1] = reply;
+ c.arg[2] = power;
+ memcpy(c.d.asBytes,data,*datalen);
+ clearCommandBuffer();
+ SendCommand(&c);
+
+ if (!reply) return 1;
+
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+ if (verbose) PrintAndLog("timeout while waiting for reply.");
+ return 0;
+ }
+
+ int len = resp.arg[0];
+ if (verbose) {
+ PrintAndLog("received %u octets", len);
+ }
+ if ( len < 2 ) return 0;
+
+ memcpy(data, resp.d.asBytes, len);
+ if (verbose) PrintAndLog("%s", sprint_hex(data, len));
+
+ uint8_t first, second;
+ ComputeCrc14443(CRC_14443_B, data, len-2, &first, &second);
+ if(data[len-2] == first && data[len-1] == second) {
+ if (verbose) PrintAndLog("CRC OK");
+ *crc = true;
+ } else {
+ if (verbose) PrintAndLog("CRC failed");
+ *crc = false;
+ }
+ return 1;
}
-int CmdHF14BCmdRaw (const char *cmd) {
- UsbCommand resp;
- uint8_t *recv;
- UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv?
- uint8_t reply=1;
- uint8_t crc=0;
- uint8_t power=0;
+int CmdHF14BCmdRaw (const char *Cmd) {
+ bool reply = true;
+ bool crc = false;
+ bool power = false;
char buf[5]="";
- int i=0;
- uint8_t data[100];
- unsigned int datalen=0, temp;
- char *hexout;
-
- if (strlen(cmd)<3) {
+ uint8_t data[USB_CMD_DATA_SIZE] = {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(" -r do not read response");
PrintAndLog(" -c calculate and append CRC");
}
// strip
- while (*cmd==' ' || *cmd=='\t') cmd++;
+ while (*Cmd==' ' || *Cmd=='\t') Cmd++;
- while (cmd[i]!='\0') {
- if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
- if (cmd[i]=='-') {
- switch (cmd[i+1]) {
+ while (Cmd[i]!='\0') {
+ if (Cmd[i]==' ' || Cmd[i]=='\t') { i++; continue; }
+ if (Cmd[i]=='-') {
+ switch (Cmd[i+1]) {
case 'r':
case 'R':
- reply=0;
+ reply = false;
break;
case 'c':
case 'C':
- crc=1;
+ crc = true;
break;
case 'p':
case 'P':
- power=1;
+ power = true;
break;
default:
PrintAndLog("Invalid option");
i+=2;
continue;
}
- if ((cmd[i]>='0' && cmd[i]<='9') ||
- (cmd[i]>='a' && cmd[i]<='f') ||
- (cmd[i]>='A' && cmd[i]<='F') ) {
+ 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];
+ buf[strlen(buf)]=Cmd[i];
i++;
if (strlen(buf)>=2) {
sscanf(buf,"%x",&temp);
- data[datalen]=(uint8_t)(temp & 0xff);
- datalen++;
+ data[datalen++]=(uint8_t)(temp & 0xff);
*buf=0;
}
continue;
}
PrintAndLog("Invalid char on input");
- return 0;
+ return 1;
}
- if(crc)
+ if (datalen == 0)
{
- uint8_t first, second;
- ComputeCrc14443(CRC_14443_B, data, datalen, &first, &second);
- data[datalen++] = first;
- data[datalen++] = second;
+ PrintAndLog("Missing data input");
+ return 0;
}
-
- c.arg[0] = datalen;
- c.arg[1] = reply;
- c.arg[2] = power;
- memcpy(c.d.asBytes,data,datalen);
-
- SendCommand(&c);
-
- if (reply) {
- if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
- recv = resp.d.asBytes;
- PrintAndLog("received %i octets",resp.arg[0]);
- if(!resp.arg[0])
- return 0;
- hexout = (char *)malloc(resp.arg[0] * 3 + 1);
- if (hexout != NULL) {
- uint8_t first, second;
- for (int i = 0; i < resp.arg[0]; i++) { // data in hex
- sprintf(&hexout[i * 3], "%02hX ", recv[i]);
- }
- PrintAndLog("%s", hexout);
- free(hexout);
- ComputeCrc14443(CRC_14443_B, recv, resp.arg[0]-2, &first, &second);
- if(recv[resp.arg[0]-2]==first && recv[resp.arg[0]-1]==second) {
- PrintAndLog("CRC OK");
- } else {
- PrintAndLog("CRC failed");
- }
- } else {
- PrintAndLog("malloc failed your client has low memory?");
- }
- } else {
- PrintAndLog("timeout while waiting for reply.");
- }
- } // if reply
- return 0;
+
+ return HF14BCmdRaw(reply, &crc, power, data, &datalen, true);
+}
+
+static void print_atqb_resp(uint8_t *data){
+ PrintAndLog (" UID: %s", sprint_hex(data+1,4));
+ PrintAndLog (" App Data: %s", sprint_hex(data+5,4));
+ PrintAndLog (" Protocol: %s", sprint_hex(data+9,3));
+ uint8_t BitRate = data[9];
+ if (!BitRate) PrintAndLog (" Bit Rate: 106 kbit/s only PICC <-> PCD");
+ if (BitRate & 0x10) PrintAndLog (" Bit Rate: 212 kbit/s PICC -> PCD supported");
+ if (BitRate & 0x20) PrintAndLog (" Bit Rate: 424 kbit/s PICC -> PCD supported");
+ if (BitRate & 0x40) PrintAndLog (" Bit Rate: 847 kbit/s PICC -> PCD supported");
+ if (BitRate & 0x01) PrintAndLog (" Bit Rate: 212 kbit/s PICC <- PCD supported");
+ if (BitRate & 0x02) PrintAndLog (" Bit Rate: 424 kbit/s PICC <- PCD supported");
+ if (BitRate & 0x04) PrintAndLog (" Bit Rate: 847 kbit/s PICC <- PCD supported");
+ if (BitRate & 0x80) PrintAndLog (" Same bit rate <-> required");
+
+ uint16_t maxFrame = data[10]>>4;
+ if (maxFrame < 5) maxFrame = 8 * maxFrame + 16;
+ else if (maxFrame == 5) maxFrame = 64;
+ else if (maxFrame == 6) maxFrame = 96;
+ else if (maxFrame == 7) maxFrame = 128;
+ else if (maxFrame == 8) maxFrame = 256;
+ else maxFrame = 257;
+
+ PrintAndLog ("Max Frame Size: %d%s", maxFrame, (maxFrame == 257) ? "+ RFU" : "");
+
+ uint8_t protocolT = data[10] & 0xF;
+ PrintAndLog (" Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4",(protocolT) ? "" : "not " );
+ PrintAndLog ("Frame Wait Int: %d", data[11]>>4);
+ PrintAndLog (" App Data Code: Application is %s",(data[11]&4) ? "Standard" : "Proprietary");
+ PrintAndLog (" Frame Options: NAD is %ssupported",(data[11]&2) ? "" : "not ");
+ PrintAndLog (" Frame Options: CID is %ssupported",(data[11]&1) ? "" : "not ");
+
+ return;
+}
+
+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;
+}
+
+static void print_st_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));
+ return;
+}
+
+int HF14BStdInfo(uint8_t *data, uint8_t *datalen){
+
+ //05 00 00 = find one tag in field
+ //1d xx xx xx xx 20 00 08 01 00 = attrib xx=crc
+ //a3 = ? (resp 03 e2 c2)
+ //02 = ? (resp 02 6a d3)
+ // 022b (resp 02 67 00 [29 5b])
+ // 0200a40400 (resp 02 67 00 [29 5b])
+ // 0200a4040c07a0000002480300 (resp 02 67 00 [29 5b])
+ // 0200a4040c07a0000002480200 (resp 02 67 00 [29 5b])
+ // 0200a4040006a0000000010100 (resp 02 6a 82 [4b 4c])
+ // 0200a4040c09d27600002545500200 (resp 02 67 00 [29 5b])
+ // 0200a404000cd2760001354b414e4d30310000 (resp 02 6a 82 [4b 4c])
+ // 0200a404000ca000000063504b43532d313500 (resp 02 6a 82 [4b 4c])
+ // 0200a4040010a000000018300301000000000000000000 (resp 02 6a 82 [4b 4c])
+ //03 = ? (resp 03 [e3 c2])
+ //c2 = ? (resp c2 [66 15])
+ //b2 = ? (resp a3 [e9 67])
+ bool crc = true;
+ *datalen = 3;
+ //std read cmd
+ data[0] = 0x05;
+ data[1] = 0x00;
+ data[2] = 0x00;
+
+ if (HF14BCmdRaw(true, &crc, false, data, datalen, false)==0) return 0;
+
+ if (data[0] != 0x50 || *datalen != 14 || !crc) return 0;
+
+ PrintAndLog ("\n14443-3b tag found:");
+ print_atqb_resp(data);
+
+ return 1;
+}
+
+int HF14B_ST_Info(uint8_t *data, uint8_t *datalen){
+ bool crc = true;
+ *datalen = 2;
+ //wake cmd
+ data[0] = 0x06;
+ data[1] = 0x00;
+
+ //leave power on
+ // verbose on for now for testing - turn off when functional
+ if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
+
+ if (*datalen != 3 || !crc) return rawClose();
+
+ uint8_t chipID = data[0];
+ // select
+ data[0] = 0x0E;
+ data[1] = chipID;
+ *datalen = 2;
+
+ //leave power on
+ // verbose on for now for testing - turn off when functional
+ if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
+
+ if (*datalen != 3 || !crc || data[0] != chipID) return rawClose();
+
+ // get uid
+ data[0] = 0x0B;
+ *datalen = 1;
+
+ //power off
+ // verbose on for now for testing - turn off when functional
+ if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return 0;
+ rawClose();
+ if (*datalen != 10 || !crc) return 0;
+
+ PrintAndLog("\n14443-3b ST tag found:");
+ print_st_info(data);
+ return 1;
+}
+
+// test for other 14b type tags (mimic another reader - don't have tags to identify)
+int HF14B_Other_Info(uint8_t *data, uint8_t *datalen){
+ bool crc = true;
+ *datalen = 4;
+ //std read cmd
+ data[0] = 0x00;
+ data[1] = 0x0b;
+ data[2] = 0x3f;
+ data[3] = 0x80;
+
+ if (HF14BCmdRaw(true, &crc, false, data, datalen, false)!=0) {
+ if (*datalen > 2 || !crc) {
+ PrintAndLog ("\n14443-3b tag found:");
+ PrintAndLog ("Unknown tag type answered to a 0x000b3f80 command ans:");
+ PrintAndLog ("%s",sprint_hex(data,*datalen));
+ return 1;
+ }
+ }
+
+ crc = false;
+ *datalen = 1;
+ data[0] = 0x0a;
+
+ if (HF14BCmdRaw(true, &crc, false, data, datalen, false)!=0) {
+ if (*datalen > 0) {
+ PrintAndLog ("\n14443-3b tag found:");
+ PrintAndLog ("Unknown tag type answered to a 0x0A command ans:");
+ PrintAndLog ("%s",sprint_hex(data,*datalen));
+ return 1;
+ }
+ }
+
+ crc = false;
+ *datalen = 1;
+ data[0] = 0x0c;
+
+ if (HF14BCmdRaw(true, &crc, false, data, datalen, false)!=0) {
+ if (*datalen > 0) {
+ PrintAndLog ("\n14443-3b tag found:");
+ PrintAndLog ("Unknown tag type answered to a 0x0C command ans:");
+ PrintAndLog ("%s",sprint_hex(data,*datalen));
+ return 1;
+ }
+ }
+
+ return 0;
+
+}
+
+int HF14BInfo(bool verbose){
+ uint8_t data[100];
+ uint8_t datalen = 5;
+
+ // try std 14b (atqb)
+ if (HF14BStdInfo(data, &datalen)) return 1;
+
+ // try st 14b
+ if (HF14B_ST_Info(data, &datalen)) return 1;
+
+ // try unknown 14b read commands (to be identified later)
+ // could be read of calypso, CEPAS, moneo, or pico pass.
+ if (HF14B_Other_Info(data, &datalen)) return 1;
+
+ if (verbose) PrintAndLog("no 14443B tag found");
+ return 0;
+}
+
+int CmdHF14Binfo(const char *Cmd){
+ return HF14BInfo(true);
+}
+
+int CmdSriWrite( const char *Cmd){
+/*
+ * For SRIX4K blocks 00 - 7F
+ * hf 14b raw -c -p 09 $srix4kwblock $srix4kwdata
+ *
+ * For SR512 blocks 00 - 0F
+ * hf 14b raw -c -p 09 $sr512wblock $sr512wdata
+ *
+ * Special block FF = otp_lock_reg block.
+ * Data len 4 bytes-
+ */
+ char cmdp = param_getchar(Cmd, 0);
+ uint8_t blockno = -1;
+ uint8_t data[4] = {0x00};
+ bool isSrix4k = true;
+ char str[20];
+
+ if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') {
+ PrintAndLog("Usage: hf 14b write <1|2> <BLOCK> <DATA>");
+ PrintAndLog(" [1 = SRIX4K]");
+ PrintAndLog(" [2 = SRI512]");
+ PrintAndLog(" [BLOCK number depends on tag, special block == FF]");
+ PrintAndLog(" sample: hf 14b write 1 7F 11223344");
+ PrintAndLog(" : hf 14b write 1 FF 11223344");
+ PrintAndLog(" : hf 14b write 2 15 11223344");
+ PrintAndLog(" : hf 14b write 2 FF 11223344");
+ return 0;
+ }
+
+ if ( cmdp == '2' )
+ isSrix4k = false;
+
+ //blockno = param_get8(Cmd, 1);
+
+ if ( param_gethex(Cmd,1, &blockno, 2) ) {
+ PrintAndLog("Block number must include 2 HEX symbols");
+ return 0;
+ }
+
+ if ( isSrix4k ){
+ if ( blockno > 0x7f && blockno != 0xff ){
+ PrintAndLog("Block number out of range");
+ return 0;
+ }
+ } else {
+ if ( blockno > 0x0f && blockno != 0xff ){
+ PrintAndLog("Block number out of range");
+ return 0;
+ }
+ }
+
+ if (param_gethex(Cmd, 2, data, 8)) {
+ PrintAndLog("Data must include 8 HEX symbols");
+ return 0;
+ }
+
+ if ( blockno == 0xff)
+ PrintAndLog("[%s] Write special block %02X [ %s ]", (isSrix4k)?"SRIX4K":"SRI512" , blockno, sprint_hex(data,4) );
+ else
+ PrintAndLog("[%s] Write block %02X [ %s ]", (isSrix4k)?"SRIX4K":"SRI512", blockno, sprint_hex(data,4) );
+
+ sprintf(str, "-c 09 %02x %02x%02x%02x%02x", blockno, data[0], data[1], data[2], data[3]);
+
+ CmdHF14BCmdRaw(str);
+ return 0;
}
static command_t CommandTable[] =
{
- {"help", CmdHelp, 1, "This help"},
- {"demod", CmdHF14BDemod, 1, "Demodulate ISO14443 Type B from tag"},
- {"list", CmdHF14BList, 0, "List ISO 14443 history"},
- {"read", CmdHF14BRead, 0, "Read HF tag (ISO 14443)"},
- {"sim", CmdHF14Sim, 0, "Fake ISO 14443 tag"},
- {"simlisten", CmdHFSimlisten, 0, "Get HF samples as fake tag"},
- {"snoop", CmdHF14BSnoop, 0, "Eavesdrop ISO 14443"},
- {"sri512read", CmdSri512Read, 0, "Read contents of a SRI512 tag"},
- {"srix4kread", CmdSrix4kRead, 0, "Read contents of a SRIX4K tag"},
- {"raw", CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
- {NULL, NULL, 0, NULL}
+ {"help", CmdHelp, 1, "This help"},
+ {"info", CmdHF14Binfo, 0, "Find and print info about a 14b type tag (HF ISO 14443b)"},
+ {"list", CmdHF14BList, 0, "[Deprecated] List ISO 14443b history"},
+ {"sim", CmdHF14BSim, 0, "Fake ISO 14443B tag"},
+ {"snoop", CmdHF14BSnoop, 0, "Eavesdrop ISO 14443B"},
+ {"sri512read", CmdSri512Read, 0, "Read contents of a SRI512 tag"},
+ {"srix4kread", CmdSrix4kRead, 0, "Read contents of a SRIX4K tag"},
+ {"sriwrite", CmdSriWrite, 0, "Write data to a SRI512 | SRIX4K tag"},
+ {"raw", CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
+ {NULL, NULL, 0, NULL}
};
int CmdHF14B(const char *Cmd)
{
- CmdsParse(CommandTable, Cmd);
- return 0;
+ CmdsParse(CommandTable, Cmd);
+ return 0;
}
int CmdHelp(const char *Cmd)
{
- CmdsHelp(CommandTable);
- return 0;
+ CmdsHelp(CommandTable);
+ return 0;
}
projects / proxmark3-svn / blobdiff