X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e994394a40ad9c7b8e33e2fed3357d5d91ab2709..6063655a3ca719d224c61ece09645cedd5b4818c:/client/cmdhf14b.c diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c index 1263e3a0..2e90bc4b 100644 --- a/client/cmdhf14b.c +++ b/client/cmdhf14b.c @@ -73,16 +73,19 @@ int CmdSrix4kRead(const char *Cmd) { return 0; } -int rawClose(void){ +static int rawCloseEx(bool verbose){ UsbCommand resp; UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; clearCommandBuffer(); SendCommand(&c); - if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) { - PrintAndLog("Command time-out"); - return 1; + if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { + if ( verbose ) PrintAndLog("Command time-out"); + return 0; } - return 0; + return 1; +} +static int rawClose() { + return rawCloseEx(false); } int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose){ @@ -395,7 +398,7 @@ static void print_st_general_info(uint8_t *data){ } // 14b get and print UID only (general info) -int HF14BStdReader(uint8_t *data, uint8_t *datalen){ +int HF14BStdReader(uint8_t *data, uint8_t *datalen, bool verbose){ //05 00 00 = find one tag in field //1d xx xx xx xx 00 08 01 00 = attrib xx=UID (resp 10 [f9 e0]) //a3 = ? (resp 03 [e2 c2]) @@ -420,9 +423,9 @@ int HF14BStdReader(uint8_t *data, uint8_t *datalen){ data[1] = 0x00; data[2] = 0x08; - if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose(); + if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawCloseEx(verbose); - if (data[0] != 0x50 || *datalen != 14 || !crc) return rawClose(); + if (data[0] != 0x50 || *datalen != 14 || !crc) return rawCloseEx(verbose); PrintAndLog ("\n14443-3b tag found:"); PrintAndLog (" UID: %s", sprint_hex(data+1,4)); @@ -444,18 +447,18 @@ int HF14BStdReader(uint8_t *data, uint8_t *datalen){ cmdLen = 9; // attrib - if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose(); + if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) rawCloseEx(verbose); - if (cmdLen != 3 || !crc2) return rawClose(); + if (cmdLen != 3 || !crc2) return rawCloseEx(verbose); // add attrib responce to data data[14] = cmd2[0]; - rawClose(); + rawCloseEx(verbose); return 1; } // 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; +int HF14BStdInfo(uint8_t *data, uint8_t *datalen, bool verbose){ + if (!HF14BStdReader(data,datalen, verbose)) return 0; //add more info here print_atqb_resp(data); @@ -463,7 +466,7 @@ int HF14BStdInfo(uint8_t *data, uint8_t *datalen){ } // SRx get and print general info about SRx chip from UID -int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){ +int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon, bool verbose){ bool crc = true; *datalen = 2; //wake cmd @@ -472,7 +475,7 @@ int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){ //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 (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawCloseEx(verbose); if (*datalen != 3 || !crc) return rawClose(); @@ -483,40 +486,42 @@ int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){ *datalen = 2; //leave power on - if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose(); + if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawCloseEx(verbose); - if (*datalen != 3 || !crc || data[0] != chipID) return rawClose(); + if (*datalen != 3 || !crc || data[0] != chipID) return rawCloseEx(verbose); // get uid data[0] = 0x0B; *datalen = 1; //leave power on - if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose(); + if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawCloseEx(verbose); - if (*datalen != 10 || !crc) return rawClose(); + if (*datalen != 10 || !crc) return rawCloseEx(verbose); //power off ? - if (closeCon) rawClose(); + if (closeCon) rawCloseEx(verbose); - PrintAndLog("\n14443-3b ST tag found:"); - print_st_general_info(data); + if (verbose ) { + PrintAndLog("\n14443-3b ST tag found:"); + 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; +int HF14B_ST_Info(uint8_t *data, uint8_t *datalen, bool verbose){ + if (!HF14B_ST_Reader(data, datalen, false, verbose)) return 0; //add locking bit information here. if (print_ST_Lock_info(data[5]>>2)) - rawClose(); + rawCloseEx(verbose); return 1; } // 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){ +int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen, bool verbose){ bool crc = true; *datalen = 4; //std read cmd @@ -530,7 +535,7 @@ int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen){ PrintAndLog ("\n14443-3b tag found:"); PrintAndLog ("Unknown tag type answered to a 0x000b3f80 command ans:"); PrintAndLog ("%s",sprint_hex(data,*datalen)); - rawClose(); + rawCloseEx(verbose); return 1; } } @@ -544,7 +549,7 @@ int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen){ PrintAndLog ("\n14443-3b tag found:"); PrintAndLog ("Unknown tag type answered to a 0x0A command ans:"); PrintAndLog ("%s",sprint_hex(data,*datalen)); - rawClose(); + rawCloseEx(verbose); return 1; } } @@ -558,11 +563,11 @@ int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen){ PrintAndLog ("\n14443-3b tag found:"); PrintAndLog ("Unknown tag type answered to a 0x0C command ans:"); PrintAndLog ("%s",sprint_hex(data,*datalen)); - rawClose(); + rawCloseEx(verbose); return 1; } } - rawClose(); + rawCloseEx(verbose); return 0; } @@ -572,14 +577,14 @@ int HF14BInfo(bool verbose){ uint8_t datalen = 5; // try std 14b (atqb) - if (HF14BStdInfo(data, &datalen)) return 1; + if (HF14BStdInfo(data, &datalen, verbose)) return 1; // try st 14b - if (HF14B_ST_Info(data, &datalen)) return 1; + if (HF14B_ST_Info(data, &datalen, verbose)) 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 (HF14B_Other_Reader(data, &datalen, verbose)) return 1; if (verbose) PrintAndLog("no 14443B tag found"); return 0; @@ -596,14 +601,14 @@ int HF14BReader(bool verbose){ uint8_t datalen = 5; // try std 14b (atqb) - if (HF14BStdReader(data, &datalen)) return 1; + if (HF14BStdReader(data, &datalen, verbose)) return 1; // try st 14b - if (HF14B_ST_Reader(data, &datalen, true)) return 1; + if (HF14B_ST_Reader(data, &datalen, true, verbose)) 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 (HF14B_Other_Reader(data, &datalen, verbose)) return 1; if (verbose) PrintAndLog("no 14443B tag found"); return 0; @@ -688,11 +693,6 @@ uint32_t srix4kEncode(uint32_t value) { // 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; @@ -703,18 +703,18 @@ uint32_t srix4kEncode(uint32_t value) { // 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); + 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]); + chksum -= NIBBLE_HIGH(valuebytes[i]); + chksum -= NIBBLE_LOW(valuebytes[i]); } // base4 conversion and left shift twice @@ -727,17 +727,17 @@ uint32_t srix4kEncode(uint32_t value) { // merge scambled and chksum parts uint32_t encvalue = - ( NibbleLow ( base4[0]) << 28 ) | - ( NibbleHigh( temp[0]) << 24 ) | + ( NIBBLE_LOW ( base4[0]) << 28 ) | + ( NIBBLE_HIGH( temp[0]) << 24 ) | - ( NibbleLow ( base4[1]) << 20 ) | - ( NibbleLow ( temp[0]) << 16 ) | + ( NIBBLE_LOW ( base4[1]) << 20 ) | + ( NIBBLE_LOW ( temp[0]) << 16 ) | - ( NibbleLow ( base4[2]) << 12 ) | - ( NibbleHigh( temp[1]) << 8 ) | + ( NIBBLE_LOW ( base4[2]) << 12 ) | + ( NIBBLE_HIGH( temp[1]) << 8 ) | - ( NibbleLow ( base4[3]) << 4 ) | - NibbleLow ( temp[1] ); + ( NIBBLE_LOW ( base4[3]) << 4 ) | + NIBBLE_LOW ( temp[1] ); PrintAndLog("ICE encoded | %08X -> %08X", value, encvalue); return encvalue; @@ -804,8 +804,7 @@ int CmdteaSelfTest(const char *Cmd){ SwapEndian64ex(v , 8, 4, v_ptr); // ENCRYPTION KEY: - - uint8_t key[16] = {0x00}; + uint8_t key[16] = {0x55,0xFE,0xF6,0x30,0x62,0xBF,0x0B,0xC1,0xC9,0xB3,0x7C,0x34,0x97,0x3E,0x29,0xFB }; uint8_t keyle[16]; uint8_t* key_ptr = keyle; SwapEndian64ex(key , sizeof(key), 4, key_ptr);