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

#include <stdio.h>

#include <string.h>

#include <inttypes.h>

#include <stdio.h>

#include <string.h>

#include <inttypes.h>

+#include "cmdlfem4x.h"

#include "proxmark3.h"

#include "ui.h"

#include "util.h"

#include "proxmark3.h"

#include "ui.h"

#include "util.h"

+#include "data.h"

#include "graph.h"

#include "cmdparser.h"

#include "cmddata.h"

#include "cmdlf.h"

#include "cmdmain.h"

#include "graph.h"

#include "cmdparser.h"

#include "cmddata.h"

#include "cmdlf.h"

#include "cmdmain.h"

-#include "cmdlfem4x.h"

#include "lfdemod.h"

-char *global_em410xId;

+uint64_t g_em410xId=0;

static int CmdHelp(const char *Cmd);

return 0;

}

return 0;

}

+//by marshmellow

+//print 64 bit EM410x ID in multiple formats

+void printEM410x(uint32_t hi, uint64_t id)

+{

+ if (id || hi){

+ uint64_t iii=1;

+ uint64_t id2lo=0;

+ uint32_t ii=0;

+ uint32_t i=0;

+ for (ii=5; ii>0;ii--){

+ for (i=0;i<8;i++){

+ id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8)));

+ }

+ if (hi){

+ //output 88 bit em id

+ PrintAndLog("\nEM TAG ID : %06X%016" PRIX64, hi, id);

+ } else{

+ //output 40 bit em id

+ PrintAndLog("\nEM TAG ID : %010" PRIX64, id);

+ PrintAndLog("\nPossible de-scramble patterns");

+ PrintAndLog("Unique TAG ID : %010" PRIX64, id2lo);

+ PrintAndLog("HoneyWell IdentKey {");

+ PrintAndLog("DEZ 8 : %08" PRIu64,id & 0xFFFFFF);

+ PrintAndLog("DEZ 10 : %010" PRIu64,id & 0xFFFFFFFF);

+ PrintAndLog("DEZ 5.5 : %05lld.%05" PRIu64,(id>>16LL) & 0xFFFF,(id & 0xFFFF));

+ PrintAndLog("DEZ 3.5A : %03lld.%05" PRIu64,(id>>32ll),(id & 0xFFFF));

+ PrintAndLog("DEZ 3.5B : %03lld.%05" PRIu64,(id & 0xFF000000) >> 24,(id & 0xFFFF));

+ PrintAndLog("DEZ 3.5C : %03lld.%05" PRIu64,(id & 0xFF0000) >> 16,(id & 0xFFFF));

+ PrintAndLog("DEZ 14/IK2 : %014" PRIu64,id);

+ PrintAndLog("DEZ 15/IK3 : %015" PRIu64,id2lo);

+ PrintAndLog("DEZ 20/ZK : %02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64,

+ (id2lo & 0xf000000000) >> 36,

+ (id2lo & 0x0f00000000) >> 32,

+ (id2lo & 0x00f0000000) >> 28,

+ (id2lo & 0x000f000000) >> 24,

+ (id2lo & 0x0000f00000) >> 20,

+ (id2lo & 0x00000f0000) >> 16,

+ (id2lo & 0x000000f000) >> 12,

+ (id2lo & 0x0000000f00) >> 8,

+ (id2lo & 0x00000000f0) >> 4,

+ (id2lo & 0x000000000f)

+ );

+ uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff)) + 0x143e00;

