From: iceman1001 Date: Thu, 2 Feb 2017 23:07:55 +0000 (+0100) Subject: CHG: 'lf cotag read' - added the raw output and the repeating byte pattern is 16bytes... X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/52108cabf322819371659f90bfddfcf58062bfa8 CHG: 'lf cotag read' - added the raw output and the repeating byte pattern is 16bytes, so we only collect that many bytes from card --- diff --git a/client/cmdlfcotag.c b/client/cmdlfcotag.c index 3c1c3caa..f10516a6 100644 --- a/client/cmdlfcotag.c +++ b/client/cmdlfcotag.c @@ -45,6 +45,11 @@ int CmdCOTAGDemod(const char *Cmd) { uint16_t cn = bytebits_to_byteLSBF(bits+1, 16); uint32_t fc = bytebits_to_byteLSBF(bits+1+16, 8); + uint32_t raw1 = bytebits_to_byteLSBF(bits, 32); + uint32_t raw2 = bytebits_to_byteLSBF(bits+32, 32); + uint32_t raw3 = bytebits_to_byteLSBF(bits+64, 32); + uint32_t raw4 = bytebits_to_byteLSBF(bits+96, 32); + /* fc 161: 1010 0001 -> LSB 1000 0101 cn 33593 1000 0011 0011 1001 -> LSB 1001 1100 1100 0001 @@ -52,8 +57,7 @@ int CmdCOTAGDemod(const char *Cmd) { 0 1001 1100 1100 0001 1000 0101 0000 0000 100001010000000001111011100000011010000010000000000000000000000000000000000000000000000000000000100111001100000110000101000 1001 1100 1100 0001 10000101 */ - //PrintAndLog("COTAG Found: FC %u, CN: %u Raw: %08X%08X%08X", fc, cn); //, raw1 ,raw2, raw3); - PrintAndLog("COTAG Found: FC %u, CN: %u", fc, cn); + PrintAndLog("COTAG Found: FC %u, CN: %u Raw: %08X%08X%08X%08X", fc, cn, raw1 ,raw2, raw3, raw4); return 1; } diff --git a/client/cmdlfcotag.h b/client/cmdlfcotag.h index 265f60d9..dab60513 100644 --- a/client/cmdlfcotag.h +++ b/client/cmdlfcotag.h @@ -20,7 +20,7 @@ #include "cmdlf.h" // Setconfig #ifndef COTAG_BITS -#define COTAG_BITS 320 +#define COTAG_BITS 264 #endif int CmdLFCOTAG(const char *Cmd); diff --git a/include/proxmark3.h b/include/proxmark3.h index 4fb1a30b..23d7b1ce 100644 --- a/include/proxmark3.h +++ b/include/proxmark3.h @@ -65,7 +65,7 @@ #define FALSE 0 #ifndef COTAG_BITS -#define COTAG_BITS 320 +#define COTAG_BITS 264 #endif //#define PACKED __attribute__((__packed__))