#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
-//#include <string.h>
#include <stdint.h>
#include "iso14443crc.h"
#include "proxmark3.h"
#include "cmdhf14b.h"
#include "cmdmain.h"
#include "cmdhf14a.h"
+#include "tea.h"
+#include "cmdhf.h"
+#include "prng.h"
+#include "sha1.h"
static int CmdHelp(const char *Cmd);
-int CmdHF14BList(const char *Cmd)
-{
- PrintAndLog("Deprecated command, use 'hf list 14b' instead");
-
+int CmdHF14BList(const char *Cmd) {
+ CmdHFList("14b");
return 0;
}
int CmdHF14BSim(const char *Cmd)
{
- UsbCommand c={CMD_SIMULATE_TAG_ISO_14443B};
+ UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443B};
clearCommandBuffer();
SendCommand(&c);
return 0;
int CmdHF14BSnoop(const char *Cmd)
{
- UsbCommand c = {CMD_SNOOP_ISO_14443B};
+ UsbCommand c = {CMD_SNOOP_ISO_14443B};
clearCommandBuffer();
SendCommand(&c);
return 0;
* SRIX4K tags are ISO14443-B modulated memory tags,
* 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}};
clearCommandBuffer();
SendCommand(&c);
clearCommandBuffer();
SendCommand(&c);
if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
- return 0;
+ PrintAndLog("Command time-out");
+ return 1;
}
- 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;
+
+ if(*crc) {
+ ComputeCrc14443(CRC_14443_B, data, *datalen, data+*datalen, data+*datalen+1);
*datalen += 2;
}
+ UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv,power
c.arg[0] = *datalen;
c.arg[1] = reply;
c.arg[2] = power;
- memcpy(c.d.asBytes,data,*datalen);
+ memcpy(c.d.asBytes, data, *datalen);
clearCommandBuffer();
SendCommand(&c);
if (!reply) return 1;
+ UsbCommand resp;
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));
+ *datalen = resp.arg[0];
+ if (verbose) PrintAndLog("received %u octets", *datalen);
+ if(*datalen<3) return 0;
- 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;
- }
+ memcpy(data, resp.d.asBytes, *datalen);
+
+ uint8_t first = 0, second = 0;
+ ComputeCrc14443(CRC_14443_B, data, *datalen-2, &first, &second);
+ *crc = ( data[*datalen-2] == first && data[*datalen-1] == second);
+
+ if (verbose)
+ PrintAndLog("[LEN %u] %s[%02X %02X] %s",
+ *datalen,
+ sprint_hex(data, *datalen-2),
+ data[*datalen-2],
+ data[*datalen-1],
+ (*crc)?"OK":"FAIL"
+ );
+
return 1;
}
bool reply = true;
bool crc = false;
bool power = false;
+ bool select = false;
+ bool SRx = false;
char buf[5]="";
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("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(" -ss active signal field ON with select for SRx ST Microelectronics tags");
return 0;
}
case 'P':
power = true;
break;
+ case 's':
+ case 'S':
+ select = true;
+ if (Cmd[i+2]=='s' || Cmd[i+2]=='S') {
+ SRx = true;
+ i++;
+ }
+ break;
default:
PrintAndLog("Invalid option");
return 0;
sscanf(buf,"%x",&temp);
data[datalen++]=(uint8_t)(temp & 0xff);
*buf=0;
+ memset(buf, 0x00, sizeof(buf));
}
continue;
}
PrintAndLog("Invalid char on input");
- return 1;
+ return 0;
}
if (datalen == 0)
{
return 0;
}
+ if (select){ //auto select 14b tag
+ uint8_t cmd2[16];
+ bool crc2 = true;
+ uint8_t cmdLen;
+
+ if (SRx) {
+ // REQ SRx
+ cmdLen = 2;
+ cmd2[0] = 0x06;
+ cmd2[1] = 0x00;
+ } else {
+ // REQB
+ cmdLen = 3;
+ cmd2[0] = 0x05;
+ cmd2[1] = 0x00;
+ cmd2[2] = 0x08;
+ }
+
+ // REQB
+ if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
+
+ PrintAndLog("REQB : %s", sprint_hex(cmd2, cmdLen));
+
+ 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;
+ }
+ // wait
+
+ // attrib
+ if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
+ PrintAndLog("ATTRIB : %s", sprint_hex(cmd2, cmdLen));
+
+ if (cmdLen != 3 || !crc2) return rawClose();
+ if (SRx && cmd2[0] != chipID) return rawClose();
+
+ }
return HF14BCmdRaw(reply, &crc, power, data, &datalen, true);
}
+// print full atqb info
static void print_atqb_resp(uint8_t *data){
- PrintAndLog (" UID: %s", sprint_hex(data+1,4));
+ //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];
else if (maxFrame == 8) maxFrame = 256;
else maxFrame = 257;
- PrintAndLog ("Max Frame Size: %d%s", maxFrame, (maxFrame == 257) ? "+ RFU" : "");
+ PrintAndLog ("Max Frame Size: %u%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 ("Frame Wait Int: %u", 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 ");
+ PrintAndLog ("Max Buf Length: %u (MBLI) %s",data[14]>>4, (data[14] & 0xF0) ? "" : "not supported");
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;
case 0x6: sprintf(retStr, "SRI512"); break;
case 0x7: sprintf(retStr, "SRI4K"); break;
case 0xC: sprintf(retStr, "SRT512"); break;
- default: sprintf(retStr, "Unknown"); break;
+ default : sprintf(retStr, "Unknown"); break;
}
return retStr;
}
-static void print_st_info(uint8_t *data){
+int print_ST_Lock_info(uint8_t model){
+ //assume connection open and tag selected...
+ uint8_t data[16] = {0x00};
+ uint8_t datalen = 2;
+ bool crc = true;
+ uint8_t resplen;
+ uint8_t blk1;
+ data[0] = 0x08;
+
+ if (model == 0x2) { //SR176 has special command:
+ data[1] = 0xf;
+ resplen = 4;
+ } else {
+ data[1] = 0xff;
+ resplen = 6;
+ }
+
+ //std read cmd
+ if (HF14BCmdRaw(true, &crc, true, data, &datalen, false)==0) return rawClose();
+
+ if (datalen != resplen || !crc) return rawClose();
+
+ PrintAndLog("Chip Write Protection Bits:");
+ // now interpret the data
+ switch (model){
+ case 0x0: //fall through (SRIX4K special)
+ case 0x3: //fall through (SRIx4K)
+ case 0x7: // (SRI4K)
+ //only need data[3]
+ blk1 = 9;
+ PrintAndLog(" raw: %s", sprint_bin(data+3, 1));
+ PrintAndLog(" 07/08:%slocked", (data[3] & 1) ? " not " : " " );
+ for (uint8_t i = 1; i<8; i++){
+ PrintAndLog(" %02u:%slocked", blk1, (data[3] & (1 << i)) ? " not " : " " );
+ blk1++;
+ }
+ break;
+ case 0x4: //fall through (SRIX512)
+ case 0x6: //fall through (SRI512)
+ case 0xC: // (SRT512)
+ //need data[2] and data[3]
+ blk1 = 0;
+ PrintAndLog(" raw: %s", sprint_bin(data+2, 2));
+ for (uint8_t b=2; b<4; b++){
+ for (uint8_t i=0; i<8; i++){
+ PrintAndLog(" %02u:%slocked", blk1, (data[b] & (1 << i)) ? " not " : " " );
+ blk1++;
+ }
+ }
+ break;
+ case 0x2: // (SR176)
+ //need data[2]
+ blk1 = 0;
+ PrintAndLog(" raw: %s", sprint_bin(data+2, 1));
+ for (uint8_t i = 0; i<8; i++){
+ PrintAndLog(" %02u/%02u:%slocked", blk1, blk1+1, (data[2] & (1 << i)) ? " " : " not " );
+ blk1+=2;
+ }
+ break;
+ default:
+ return rawClose();
+ }
+ return 1;
+}
+
+// print UID info from SRx chips (ST Microelectronics)
+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]));
return;
}
-int HF14BStdInfo(uint8_t *data, uint8_t *datalen){
-
+// 14b get and print UID only (general info)
+int HF14BStdReader(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)
+ //1d xx xx xx xx 00 08 01 00 = attrib xx=UID (resp 10 [f9 e0])
+ //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])
// 0200a4040010a000000018300301000000000000000000 (resp 02 6a 82 [4b 4c])
//03 = ? (resp 03 [e3 c2])
//c2 = ? (resp c2 [66 15])
- //b2 = ? (resp a3 [e9 67])
+ //b2 = ? (resp a3 [e9 67])
+ //a2 = ? (resp 02 [6a d3])
bool crc = true;
*datalen = 3;
//std read cmd
data[0] = 0x05;
data[1] = 0x00;
- data[2] = 0x00;
+ data[2] = 0x08;
- if (HF14BCmdRaw(true, &crc, false, data, datalen, false)==0) return 0;
+ if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
- if (data[0] != 0x50 || *datalen != 14 || !crc) return 0;
+ if (data[0] != 0x50 || *datalen != 14 || !crc) return rawClose();
PrintAndLog ("\n14443-3b tag found:");
- print_atqb_resp(data);
+ PrintAndLog (" UID: %s", sprint_hex(data+1,4));
+ uint8_t cmd2[16];
+ uint8_t cmdLen = 3;
+ bool crc2 = true;
+
+ cmd2[0] = 0x1D;
+ // UID from data[1 - 4]
+ cmd2[1] = data[1];
+ cmd2[2] = data[2];
+ cmd2[3] = data[3];
+ cmd2[4] = data[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();
+ // add attrib responce to data
+ data[14] = cmd2[0];
+ rawClose();
return 1;
}
-int HF14B_ST_Info(uint8_t *data, uint8_t *datalen){
+// 14b get and print Full Info (as much as we know)
+int HF14BStdInfo(uint8_t *data, uint8_t *datalen){
+ if (!HF14BStdReader(data,datalen)) return 0;
+
+ //add more info here
+ print_atqb_resp(data);
+ return 1;
+}
+
+// SRx get and print general info about SRx chip from UID
+int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){
bool crc = true;
*datalen = 2;
//wake cmd
*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();
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;
+ //leave power on
+ if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
+
+ if (*datalen != 10 || !crc) return rawClose();
+
+ //power off ?
+ if (closeCon) rawClose();
PrintAndLog("\n14443-3b ST tag found:");
- print_st_info(data);
+ print_st_general_info(data);
+ return 1;
+}
+
+// SRx get and print full info (needs more info...)
+int HF14B_ST_Info(uint8_t *data, uint8_t *datalen){
+ if (!HF14B_ST_Reader(data, datalen, false)) return 0;
+
+ //add locking bit information here.
+ if (print_ST_Lock_info(data[5]>>2))
+ rawClose();
+
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){
+int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen){
bool crc = true;
*datalen = 4;
//std read cmd
data[2] = 0x3f;
data[3] = 0x80;
- if (HF14BCmdRaw(true, &crc, false, data, datalen, false)!=0) {
+ if (HF14BCmdRaw(true, &crc, true, 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));
+ rawClose();
return 1;
}
}
*datalen = 1;
data[0] = 0x0a;
- if (HF14BCmdRaw(true, &crc, false, data, datalen, false)!=0) {
+ if (HF14BCmdRaw(true, &crc, true, 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));
+ rawClose();
return 1;
}
}
*datalen = 1;
data[0] = 0x0c;
- if (HF14BCmdRaw(true, &crc, false, data, datalen, false)!=0) {
+ if (HF14BCmdRaw(true, &crc, true, 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));
+ rawClose();
return 1;
}
}
-
+ rawClose();
return 0;
-
}
+// get and print all info known about any known 14b tag
int HF14BInfo(bool verbose){
- uint8_t data[100];
+ uint8_t data[USB_CMD_DATA_SIZE];
uint8_t datalen = 5;
// try std 14b (atqb)
// 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 (HF14B_Other_Reader(data, &datalen)) return 1;
if (verbose) PrintAndLog("no 14443B tag found");
return 0;
}
+// menu command to get and print all info known about any known 14b tag
int CmdHF14Binfo(const char *Cmd){
return HF14BInfo(true);
}
+// get and print general info about all known 14b chips
+int HF14BReader(bool verbose){
+ uint8_t data[USB_CMD_DATA_SIZE];
+ uint8_t datalen = 5;
+
+ // try std 14b (atqb)
+ if (HF14BStdReader(data, &datalen)) return 1;
+
+ // try st 14b
+ if (HF14B_ST_Reader(data, &datalen, true)) return 1;
+
+ // try unknown 14b read commands (to be identified later)
+ // could be read of calypso, CEPAS, moneo, or pico pass.
+ if (HF14B_Other_Reader(data, &datalen)) return 1;
+
+ if (verbose) PrintAndLog("no 14443B tag found");
+ return 0;
+}
+
+// menu command to get and print general info about all known 14b chips
+int CmdHF14BReader(const char *Cmd){
+ return HF14BReader(true);
+}
+
int CmdSriWrite( const char *Cmd){
/*
* For SRIX4K blocks 00 - 7F
return 0;
}
-static command_t CommandTable[] =
-{
+uint32_t srix4kEncode(uint32_t value) {
+/*
+// vv = value
+// pp = position
+// vv vv vv pp
+4 bytes : 00 1A 20 01
+*/
+
+#define NibbleHigh(b) ( (b & 0xF0) >> 4 )
+#define NibbleLow(b) ( b & 0x0F )
+#define Crumb(b,p) (((b & (0x3 << p) ) >> p ) & 0xF)
+
+ // only the lower crumbs.
+ uint8_t block = (value & 0xFF);
+ uint8_t i = 0;
+ uint8_t valuebytes[] = {0,0,0};
+
+ num_to_bytes(value, 3, valuebytes);
+
+ // Scrambled part
+ // Crumb swapping of value.
+ uint8_t temp[] = {0,0};
+ temp[0] = (Crumb(value, 22) << 4 | Crumb(value, 14 ) << 2 | Crumb(value, 6)) << 4;
+ temp[0] |= Crumb(value, 20) << 4 | Crumb(value, 12 ) << 2 | Crumb(value, 4);
+ temp[1] = (Crumb(value, 18) << 4 | Crumb(value, 10 ) << 2 | Crumb(value, 2)) << 4;
+ temp[1] |= Crumb(value, 16) << 4 | Crumb(value, 8 ) << 2 | Crumb(value, 0);
+
+ // chksum part
+ uint32_t chksum = 0xFF - block;
+
+ // chksum is reduced by each nibbles of value.
+ for (i = 0; i < 3; ++i){
+ chksum -= NibbleHigh(valuebytes[i]);
+ chksum -= NibbleLow(valuebytes[i]);
+ }
+
+ // base4 conversion and left shift twice
+ i = 3;
+ uint8_t base4[] = {0,0,0,0};
+ while( chksum !=0 ){
+ base4[i--] = (chksum % 4 << 2);
+ chksum /= 4;
+ }
+
+ // merge scambled and chksum parts
+ uint32_t encvalue =
+ ( NibbleLow ( base4[0]) << 28 ) |
+ ( NibbleHigh( temp[0]) << 24 ) |
+
+ ( NibbleLow ( base4[1]) << 20 ) |
+ ( NibbleLow ( temp[0]) << 16 ) |
+
+ ( NibbleLow ( base4[2]) << 12 ) |
+ ( NibbleHigh( temp[1]) << 8 ) |
+
+ ( NibbleLow ( base4[3]) << 4 ) |
+ NibbleLow ( temp[1] );
+
+ PrintAndLog("ICE encoded | %08X -> %08X", value, encvalue);
+ return encvalue;
+}
+uint32_t srix4kDecode(uint32_t value) {
+ switch(value) {
+ case 0xC04F42C5: return 0x003139;
+ case 0xC1484807: return 0x002943;
+ case 0xC0C60848: return 0x001A20;
+ }
+ return 0;
+}
+uint32_t srix4kDecodeCounter(uint32_t num) {
+ uint32_t value = ~num;
+ ++value;
+ return value;
+}
+
+uint32_t srix4kGetMagicbytes( uint64_t uid, uint32_t block6, uint32_t block18, uint32_t block19 ){
+#define MASK 0xFFFFFFFF;
+ uint32_t uid32 = uid & MASK;
+ uint32_t counter = srix4kDecodeCounter(block6);
+ uint32_t decodedBlock18 = srix4kDecode(block18);
+ uint32_t decodedBlock19 = srix4kDecode(block19);
+ uint32_t doubleBlock = (decodedBlock18 << 16 | decodedBlock19) + 1;
+
+ uint32_t result = (uid32 * doubleBlock * counter) & MASK;
+ PrintAndLog("Magic bytes | %08X", result);
+ return result;
+}
+int srix4kValid(const char *Cmd){
+
+ uint64_t uid = 0xD00202501A4532F9;
+ uint32_t block6 = 0xFFFFFFFF;
+ uint32_t block18 = 0xC04F42C5;
+ uint32_t block19 = 0xC1484807;
+ uint32_t block21 = 0xD1BCABA4;
+
+ uint32_t test_b18 = 0x00313918;
+ uint32_t test_b18_enc = srix4kEncode(test_b18);
+ //uint32_t test_b18_dec = srix4kDecode(test_b18_enc);
+ PrintAndLog("ENCODE & CHECKSUM | %08X -> %08X (%s)", test_b18, test_b18_enc , "");
+
+ uint32_t magic = srix4kGetMagicbytes(uid, block6, block18, block19);
+ PrintAndLog("BLOCK 21 | %08X -> %08X (no XOR)", block21, magic ^ block21);
+ return 0;
+}
+
+int CmdteaSelfTest(const char *Cmd){
+
+ uint8_t v[8], v_le[8];
+ memset(v, 0x00, sizeof(v));
+ memset(v_le, 0x00, sizeof(v_le));
+ uint8_t* v_ptr = v_le;
+
+ uint8_t cmdlen = strlen(Cmd);
+ cmdlen = ( sizeof(v)<<2 < cmdlen ) ? sizeof(v)<<2 : cmdlen;
+
+ if ( param_gethex(Cmd, 0, v, cmdlen) > 0 ){
+ PrintAndLog("can't read hex chars, uneven? :: %u", cmdlen);
+ return 1;
+ }
+
+ SwapEndian64ex(v , 8, 4, v_ptr);
+
+ // ENCRYPTION KEY:
+
+ uint8_t key[16] = {0x00};
+ uint8_t keyle[16];
+ uint8_t* key_ptr = keyle;
+ SwapEndian64ex(key , sizeof(key), 4, key_ptr);
+
+ PrintAndLog("TEST LE enc| %s", sprint_hex(v_ptr, 8));
+
+ tea_decrypt(v_ptr, key_ptr);
+ PrintAndLog("TEST LE dec | %s", sprint_hex_ascii(v_ptr, 8));
+
+ tea_encrypt(v_ptr, key_ptr);
+ tea_encrypt(v_ptr, key_ptr);
+ PrintAndLog("TEST enc2 | %s", sprint_hex_ascii(v_ptr, 8));
+
+ return 0;
+}
+
+static command_t CommandTable[] = {
{"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"},
+ {"info", CmdHF14Binfo, 0, "Find and print details about a 14443B tag"},
+ {"list", CmdHF14BList, 0, "[Deprecated] List ISO 14443B history"},
+ {"reader", CmdHF14BReader, 0, "Act as a 14443B reader to identify a tag"},
+ {"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"},
+ {"sriwrite", CmdSriWrite, 0, "Write data to a SRI512 | SRIX4K tag"},
{"raw", CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
+ //{"valid", srix4kValid, 1, "srix4k checksum test"},
+ {"valid", CmdteaSelfTest, 1, "tea test"},
{NULL, NULL, 0, NULL}
};
-int CmdHF14B(const char *Cmd)
-{
+int CmdHF14B(const char *Cmd) {
+ clearCommandBuffer();
CmdsParse(CommandTable, Cmd);
return 0;
}
-int CmdHelp(const char *Cmd)
-{
+int CmdHelp(const char *Cmd) {
CmdsHelp(CommandTable);
return 0;
}
projects / proxmark3-svn / blobdiff