dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ADD: @marshmellow42 's fixed version of the ISO11784 FDX-B

Browse Source 
ADD: crc16_ccitt_rev  (reverse version of crc16_ccitt 0x0000)
This commit is contained in:
iceman1001
2015-06-04 10:33:55 +02:00
parent 22a6a62fbb
commit ad6219fc91
10 changed files with 109 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
client/cmddata.c
View File

@@ -23,6 +23,8 @@
#include "lfdemod.h"
#include "usb_cmd.h"
#include "crc.h"
#include "crc16.h"
uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
uint8_t g_debugMode;
@@ -1457,11 +1459,11 @@ int CmdFSKdemodPyramid(const char *Cmd)
return 1;
}
// ISO11784/85 demod (aka animal tag) BIPHASE, inverted, rf/32, with preamble of 00000000001 (128bits)
// FDX-B ISO11784/85 demod (aka animal tag) BIPHASE, inverted, rf/32, with preamble of 00000000001 (128bits)
// 8 databits + 1 parity (1)
// CIITT 16 chksum
// NATIONAL CODE, ICAR database
// COUNTRY CODE (ISO3166)
// COUNTRY CODE (ISO3166) or http://cms.abvma.ca/uploads/ManufacturersISOsandCountryCodes.pdf
// FLAG (animal/non-animal)
/*
38 IDbits
@@ -1472,62 +1474,81 @@ int CmdFSKdemodPyramid(const char *Cmd)
16 ccitt CRC chksum over 64bit ID CODE.
24 appli bits.
-- sample: 985121004515220
Now is nibble shifting, byte shifting.
-- sample: 985121004515220 [ 37FF65B88EF94 ]
*/
int CmdIso11784demodBI(const char *Cmd){
int CmdFDXBdemodBI(const char *Cmd){
int invert = 1;
int clk = 32;
int errCnt = 0;
int maxErr = 0;
uint8_t BitStream[MAX_DEMOD_BUF_LEN];
size_t size = getFromGraphBuf(BitStream);
errCnt = askdemod(BitStream, &size, &clk, &invert, 0, 0, 0);
if ( errCnt<0 ) {
if (g_debugMode) PrintAndLog("DEBUG: no data found %d, clock: 32", errCnt);
errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0);
if ( errCnt < 0 || errCnt > maxErr ) {
if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: 32", errCnt);
return 0;
}
errCnt = BiphaseRawDecode(BitStream, &size, 0, 1);
if (errCnt < 0){
errCnt = BiphaseRawDecode(BitStream, &size, maxErr, 1);
if (errCnt < 0 || errCnt > maxErr ) {
if (g_debugMode) PrintAndLog("Error BiphaseRawDecode: %d", errCnt);
return 0;
}
int preambleIndex = ISO11784demodBI(BitStream, &size);
int preambleIndex = FDXBdemodBI(BitStream, &size);
if (preambleIndex < 0){
if (g_debugMode) PrintAndLog("Error ISO11784Demod , no startmarker found :: %d",preambleIndex);
if (g_debugMode) PrintAndLog("Error FDXBDemod , no startmarker found :: %d",preambleIndex);
return 0;
}
PrintAndLog("startmarker %d; Size %d", preambleIndex, size);
setDemodBuf(BitStream, 128, preambleIndex);
//got a good demod
uint8_t ByteStream[16] = {0x00};
uint8_t bitCnt = 0;
uint8_t ByteCnt = 0;
size_t startIdx = preambleIndex + 11; //start after preamble
for (size_t idx = 0; idx < size; idx++){
if ( bitCnt == 9 ){
bitCnt = 0;
continue;
}
//lsb first
ByteStream[ByteCnt] |= ( BitStream[startIdx+idx] << bitCnt );
bitCnt++;
if (bitCnt % 8 == 0){
if (g_debugMode) PrintAndLog("byte %d: %02x", ByteCnt, ByteStream[ByteCnt]);
bitCnt = 9;
ByteCnt++;
}
size = removeParity(BitStream, preambleIndex + 11, 9, 2, 128-11);
if ( size <= 103 ) {
if (g_debugMode) PrintAndLog("Error removeParity:: %d", size);
return 0;
}
PrintAndLog("DATA: %s", sprint_hex(ByteStream, 14));
//now ByteStream contains 16 bytes of decrypted raw tag data
setDemodBuf(BitStream+preambleIndex, 128, 0);
printDemodBuff();
if (g_debugMode) {
char *bin = sprint_bin_break(BitStream,size,16);
PrintAndLog("DEBUG BinStream:\n%s",bin);
}
PrintAndLog("\nFDX-B / ISO 11784/5 Animal Tag ID Found:");
if (g_debugMode) PrintAndLog("startmarker %d; Size %d", preambleIndex, size);
//got a good demod
//marshmellows
uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(BitStream+32,6)) << 32) | bytebits_to_byteLSBF(BitStream,32);
uint32_t countryCode = bytebits_to_byteLSBF(BitStream+38,10);
uint8_t dataBlockBit = BitStream[48];
uint32_t reservedCode = bytebits_to_byteLSBF(BitStream+49,14);
uint8_t animalBit = BitStream[63];
uint16_t crc16 = bytebits_to_byteLSBF(BitStream+64,16);
uint32_t extended = bytebits_to_byteLSBF(BitStream+80,24);
uint64_t rawid = ((uint64_t)bytebits_to_byte(BitStream+32,32) << 32) | bytebits_to_byte(BitStream,32);
uint8_t raw[8];
num_to_bytes(rawid, 8, raw);
PrintAndLog("%s", sprint_hex(raw,8));
uint16_t crcCalc = crc16_ccitt_rev( raw ,8);
PrintAndLog("Animal ID: %u-%012llu", countryCode, NationalCode);
PrintAndLog("National Code: %012llu", NationalCode);
PrintAndLog("CountryCode: %u", countryCode);
PrintAndLog("Extended Data: %s", dataBlockBit ? "True" : "False");
PrintAndLog("reserved Code: %u", reservedCode);
PrintAndLog("Animal Tag: %s", animalBit ? "True" : "False");
PrintAndLog("CRC: 0x%02X", crc16);
PrintAndLog("CRC : %X == %X %s", crc16, crcCalc, ( crcCalc == crc16 )?"ok":"!" );
PrintAndLog("Extended: 0x%X", extended);
/*
//uint16_t crcCalc = crc16_ccitt( ByteStream, 8);
PrintAndLog("Application ID: %04X", applicationid);
*/
return 1;
}
@@ -1947,7 +1968,7 @@ typedef struct {
uint8_t * buffer;
uint32_t numbits;
uint32_t position;
}BitstreamOut;
} BitstreamOut;
bool _headBit( BitstreamOut *stream)
{
@@ -2277,6 +2298,7 @@ static command_t CommandTable[] =
{"buffclear", CmdBuffClear, 1, "Clear sample buffer and graph window"},
{"dec", CmdDec, 1, "Decimate samples"},
{"detectclock", CmdDetectClockRate, 1, "[modulation] Detect clock rate of wave in GraphBuffer (options: 'a','f','n','p' for ask, fsk, nrz, psk respectively)"},
{"fdxbdemod", CmdFDXBdemodBI , 1, "Demodulate a FDX-B ISO11784/85 Biphase tag from GraphBuffer"},
{"fskawiddemod", CmdFSKdemodAWID, 1, "Demodulate an AWID FSK tag from GraphBuffer"},
//{"fskfcdetect", CmdFSKfcDetect, 1, "Try to detect the Field Clock of an FSK wave"},
{"fskhiddemod", CmdFSKdemodHID, 1, "Demodulate a HID FSK tag from GraphBuffer"},
@@ -2288,7 +2310,6 @@ static command_t CommandTable[] =
{"hexsamples", CmdHexsamples, 0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
{"hide", CmdHide, 1, "Hide graph window"},
{"hpf", CmdHpf, 1, "Remove DC offset from trace"},
{"iso11784demod", CmdIso11784demodBI, 1, "Demodulate a ISO11784/85 Biphase tag from GraphBuffer"},
{"load", CmdLoad, 1, "<filename> -- Load trace (to graph window"},
{"ltrim", CmdLtrim, 1, "<samples> -- Trim samples from left of trace"},
{"rtrim", CmdRtrim, 1, "<location to end trace> -- Trim samples from right of trace"},

2
client/cmddata.h
View File

@@ -27,13 +27,13 @@ int CmdBitsamples(const char *Cmd);
int CmdBuffClear(const char *Cmd);
int CmdDec(const char *Cmd);
int CmdDetectClockRate(const char *Cmd);
int CmdFDXBdemodBI(const char *Cmd);
int CmdFSKdemodAWID(const char *Cmd);
int CmdFSKdemodHID(const char *Cmd);
int CmdFSKdemodIO(const char *Cmd);
int CmdFSKdemodParadox(const char *Cmd);
int CmdFSKdemodPyramid(const char *Cmd);
int CmdFSKrawdemod(const char *Cmd);
int CmdIso11784demodBI(const char *Cmd);
int CmdPSK1rawDemod(const char *Cmd);
int CmdPSK2rawDemod(const char *Cmd);
int CmdPSKNexWatch(const char *Cmd);

6
client/cmdlf.c
View File

@@ -1077,6 +1077,12 @@ int CmdLFfind(const char *Cmd)
return 1;
}
ans=CmdFDXBdemodBI("");
if (ans>0) {
PrintAndLog("\nValid FDX-B ID Found!");
return 1;
}
ans=EM4x50Read("", false);
if (ans>0) {
PrintAndLog("\nValid EM4x50 ID Found!");

3
client/cmdlft55xx.c
View File

@@ -1050,6 +1050,7 @@ char * GetSelectedModulationStr( uint8_t id){
return buf;
}
/*
uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){
int i = start;
@@ -1063,7 +1064,7 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){
return tmp;
}
*/
static command_t CommandTable[] =
{
{"help", CmdHelp, 1, "This help"},

15
client/util.c
View File

@@ -453,3 +453,18 @@ void xor(unsigned char * dst, unsigned char * src, size_t len) {
int32_t le24toh (uint8_t data[3]) {
return (data[2] << 16) | (data[1] << 8) | data[0];
}
uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) {
int i = start;
int j = len-1;
if (len > 32) return 0;
uint32_t tmp = 0;
for (; j >= 0; --j, ++i)
tmp |= bits[i] << j;
return tmp;
}

2
client/util.h
View File

@@ -65,4 +65,4 @@ void wiegand_add_parity(char *target, char *source, char length);
void xor(unsigned char * dst, unsigned char * src, size_t len);
int32_t le24toh (uint8_t data[3]);
uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits);