#include "cmdparser.h"// already included in cmdmain.h
#include "usb_cmd.h" // already included in cmdmain.h and proxmark3.h
#include "lfdemod.h" // for demod code
-#include "crc.h" // for pyramid checksum maxim
-#include "crc16.h" // for FDXB demod checksum
#include "loclass/cipherutils.h" // for decimating samples in getsamples
#include "cmdlfem4x.h"// for em410x demod
if (buff == NULL)
return;
- if ( size >= MAX_DEMOD_BUF_LEN)
+ if ( size + startIdx >= MAX_DEMOD_BUF_LEN)
size = MAX_DEMOD_BUF_LEN;
size_t i = 0;
return;
}
+bool getDemodBuf(uint8_t *buff, size_t *size) {
+ if (buff == NULL) return false;
+ if (size == NULL) return false;
+ if (*size == 0) return false;
+
+ *size = (*size > DemodBufferLen) ? DemodBufferLen : *size;
+
+ memcpy(buff, DemodBuffer, *size);
+ return true;
+}
+
+// option '1' to save DemodBuffer any other to restore
+void save_restoreDB(uint8_t saveOpt)
+{
+ static uint8_t SavedDB[MAX_DEMOD_BUF_LEN];
+ static size_t SavedDBlen;
+ static bool DB_Saved = false;
+
+ if (saveOpt==1) { //save
+
+ memcpy(SavedDB, DemodBuffer, sizeof(DemodBuffer));
+ SavedDBlen = DemodBufferLen;
+ DB_Saved=true;
+ } else if (DB_Saved) { //restore
+ memcpy(DemodBuffer, SavedDB, sizeof(DemodBuffer));
+ DemodBufferLen = SavedDBlen;
+ }
+ return;
+}
+
int CmdSetDebugMode(const char *Cmd)
{
int demod=0;
bool st = false;
size_t ststart = 0, stend = 0;
if (*stCheck) st = DetectST_ext(BitStream, &BitLen, &foundclk, &ststart, &stend);
+ *stCheck = st;
if (st) {
- *stCheck = st;
clk = (clk == 0) ? foundclk : clk;
CursorCPos = ststart;
CursorDPos = stend;
if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator - First one is shown by orange and blue graph markers");
+ //Graph ST trim (for testing)
+ //for (int i = 0; i < BitLen; i++) {
+ // GraphBuffer[i] = BitStream[i]-128;
+ //}
+ //RepaintGraphWindow();
}
int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askamp, askType);
if (errCnt<0 || BitLen<16){ //if fatal error (or -1)
return 0;
}
if (DemodBufferLen==0) return 0;
- uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+ uint8_t BitStream[MAX_DEMOD_BUF_LEN]={0};
int high=0,low=0;
for (;i<DemodBufferLen;++i){
if (DemodBuffer[i]>high) high=DemodBuffer[i];
return 0;
}
sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
- if (DemodBufferLen==0){
+ if (DemodBufferLen==0) {
PrintAndLog("DemodBuffer Empty - run 'data rawdemod ar' first");
return 0;
}
- uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
- memcpy(BitStream, DemodBuffer, DemodBufferLen);
- size = DemodBufferLen;
+ uint8_t BitStream[MAX_DEMOD_BUF_LEN]={0};
+ size = sizeof(BitStream);
+ if ( !getDemodBuf(BitStream, &size) ) return 0;
errCnt=BiphaseRawDecode(BitStream, &size, offset, invert);
if (errCnt<0){
PrintAndLog("Error during decode:%d", errCnt);
int offset=0, clk=0, invert=0, maxErr=0;
sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
- uint8_t BitStream[MAX_DEMOD_BUF_LEN];
+ uint8_t BitStream[MAX_GRAPH_TRACE_LEN];
size_t size = getFromGraphBuf(BitStream);
//invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer
int errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0);
return ASKbiphaseDemod(Cmd, true);
}
-//could be split to a gProxII file
-//by marshmellow
-//attempts to demodulate and identify a G_Prox_II verex/chubb card
-//WARNING: if it fails during some points it will destroy the DemodBuffer data
-// but will leave the GraphBuffer intact.
-//if successful it will push askraw data back to demod buffer ready for emulation
-int CmdG_Prox_II_Demod(const char *Cmd)
-{
- if (!ASKbiphaseDemod(Cmd, false)){
- if (g_debugMode) PrintAndLog("Error gProxII: ASKbiphaseDemod failed 1st try");
- return 0;
- }
- size_t size = DemodBufferLen;
- //call lfdemod.c demod for gProxII
- int ans = gProxII_Demod(DemodBuffer, &size);
- if (ans < 0){
- if (g_debugMode) PrintAndLog("Error gProxII_Demod");
- return 0;
- }
- //got a good demod of 96 bits
- uint8_t ByteStream[8] = {0x00};
- uint8_t xorKey=0;
- size_t startIdx = ans + 6; //start after 6 bit preamble
-
- uint8_t bits_no_spacer[90];
- //so as to not mess with raw DemodBuffer copy to a new sample array
- memcpy(bits_no_spacer, DemodBuffer + startIdx, 90);
- // remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72))
- size_t bitLen = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
- if (bitLen != 72) {
- if (g_debugMode) PrintAndLog("Error gProxII: spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx);
- return 0;
- }
- // get key and then get all 8 bytes of payload decoded
- xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
- for (size_t idx = 0; idx < 8; idx++) {
- ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey;
- if (g_debugMode) PrintAndLog("byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
- }
- //now ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
- //
- uint8_t fmtLen = ByteStream[0]>>2;
- uint32_t FC = 0;
- uint32_t Card = 0;
- //get raw 96 bits to print
- uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans,32);
- uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);
- uint32_t raw3 = bytebits_to_byte(DemodBuffer+ans+64, 32);
-
- if (fmtLen==36){
- FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
- Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
- PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
- } else if(fmtLen==26){
- FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
- Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
- PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
- } else {
- PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",(int)fmtLen);
- PrintAndLog("Decoded Raw: %s", sprint_hex(ByteStream, 8));
- }
- PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3);
- setDemodBuf(DemodBuffer+ans, 96, 0);
- return 1;
-}
-
//by marshmellow - see ASKDemod
int Cmdaskrawdemod(const char *Cmd)
{
return FSKrawDemod(Cmd, true);
}
-//by marshmellow
-//Paradox Prox demod - FSK RF/50 with preamble of 00001111 (then manchester encoded)
-//print full Paradox Prox ID and some bit format details if found
-int CmdFSKdemodParadox(const char *Cmd)
-{
- //raw fsk demod no manchester decoding no start bit finding just get binary from wave
- uint32_t hi2=0, hi=0, lo=0;
-
- uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
- size_t BitLen = getFromGraphBuf(BitStream);
- if (BitLen==0) return 0;
- //get binary from fsk wave
- int idx = ParadoxdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo);
- if (idx<0){
- if (g_debugMode){
- if (idx==-1){
- PrintAndLog("DEBUG: Just Noise Detected");
- } else if (idx == -2) {
- PrintAndLog("DEBUG: Error demoding fsk");
- } else if (idx == -3) {
- PrintAndLog("DEBUG: Preamble not found");
- } else if (idx == -4) {
- PrintAndLog("DEBUG: Error in Manchester data");
- } else {
- PrintAndLog("DEBUG: Error demoding fsk %d", idx);
- }
- }
- return 0;
- }
- if (hi2==0 && hi==0 && lo==0){
- if (g_debugMode) PrintAndLog("DEBUG: Error - no value found");
- return 0;
- }
- uint32_t fc = ((hi & 0x3)<<6) | (lo>>26);
- uint32_t cardnum = (lo>>10)&0xFFFF;
- uint32_t rawLo = bytebits_to_byte(BitStream+idx+64,32);
- uint32_t rawHi = bytebits_to_byte(BitStream+idx+32,32);
- uint32_t rawHi2 = bytebits_to_byte(BitStream+idx,32);
-
- PrintAndLog("Paradox TAG ID: %x%08x - FC: %d - Card: %d - Checksum: %02x - RAW: %08x%08x%08x",
- hi>>10, (hi & 0x3)<<26 | (lo>>10), fc, cardnum, (lo>>2) & 0xFF, rawHi2, rawHi, rawLo);
- setDemodBuf(BitStream,BitLen,idx);
- if (g_debugMode){
- PrintAndLog("DEBUG: idx: %d, len: %d, Printing Demod Buffer:", idx, BitLen);
- printDemodBuff();
- }
- return 1;
-}
-
-// 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) or http://cms.abvma.ca/uploads/ManufacturersISOsandCountryCodes.pdf
-// FLAG (animal/non-animal)
-/*
-38 IDbits
-10 country code
-1 extra app bit
-14 reserved bits
-1 animal bit
-16 ccitt CRC chksum over 64bit ID CODE.
-24 appli bits.
-
--- sample: 985121004515220 [ 37FF65B88EF94 ]
-*/
-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, maxErr, 0, 0);
- if ( errCnt < 0 || errCnt > maxErr ) {
- if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk);
- return 0;
- }
-
- errCnt = BiphaseRawDecode(BitStream, &size, maxErr, 1);
- if (errCnt < 0 || errCnt > maxErr ) {
- if (g_debugMode) PrintAndLog("Error BiphaseRawDecode: %d", errCnt);
- return 0;
- }
-
- int preambleIndex = FDXBdemodBI(BitStream, &size);
- if (preambleIndex < 0){
- if (g_debugMode) PrintAndLog("Error FDXBDemod , no startmarker found :: %d",preambleIndex);
- return 0;
- }
- if (size != 128) {
- if (g_debugMode) PrintAndLog("Error incorrect data length found");
- return 0;
- }
-
- setDemodBuf(BitStream, 128, preambleIndex);
-
- // remove marker bits (1's every 9th digit after preamble) (pType = 2)
- size = removeParity(BitStream, preambleIndex + 11, 9, 2, 117);
- if ( size != 104 ) {
- if (g_debugMode) PrintAndLog("Error removeParity:: %d", size);
- return 0;
- }
- 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("Start marker %d; Size %d", preambleIndex, size);
-
- //got a good demod
- 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];
- uint32_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) | bytebits_to_byte(BitStream+32,32);
- uint8_t raw[8];
- num_to_bytes(rawid, 8, raw);
-
- if (g_debugMode) PrintAndLog("Raw ID Hex: %s", sprint_hex(raw,8));
-
- uint16_t calcCrc = crc16_ccitt_kermit(raw, 8);
- PrintAndLog("Animal ID: %04u-%012" PRIu64, countryCode, NationalCode);
- PrintAndLog("National Code: %012" PRIu64, NationalCode);
- PrintAndLog("CountryCode: %04u", countryCode);
- PrintAndLog("Extended Data: %s", dataBlockBit ? "True" : "False");
- PrintAndLog("reserved Code: %u", reservedCode);
- PrintAndLog("Animal Tag: %s", animalBit ? "True" : "False");
- PrintAndLog("CRC: 0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? "Passed" : "Failed");
- PrintAndLog("Extended: 0x%X\n", extended);
-
- return 1;
-}
-
-
//by marshmellow
//attempt to psk1 demod graph buffer
int PSKDemod(const char *Cmd, bool verbose)
uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
size_t BitLen = getFromGraphBuf(BitStream);
if (BitLen==0) return 0;
- uint8_t carrier=countFC(BitStream, BitLen, 0);
- if (carrier!=2 && carrier!=4 && carrier!=8){
- //invalid carrier
- return 0;
- }
- if (g_debugMode){
- PrintAndLog("Carrier: rf/%d",carrier);
- }
int errCnt=0;
errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);
if (errCnt > maxErr){
return 1;
}
-int CmdPSKNexWatch(const char *Cmd)
-{
- if (!PSKDemod("", false)) return 0;
- uint8_t preamble[28] = {0,0,0,0,0,1,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
- size_t startIdx = 0, size = DemodBufferLen;
- bool invert = false;
- if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx)){
- // if didn't find preamble try again inverting
- if (!PSKDemod("1", false)) return 0;
- size = DemodBufferLen;
- if (!preambleSearch(DemodBuffer, preamble, sizeof(preamble), &size, &startIdx)) return 0;
- invert = true;
- }
- if (size != 128) return 0;
- setDemodBuf(DemodBuffer, size, startIdx+4);
- startIdx = 8+32; //4 = extra i added, 8 = preamble, 32 = reserved bits (always 0)
- //get ID
- uint32_t ID = 0;
- for (uint8_t wordIdx=0; wordIdx<4; wordIdx++){
- for (uint8_t idx=0; idx<8; idx++){
- ID = (ID << 1) | DemodBuffer[startIdx+wordIdx+(idx*4)];
- }
- }
- //parity check (TBD)
-
- //checksum check (TBD)
-
- //output
- PrintAndLog("NexWatch ID: %d", ID);
- if (invert){
- PrintAndLog("Had to Invert - probably NexKey");
- for (uint8_t idx=0; idx<size; idx++)
- DemodBuffer[idx] ^= 1;
- }
-
- CmdPrintDemodBuff("x");
- return 1;
-}
-
// by marshmellow
// takes 3 arguments - clock, invert, maxErr as integers
// attempts to demodulate nrz only
return val;
}
-int getSamples(const char *Cmd, bool silent)
+int getSamples(int n, bool silent)
{
//If we get all but the last byte in bigbuf,
// we don't have to worry about remaining trash
uint8_t got[BIGBUF_SIZE-1] = { 0 };
- int n = strtol(Cmd, NULL, 0);
-
if (n == 0 || n > sizeof(got))
n = sizeof(got);
- PrintAndLog("Reading %d bytes from device memory\n", n);
+ if (!silent) PrintAndLog("Reading %d bytes from device memory\n", n);
GetFromBigBuf(got,n,0);
- PrintAndLog("Data fetched");
+ if (!silent) PrintAndLog("Data fetched");
UsbCommand response;
WaitForResponse(CMD_ACK, &response);
uint8_t bits_per_sample = 8;
}
if(bits_per_sample < 8)
{
- PrintAndLog("Unpacking...");
+ if (!silent) PrintAndLog("Unpacking...");
BitstreamIn bout = { got, bits_per_sample * n, 0};
int j =0;
for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {
int CmdSamples(const char *Cmd)
{
- return getSamples(Cmd, false);
+ int n = strtol(Cmd, NULL, 0);
+ return getSamples(n, false);
}
int CmdTuneSamples(const char *Cmd)
if (start > GraphTraceLen || stop > GraphTraceLen || start > stop) return 0;
start++; //leave start position sample
- GraphTraceLen -= stop - start;
+ GraphTraceLen = stop - start;
for (int i = 0; i < GraphTraceLen; i++) {
- GraphBuffer[start+i] = GraphBuffer[stop+i];
+ GraphBuffer[i] = GraphBuffer[start+i];
}
return 0;
}
{
{"help", CmdHelp, 1, "This help"},
{"askedgedetect", CmdAskEdgeDetect, 1, "[threshold] Adjust Graph for manual ask demod using the length of sample differences to detect the edge of a wave (use 20-45, def:25)"},
- {"askgproxiidemod", CmdG_Prox_II_Demod, 1, "Demodulate a G Prox II tag from GraphBuffer"},
{"autocorr", CmdAutoCorr, 1, "[window length] [g] -- Autocorrelation over window - g to save back to GraphBuffer (overwrite)"},
{"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
{"bin2hex", Cmdbin2hex, 1, "bin2hex <digits> -- Converts binary to hexadecimal"},
{"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"},
//{"fskfcdetect", CmdFSKfcDetect, 1, "Try to detect the Field Clock of an FSK wave"},
- {"fskparadoxdemod", CmdFSKdemodParadox, 1, "Demodulate a Paradox FSK tag from GraphBuffer"},
{"getbitstream", CmdGetBitStream, 1, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"},
{"grid", CmdGrid, 1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
{"hexsamples", CmdHexsamples, 0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
{"norm", CmdNorm, 1, "Normalize max/min to +/-128"},
{"plot", CmdPlot, 1, "Show graph window (hit 'h' in window for keystroke help)"},
{"printdemodbuffer",CmdPrintDemodBuff, 1, "[x] [o] <offset> [l] <length> -- print the data in the DemodBuffer - 'x' for hex output"},
- {"psknexwatchdemod",CmdPSKNexWatch, 1, "Demodulate a NexWatch tag (nexkey, quadrakey) (PSK1) from GraphBuffer"},
{"rawdemod", CmdRawDemod, 1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},
{"samples", CmdSamples, 0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
{"save", CmdSave, 1, "<filename> -- Save trace (from graph window)"},
projects / proxmark3-svn / blobdiff