+ PrintAndLog("}\nOther : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64 "",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));

+ PrintAndLog("Pattern Paxton : %" PRIu64 " [0x%" PRIX64 "]", paxton, paxton);

+

+ uint32_t p1id = (id & 0xFFFFFF);

+ uint8_t arr[32] = {0x00};

+ int i =0;

+ int j = 23;

+ for (; i < 24; ++i, --j ){

+ arr[i] = (p1id >> i) & 1;

+ }

+

+ uint32_t p1 = 0;

+

+ p1 |= arr[23] << 21;

+ p1 |= arr[22] << 23;

+ p1 |= arr[21] << 20;

+ p1 |= arr[20] << 22;

+

+ p1 |= arr[19] << 18;

+ p1 |= arr[18] << 16;

+ p1 |= arr[17] << 19;

+ p1 |= arr[16] << 17;

+

+ p1 |= arr[15] << 13;

+ p1 |= arr[14] << 15;

+ p1 |= arr[13] << 12;

+ p1 |= arr[12] << 14;

+

+ p1 |= arr[11] << 6;

+ p1 |= arr[10] << 2;

+ p1 |= arr[9] << 7;

+ p1 |= arr[8] << 1;

+

+ p1 |= arr[7] << 0;

+ p1 |= arr[6] << 8;

+ p1 |= arr[5] << 11;

+ p1 |= arr[4] << 3;

+

+ p1 |= arr[3] << 10;

+ p1 |= arr[2] << 4;

+ p1 |= arr[1] << 5;

+ p1 |= arr[0] << 9;

+ PrintAndLog("Pattern 1 : %d [0x%X]", p1, p1);

+

+ uint16_t sebury1 = id & 0xFFFF;

+ uint8_t sebury2 = (id >> 16) & 0x7F;

+ uint32_t sebury3 = id & 0x7FFFFF;

+ PrintAndLog("Pattern Sebury : %d %d %d [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3);

+ }

+ return;

+}

+

/* Read the ID of an EM410x tag.

* Format:

* 1111 1111 1 <-- standard non-repeatable header

/* Read the ID of an EM410x tag.

* Format:

* 1111 1111 1 <-- standard non-repeatable header

* CCCC <-- each bit here is parity for the 10 bits above in corresponding column

* 0 <-- stop bit, end of tag

*/

* CCCC <-- each bit here is parity for the 10 bits above in corresponding column

* 0 <-- stop bit, end of tag

*/

-int CmdEM410xRead(const char *Cmd)

+int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )

{

- uint32_t hi=0;

- uint64_t lo=0;

-

- if(!AskEm410xDemod("", &hi, &lo, false)) return 0;

- PrintAndLog("EM410x pattern found: ");

- printEM410x(hi, lo);

- if (hi){

- PrintAndLog ("EM410x XL pattern found");

+ size_t idx = 0;

+ size_t BitLen = DemodBufferLen;

+ uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};

+ memcpy(BitStream, DemodBuffer, BitLen);

+ if (Em410xDecode(BitStream, &BitLen, &idx, hi, lo)){

+ //set GraphBuffer for clone or sim command

+ setDemodBuf(BitStream, BitLen, idx);

+ if (g_debugMode){

+ PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);

+ printDemodBuff();

+ }

+ if (verbose){

+ PrintAndLog("EM410x pattern found: ");

+ printEM410x(*hi, *lo);

+ g_em410xId = *lo;

+ }

+ return 1;

+ }

+ return 0;

+}

+

+//askdemod then call Em410xdecode

+int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose)

+{

+ bool st = true;

+ if (!ASKDemod_ext(Cmd, false, false, 1, &st)) return 0;

+ return AskEm410xDecode(verbose, hi, lo);

+}

+

+//by marshmellow

+//takes 3 arguments - clock, invert and maxErr as integers

+//attempts to demodulate ask while decoding manchester

+//prints binary found and saves in graphbuffer for further commands

+int CmdAskEM410xDemod(const char *Cmd)

