X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a71c68bdf0d117609a1ffd0141d1d682e1ff8e15..480e2f239421563263d07f6d11f2c929d7f14d1f:/client/cmdhf14b.c diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c index d9e56693..1263e3a0 100644 --- a/client/cmdhf14b.c +++ b/client/cmdhf14b.c @@ -22,13 +22,15 @@ #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; } @@ -64,8 +66,7 @@ int CmdSri512Read(const char *Cmd) * 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); @@ -73,10 +74,15 @@ int CmdSrix4kRead(const char *Cmd) } int rawClose(void){ + UsbCommand resp; UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; clearCommandBuffer(); SendCommand(&c); - return 0; + if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) { + PrintAndLog("Command time-out"); + return 1; + } + return 0; } int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose){ @@ -309,7 +315,7 @@ char *get_ST_Chip_Model(uint8_t data){ 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; } @@ -344,7 +350,7 @@ int print_ST_Lock_info(uint8_t model){ case 0x7: // (SRI4K) //only need data[3] blk1 = 9; - PrintAndLog(" raw: %s",printBits(1,data+3)); + 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 " : " " ); @@ -356,7 +362,7 @@ int print_ST_Lock_info(uint8_t model){ case 0xC: // (SRT512) //need data[2] and data[3] blk1 = 0; - PrintAndLog(" raw: %s",printBits(2,data+2)); + 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 " : " " ); @@ -367,7 +373,7 @@ int print_ST_Lock_info(uint8_t model){ case 0x2: // (SR176) //need data[2] blk1 = 0; - PrintAndLog(" raw: %s",printBits(1,data+2)); + 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; @@ -453,8 +459,6 @@ int HF14BStdInfo(uint8_t *data, uint8_t *datalen){ //add more info here print_atqb_resp(data); - - return 1; } @@ -677,8 +681,148 @@ int CmdSriWrite( const char *Cmd){ 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 details about a 14443B tag"}, {"list", CmdHF14BList, 0, "[Deprecated] List ISO 14443B history"}, @@ -689,17 +833,18 @@ static command_t CommandTable[] = {"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"}, + //{"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; }