github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 05:13:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

CHG: 'lf cotag read' - added the raw output and the repeating byte pattern is 16bytes, so we only collect that many bytes from card

Browse source
This commit is contained in:
iceman1001 2017-02-03 00:07:55 +01:00
commit 52108cabf3
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/cmdlfcotag.c
View file

@ -45,6 +45,11 @@ int CmdCOTAGDemod(const char *Cmd) {
uint16_t cn = bytebits_to_byteLSBF(bits+1, 16); uint16_t cn = bytebits_to_byteLSBF(bits+1, 16);
uint32_t fc = bytebits_to_byteLSBF(bits+1+16, 8); 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 fc 161: 1010 0001 -> LSB 1000 0101
cn 33593 1000 0011 0011 1001 -> LSB 1001 1100 1100 0001 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 0 1001 1100 1100 0001 1000 0101 0000 0000 100001010000000001111011100000011010000010000000000000000000000000000000000000000000000000000000100111001100000110000101000
1001 1100 1100 0001 10000101 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 Raw: %08X%08X%08X%08X", fc, cn, raw1 ,raw2, raw3, raw4);
PrintAndLog("COTAG Found: FC %u, CN: %u", fc, cn);
return 1; return 1;
} }

2
client/cmdlfcotag.h
View file

@ -20,7 +20,7 @@
#include "cmdlf.h" // Setconfig #include "cmdlf.h" // Setconfig
#ifndef COTAG_BITS #ifndef COTAG_BITS
#define COTAG_BITS 320 #define COTAG_BITS 264
#endif #endif
int CmdLFCOTAG(const char *Cmd); int CmdLFCOTAG(const char *Cmd);

2
include/proxmark3.h
View file

@ -65,7 +65,7 @@
#define FALSE 0 #define FALSE 0
#ifndef COTAG_BITS #ifndef COTAG_BITS
#define COTAG_BITS 320 #define COTAG_BITS 264
#endif #endif
//#define PACKED __attribute__((__packed__)) //#define PACKED __attribute__((__packed__))