+{

+ char cmdp = param_getchar(Cmd, 0);

+ if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') {

+ PrintAndLog("Usage: lf em 410xdemod [clock] <0|1> [maxError]");

+ PrintAndLog(" [set clock as integer] optional, if not set, autodetect.");

+ PrintAndLog(" <invert>, 1 for invert output");

+ PrintAndLog(" [set maximum allowed errors], default = 100.");

+ PrintAndLog("");

+ PrintAndLog(" sample: lf em 410xdemod = demod an EM410x Tag ID from GraphBuffer");

+ PrintAndLog(" : lf em 410xdemod 32 = demod an EM410x Tag ID from GraphBuffer using a clock of RF/32");

+ PrintAndLog(" : lf em 410xdemod 32 1 = demod an EM410x Tag ID from GraphBuffer using a clock of RF/32 and inverting data");

+ PrintAndLog(" : lf em 410xdemod 1 = demod an EM410x Tag ID from GraphBuffer while inverting data");

+ PrintAndLog(" : lf em 410xdemod 64 1 0 = demod an EM410x Tag ID from GraphBuffer using a clock of RF/64 and inverting data and allowing 0 demod errors");

return 0;

}

return 0;

}

- char id[12] = {0x00};

- sprintf(id, "%010"PRIx64,lo);

-

- global_em410xId = id;

- return 1;

+ uint64_t lo = 0;

+ uint32_t hi = 0;

+ return AskEm410xDemod(Cmd, &hi, &lo, true);

+}

+

+int usage_lf_em410x_sim(void) {

+ PrintAndLog("Simulating EM410x tag");

+ PrintAndLog("");

+ PrintAndLog("Usage: lf em 410xsim [h] <uid> <clock>");

+ PrintAndLog("Options:");

+ PrintAndLog(" h - this help");

+ PrintAndLog(" uid - uid (10 HEX symbols)");

+ PrintAndLog(" clock - clock (32|64) (optional)");

+ PrintAndLog("samples:");

+ PrintAndLog(" lf em 410xsim 0F0368568B");

+ PrintAndLog(" lf em 410xsim 0F0368568B 32");

+ return 0;

}

// emulate an EM410X tag

}

// emulate an EM410X tag

char cmdp = param_getchar(Cmd, 0);

uint8_t uid[5] = {0x00};

char cmdp = param_getchar(Cmd, 0);

uint8_t uid[5] = {0x00};

- if (cmdp == 'h' || cmdp == 'H') {

- PrintAndLog("Usage: lf em4x em410xsim <UID> <clock>");

- PrintAndLog("");

- PrintAndLog(" sample: lf em4x em410xsim 0F0368568B");

- return 0;

- }

+ if (cmdp == 'h' || cmdp == 'H') return usage_lf_em410x_sim();

/* clock is 64 in EM410x tags */

uint8_t clock = 64;

/* clock is 64 in EM410x tags */

uint8_t clock = 64;

* rate gets lower, then grow the number of samples

* Changed by martin, 4000 x 4 = 16000,

* see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235

* rate gets lower, then grow the number of samples

* Changed by martin, 4000 x 4 = 16000,

* see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235

+ *

+ * EDIT -- capture enough to get 2 complete preambles at the slowest data rate known to be used (rf/64) (64*64*2+9 = 8201) marshmellow

*/

int CmdEM410xWatch(const char *Cmd)

{

*/

int CmdEM410xWatch(const char *Cmd)

{

}

CmdLFRead("s");

}

CmdLFRead("s");

- getSamples("8201",true); //capture enough to get 2 complete preambles (4096*2+9)

- } while (!CmdEM410xRead(""));

+ getSamples("8201",true);

+ } while (!CmdAskEM410xDemod(""));

return 0;

}

return 0;

}

int CmdEM410xWatchnSpoof(const char *Cmd)

{

CmdEM410xWatch(Cmd);

int CmdEM410xWatchnSpoof(const char *Cmd)

{

CmdEM410xWatch(Cmd);

- PrintAndLog("# Replaying captured ID: %s",global_em410xId);

+ PrintAndLog("# Replaying captured ID: %010"PRIx64, g_em410xId);

CmdLFaskSim("");

return 0;

}

CmdLFaskSim("");

return 0;

}

int card = 0xFF; // invalid card value

unsigned int clock = 0; // invalid clock value

int card = 0xFF; // invalid card value

unsigned int clock = 0; // invalid clock value

- sscanf(Cmd, "%" PRIx64 " %d %d", &id, &card, &clock);

+ sscanf(Cmd, "%" SCNx64 " %d %d", &id, &card, &clock);

// Check ID

if (id == 0xFFFFFFFFFFFFFFFF) {

// Check ID

if (id == 0xFFFFFFFFFFFFFFFF) {

}

bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) {

}

bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) {

- // em4x05/em4x69 preamble is 00001010

+ // em4x05/em4x69 command response preamble is 00001010

// skip first two 0 bits as they might have been missed in the demod

uint8_t preamble[] = {0,0,1,0,1,0};

size_t startIdx = 0;

// skip first two 0 bits as they might have been missed in the demod

uint8_t preamble[] = {0,0,1,0,1,0};

size_t startIdx = 0;

- // set size to 15 to only test first 9 positions for the preamble

- size_t size = (15 > DemodBufferLen) ? DemodBufferLen : 15;

- //test preamble

- if ( !onePreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx) ) {

+ // set size to 20 to only test first 14 positions for the preamble or less if not a read command

+ size_t size = (readCmd) ? 20 : 11;

+ // sanity check

+ size = (size > DemodBufferLen) ? DemodBufferLen : size;

+ // test preamble

+ if ( !preambleSearchEx(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx, true) ) {

if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);

return false;

}

if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);

return false;

}

if (g_debugMode) PrintAndLog("DEBUG: Error - End Parity check failed");

return false;

}

if (g_debugMode) PrintAndLog("DEBUG: Error - End Parity check failed");

return false;

}

- //test for even parity bits.

- if ( removeParity(DemodBuffer, startIdx + sizeof(preamble),9,0,44) == 0 ) {

+ // test for even parity bits and remove them. (leave out the end row of parities so 36 bits)

+ if ( removeParity(DemodBuffer, startIdx + sizeof(preamble),9,0,36) == 0 ) {

if (g_debugMode) PrintAndLog("DEBUG: Error - Parity not detected");

return false;

}

if (g_debugMode) PrintAndLog("DEBUG: Error - Parity not detected");

return false;

}

- setDemodBuf(DemodBuffer, 40, 0);

+ setDemodBuf(DemodBuffer, 32, 0);

*word = bytebits_to_byteLSBF(DemodBuffer, 32);

}

return true;

*word = bytebits_to_byteLSBF(DemodBuffer, 32);

}

return true;

uint32_t wordData = 0;

int success = EM4x05ReadWord_ext(addr, pwd, usePwd, &wordData);

if (success == 1)

uint32_t wordData = 0;

int success = EM4x05ReadWord_ext(addr, pwd, usePwd, &wordData);

if (success == 1)

- PrintAndLog(" Got Address %02d | %08X",addr,wordData);

+ PrintAndLog("%s Address %02d | %08X", (addr>13) ? "Lock":" Got",addr,wordData);

else

PrintAndLog("Read Address %02d | failed",addr);

else

PrintAndLog("Read Address %02d | failed",addr);

int usage_lf_em_write(void) {

PrintAndLog("Write EM4x05/EM4x69. Tag must be on antenna. ");

PrintAndLog("");

int usage_lf_em_write(void) {

PrintAndLog("Write EM4x05/EM4x69. Tag must be on antenna. ");

PrintAndLog("");

- PrintAndLog("Usage: lf em 4x05writeword [h] <address> <data> <pwd>");

+ PrintAndLog("Usage: lf em 4x05writeword [h] [s] <address> <data> <pwd>");

PrintAndLog("Options:");

PrintAndLog(" h - this help");

PrintAndLog("Options:");

PrintAndLog(" h - this help");

+ PrintAndLog(" s - swap data bit order before write");

PrintAndLog(" address - memory address to write to. (0-15)");

PrintAndLog(" data - data to write (hex)");

PrintAndLog(" pwd - password (hex) (optional)");

PrintAndLog(" address - memory address to write to. (0-15)");

PrintAndLog(" data - data to write (hex)");

PrintAndLog(" pwd - password (hex) (optional)");

int CmdEM4x05WriteWord(const char *Cmd) {

uint8_t ctmp = param_getchar(Cmd, 0);

if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_write();

int CmdEM4x05WriteWord(const char *Cmd) {

uint8_t ctmp = param_getchar(Cmd, 0);

if ( strlen(Cmd) == 0 || ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_write();

-

+

bool usePwd = false;

-

+

uint8_t addr = 16; // default to invalid address

uint32_t data = 0xFFFFFFFF; // default to blank data

uint32_t pwd = 0xFFFFFFFF; // default to blank password

uint8_t addr = 16; // default to invalid address

uint32_t data = 0xFFFFFFFF; // default to blank data

uint32_t pwd = 0xFFFFFFFF; // default to blank password

-

- addr = param_get8ex(Cmd, 0, 16, 10);

- data = param_get32ex(Cmd, 1, 0, 16);

- pwd = param_get32ex(Cmd, 2, 1, 16);

-

+ char swap = 0;

+

+ int p = 0;

+ swap = param_getchar(Cmd, 0);

+ if (swap == 's' || swap=='S') p++;

+ addr = param_get8ex(Cmd, p++, 16, 10);

+ data = param_get32ex(Cmd, p++, 0, 16);

+ pwd = param_get32ex(Cmd, p++, 1, 16);

+

+ if (swap == 's' || swap=='S') data = SwapBits(data, 32);

+

if ( (addr > 15) ) {

PrintAndLog("Address must be between 0 and 15");

return 1;

if ( (addr > 15) ) {

PrintAndLog("Address must be between 0 and 15");

return 1;

PrintAndLog("Writing address %d data %08X", addr, data);

else {

usePwd = true;

PrintAndLog("Writing address %d data %08X", addr, data);

else {

usePwd = true;

- PrintAndLog("Writing address %d data %08X using password %08X", addr, data, pwd);

+ PrintAndLog("Writing address %d data %08X using password %08X", addr, data, pwd);

}

-

+

uint16_t flag = (addr << 8 ) | usePwd;

-

+

UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}};

clearCommandBuffer();

SendCommand(&c);

UsbCommand c = {CMD_EM4X_WRITE_WORD, {flag, data, pwd}};

clearCommandBuffer();

SendCommand(&c);

- UsbCommand resp;

+ UsbCommand resp;

if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)){

PrintAndLog("Error occurred, device did not respond during write operation.");

return -1;

if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)){

PrintAndLog("Error occurred, device did not respond during write operation.");

return -1;

if ( !downloadSamplesEM() ) {

return -1;

}

if ( !downloadSamplesEM() ) {

return -1;

}

- //check response for 00001010 for write confirmation!

+ //check response for 00001010 for write confirmation!

//attempt demod:

uint32_t dummy = 0;

int result = demodEM4x05resp(&dummy,false);

if (result == 1) {

PrintAndLog("Write Verified");

//attempt demod:

uint32_t dummy = 0;

int result = demodEM4x05resp(&dummy,false);

if (result == 1) {

PrintAndLog("Write Verified");

+ } else {

+ PrintAndLog("Write could not be verified");

}

return result;

}

return result;

}

+void printEM4x05config(uint32_t wordData) {

+ uint16_t datarate = (((wordData & 0x3F)+1)*2);

+ uint8_t encoder = ((wordData >> 6) & 0xF);

+ char enc[14];

+ memset(enc,0,sizeof(enc));

+

+ uint8_t PSKcf = (wordData >> 10) & 0x3;

+ char cf[10];

+ memset(cf,0,sizeof(cf));

+ uint8_t delay = (wordData >> 12) & 0x3;

+ char cdelay[33];

+ memset(cdelay,0,sizeof(cdelay));

+ uint8_t LWR = (wordData >> 14) & 0xF; //last word read

+

+ switch (encoder) {

+ case 0: snprintf(enc,sizeof(enc),"NRZ"); break;

+ case 1: snprintf(enc,sizeof(enc),"Manchester"); break;

+ case 2: snprintf(enc,sizeof(enc),"Biphase"); break;

+ case 3: snprintf(enc,sizeof(enc),"Miller"); break;

+ case 4: snprintf(enc,sizeof(enc),"PSK1"); break;

+ case 5: snprintf(enc,sizeof(enc),"PSK2"); break;

+ case 6: snprintf(enc,sizeof(enc),"PSK3"); break;

+ case 7: snprintf(enc,sizeof(enc),"Unknown"); break;

+ case 8: snprintf(enc,sizeof(enc),"FSK1"); break;

+ case 9: snprintf(enc,sizeof(enc),"FSK2"); break;

+ default: snprintf(enc,sizeof(enc),"Unknown"); break;

+ }

+

+ switch (PSKcf) {

+ case 0: snprintf(cf,sizeof(cf),"RF/2"); break;

+ case 1: snprintf(cf,sizeof(cf),"RF/8"); break;

+ case 2: snprintf(cf,sizeof(cf),"RF/4"); break;

+ case 3: snprintf(cf,sizeof(cf),"unknown"); break;

+ }

+

+ switch (delay) {

+ case 0: snprintf(cdelay, sizeof(cdelay),"no delay"); break;

+ case 1: snprintf(cdelay, sizeof(cdelay),"BP/8 or 1/8th bit period delay"); break;

+ case 2: snprintf(cdelay, sizeof(cdelay),"BP/4 or 1/4th bit period delay"); break;

+ case 3: snprintf(cdelay, sizeof(cdelay),"no delay"); break;

+ }

+ PrintAndLog("ConfigWord: %08X (Word 4)\n", wordData);

+ PrintAndLog("Config Breakdown:", wordData);

+ PrintAndLog(" Data Rate: %02u | RF/%u", wordData & 0x3F, datarate);

+ PrintAndLog(" Encoder: %u | %s", encoder, enc);

+ PrintAndLog(" PSK CF: %u | %s", PSKcf, cf);

+ PrintAndLog(" Delay: %u | %s", delay, cdelay);

+ PrintAndLog(" LastWordR: %02u | Address of last word for default read", LWR);

+ PrintAndLog(" ReadLogin: %u | Read Login is %s", (wordData & 0x40000)>>18, (wordData & 0x40000) ? "Required" : "Not Required");

+ PrintAndLog(" ReadHKL: %u | Read Housekeeping Words Login is %s", (wordData & 0x80000)>>19, (wordData & 0x80000) ? "Required" : "Not Required");

+ PrintAndLog("WriteLogin: %u | Write Login is %s", (wordData & 0x100000)>>20, (wordData & 0x100000) ? "Required" : "Not Required");

+ PrintAndLog(" WriteHKL: %u | Write Housekeeping Words Login is %s", (wordData & 0x200000)>>21, (wordData & 0x200000) ? "Required" : "Not Required");

+ PrintAndLog(" R.A.W.: %u | Read After Write is %s", (wordData & 0x400000)>>22, (wordData & 0x400000) ? "On" : "Off");

+ PrintAndLog(" Disable: %u | Disable Command is %s", (wordData & 0x800000)>>23, (wordData & 0x800000) ? "Accepted" : "Not Accepted");

+ PrintAndLog(" R.T.F.: %u | Reader Talk First is %s", (wordData & 0x1000000)>>24, (wordData & 0x1000000) ? "Enabled" : "Disabled");

+ PrintAndLog(" Pigeon: %u | Pigeon Mode is %s\n", (wordData & 0x4000000)>>26, (wordData & 0x4000000) ? "Enabled" : "Disabled");

+}

+

void printEM4x05info(uint8_t chipType, uint8_t cap, uint16_t custCode, uint32_t serial) {

switch (chipType) {

void printEM4x05info(uint8_t chipType, uint8_t cap, uint16_t custCode, uint32_t serial) {

switch (chipType) {

- case 9: PrintAndLog("\nChip Type: %u | EM4305", chipType); break;

- case 4: PrintAndLog("Chip Type: %u | Unknown", chipType); break;

- case 2: PrintAndLog("Chip Type: %u | EM4469", chipType); break;

+ case 9: PrintAndLog("\n Chip Type: %u | EM4305", chipType); break;

+ case 4: PrintAndLog(" Chip Type: %u | Unknown", chipType); break;

+ case 2: PrintAndLog(" Chip Type: %u | EM4469", chipType); break;

//add more here when known

- default: PrintAndLog("Chip Type: %u Unknown", chipType); break;

+ default: PrintAndLog(" Chip Type: %u Unknown", chipType); break;

}

switch (cap) {

}

switch (cap) {

- case 3: PrintAndLog(" Cap Type: %u | 330pF",cap); break;

- case 2: PrintAndLog(" Cap Type: %u | 210pF",cap); break;

- case 1: PrintAndLog(" Cap Type: %u | 250pF",cap); break;

- default: PrintAndLog(" Cap Type: %u | unknown",cap); break;

+ case 3: PrintAndLog(" Cap Type: %u | 330pF",cap); break;

+ case 2: PrintAndLog(" Cap Type: %u | %spF",cap, (chipType==2)? "75":"210"); break;

+ case 1: PrintAndLog(" Cap Type: %u | 250pF",cap); break;

+ case 0: PrintAndLog(" Cap Type: %u | no resonant capacitor",cap); break;

+ default: PrintAndLog(" Cap Type: %u | unknown",cap); break;

}

- PrintAndLog("Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default": "Unknown");

+ PrintAndLog(" Cust Code: %03u | %s", custCode, (custCode == 0x200) ? "Default": "Unknown");

if (serial != 0) {

- PrintAndLog("\n Serial #: %08X\n", serial);

+ PrintAndLog("\n Serial #: %08X\n", serial);

+ }

+}

+

+void printEM4x05ProtectionBits(uint32_t wordData) {

+ for (uint8_t i = 0; i < 15; i++) {

+ PrintAndLog(" Word: %02u | %s", i, (((1 << i) & wordData ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");

+ if (i==14) {

+ PrintAndLog(" Word: %02u | %s", i+1, (((1 << i) & wordData ) || i < 2) ? "Is Write Locked" : "Is Not Write Locked");

+ }

}

int CmdEM4x05info(const char *Cmd) {

//uint8_t addr = 0;

int CmdEM4x05info(const char *Cmd) {

//uint8_t addr = 0;

- //uint32_t pwd;

+ uint32_t pwd;

uint32_t wordData = 0;

- // bool usePwd = false;

+ bool usePwd = false;

uint8_t ctmp = param_getchar(Cmd, 0);

if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_dump();

// for now use default input of 1 as invalid (unlikely 1 will be a valid password...)

uint8_t ctmp = param_getchar(Cmd, 0);

if ( ctmp == 'H' || ctmp == 'h' ) return usage_lf_em_dump();

// for now use default input of 1 as invalid (unlikely 1 will be a valid password...)

- //pwd = param_get32ex(Cmd, 0, 1, 16);

+ pwd = param_get32ex(Cmd, 0, 1, 16);

- //if ( pwd != 1 ) {

- // usePwd = true;

- //}

- int success = 1;

- // read blk 0

+ if ( pwd != 1 ) {

+ usePwd = true;

+ }

- //block 0 can be read even without a password.

+ // read word 0 (chip info)

+ // block 0 can be read even without a password.

if ( !EM4x05Block0Test(&wordData) )

return -1;

if ( !EM4x05Block0Test(&wordData) )

return -1;

uint8_t cap = (wordData >> 5) & 3;

uint16_t custCode = (wordData >> 9) & 0x3FF;

uint8_t cap = (wordData >> 5) & 3;

uint16_t custCode = (wordData >> 9) & 0x3FF;

+ // read word 1 (serial #) doesn't need pwd

wordData = 0;

if (EM4x05ReadWord_ext(1, 0, false, &wordData) != 1) {

//failed, but continue anyway...

}

printEM4x05info(chipType, cap, custCode, wordData);

wordData = 0;

if (EM4x05ReadWord_ext(1, 0, false, &wordData) != 1) {

//failed, but continue anyway...

}

printEM4x05info(chipType, cap, custCode, wordData);

- // add read block 4 and read out config if successful

+ // read word 4 (config block)

// needs password if one is set

+ wordData = 0;

+ if ( EM4x05ReadWord_ext(4, pwd, usePwd, &wordData) != 1 ) {

+ //failed

+ return 0;

+ }

+ printEM4x05config(wordData);

- return success;

+ // read word 14 and 15 to see which is being used for the protection bits

+ wordData = 0;

+ if ( EM4x05ReadWord_ext(14, pwd, usePwd, &wordData) != 1 ) {

+ //failed

+ return 0;

+ }

+ // if status bit says this is not the used protection word

+ if (!(wordData & 0x8000)) {

+ if ( EM4x05ReadWord_ext(15, pwd, usePwd, &wordData) != 1 ) {

+ //failed

+ return 0;

+ }

+ if (!(wordData & 0x8000)) {

+ //something went wrong

+ return 0;

+ }

+ printEM4x05ProtectionBits(wordData);

+

+ return 1;

}

static command_t CommandTable[] =

{

}

static command_t CommandTable[] =

{

- {"help", CmdHelp, 1, "This help"},

- {"410xdemod", CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"},

- {"410xread", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag in GraphBuffer"},

- {"410xsim", CmdEM410xSim, 0, "<UID> [clock rate] -- Simulate EM410x tag"},

+ {"help", CmdHelp, 1, "This help"},

+ {"410xread", CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"},

+ {"410xdemod", CmdAskEM410xDemod, 1, "[clock] [invert<0|1>] [maxErr] -- Demodulate an EM410x tag from GraphBuffer (args optional)"},

+ {"410xsim", CmdEM410xSim, 0, "<UID> [clock rate] -- Simulate EM410x tag"},

{"410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},

{"410xspoof", CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },

{"410xwrite", CmdEM410xWrite, 0, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},

{"410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},

{"410xspoof", CmdEM410xWatchnSpoof, 0, "['h'] --- Watches for EM410x 125/134 kHz tags, and replays them. (option 'h' for 134)" },

{"410xwrite", CmdEM410xWrite, 0, "<UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate"},

- {"4x05dump", CmdEM4x05dump, 0, "(pwd) -- Read EM4x05/EM4x69 all word data"},

- {"4x05info", CmdEM4x05info, 0, "(pwd) -- Get info from EM4x05/EM4x69 tag"},

- {"4x05readword", CmdEM4x05ReadWord, 0, "<Word> (pwd) -- Read EM4x05/EM4x69 word data"},

+ {"4x05dump", CmdEM4x05dump, 0, "(pwd) -- Read EM4x05/EM4x69 all word data"},

+ {"4x05info", CmdEM4x05info, 0, "(pwd) -- Get info from EM4x05/EM4x69 tag"},

+ {"4x05readword", CmdEM4x05ReadWord, 0, "<Word> (pwd) -- Read EM4x05/EM4x69 word data"},

{"4x05writeword", CmdEM4x05WriteWord, 0, "<Word> <data> (pwd) -- Write EM4x05/EM4x69 word data"},

- {"4x50read", CmdEM4x50Read, 1, "demod data from EM4x50 tag from the graph buffer"},

+ {"4x50read", CmdEM4x50Read, 1, "demod data from EM4x50 tag from the graph buffer"},

{NULL, NULL, 0, NULL}

};

{NULL, NULL, 0, NULL}

};