From: iceman1001 Date: Fri, 6 Mar 2015 08:02:15 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/3ac59c7fed24cc69e2c9f626e5e4392769779e13 Merge branch 'master' of https://github.com/Proxmark/proxmark3 Conflicts: armsrc/crapto1.c armsrc/iclass.c client/nonce2key/crapto1.c --- 3ac59c7fed24cc69e2c9f626e5e4392769779e13 diff --cc armsrc/Makefile index be4351d8,75ccdece..35742316 --- a/armsrc/Makefile +++ b/armsrc/Makefile @@@ -43,10 -43,8 +43,9 @@@ ARMSRC = fpgaloader.c legic_prng.c \ iclass.c \ BigBuf.c \ - cipher.c \ - cipherutils.c\ + optimized_cipher.c + # stdint.h provided locally until GCC 4.5 becomes C99 compliant APP_CFLAGS += -I. diff --cc armsrc/iclass.c index def6cc97,260e6a60..f62d45de --- a/armsrc/iclass.c +++ b/armsrc/iclass.c @@@ -45,11 -45,10 +45,11 @@@ // Needed for CRC in emulation mode; // same construction as in ISO 14443; // different initial value (CRC_ICLASS) -#include "iso14443crc.h" -#include "iso15693tools.h" +#include "../common/iso14443crc.h" +#include "../common/iso15693tools.h" +//#include "iso15693tools.h" - #include "cipher.h" #include "protocols.h" + #include "optimized_cipher.h" static int timeout = 4096; @@@ -1218,26 -1226,28 +1227,28 @@@ int doIClassSimulation( int simulationM memcpy(data_response, ToSend, ToSendMax); modulated_response = data_response; modulated_response_size = ToSendMax; + response_delay = 0;//We need to hurry here... + //exitLoop = true; }else { //Not fullsim, we don't respond - // We do not know what to answer, so lets keep quiet + // We do not know what to answer, so lets keep quiet modulated_response = resp_sof; modulated_response_size = 0; - trace_data = NULL; - trace_data_size = 0; + trace_data = NULL; + trace_data_size = 0; if (simulationMode == MODE_EXIT_AFTER_MAC){ - // dbprintf:ing ... - Dbprintf("CSN: %02x %02x %02x %02x %02x %02x %02x %02x" - ,csn[0],csn[1],csn[2],csn[3],csn[4],csn[5],csn[6],csn[7]); - Dbprintf("RDR: (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x",len, - receivedCmd[0], receivedCmd[1], receivedCmd[2], - receivedCmd[3], receivedCmd[4], receivedCmd[5], - receivedCmd[6], receivedCmd[7], receivedCmd[8]); - if (reader_mac_buf != NULL) - { - memcpy(reader_mac_buf,receivedCmd+1,8); - } - exitLoop = true; + // dbprintf:ing ... + Dbprintf("CSN: %02x %02x %02x %02x %02x %02x %02x %02x" + ,csn[0],csn[1],csn[2],csn[3],csn[4],csn[5],csn[6],csn[7]); + Dbprintf("RDR: (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x",len, + receivedCmd[0], receivedCmd[1], receivedCmd[2], + receivedCmd[3], receivedCmd[4], receivedCmd[5], + receivedCmd[6], receivedCmd[7], receivedCmd[8]); + if (reader_mac_buf != NULL) + { + memcpy(reader_mac_buf,receivedCmd+1,8); } + exitLoop = true; + } } } else if(receivedCmd[0] == ICLASS_CMD_HALT && len == 1) { diff --cc armsrc/mifarecmd.c index a16cbf16,a16cbf16..94bc1c1c --- a/armsrc/mifarecmd.c +++ b/armsrc/mifarecmd.c @@@ -942,12 -942,12 +942,12 @@@ void MifareCSetBlock(uint32_t arg0, uin if (workFlags & 0x01) { if(!iso14443a_select_card(uid, NULL, &cuid)) { if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card"); -- break; ++ //break; }; if(mifare_classic_halt(NULL, cuid)) { if (MF_DBGLEVEL >= 1) Dbprintf("Halt error"); -- break; ++ //break; }; }; diff --cc client/cmddata.c index cfccc5b3,7b666c26..8b29dc9c --- a/client/cmddata.c +++ b/client/cmddata.c @@@ -227,7 -221,7 +227,7 @@@ void printBitStream(uint8_t BitStream[] return; } //by marshmellow --//print EM410x ID in multiple formats ++//print 64 bit EM410x ID in multiple formats void printEM410x(uint64_t id) { if (id !=0){ @@@ -317,36 -311,36 +317,19 @@@ int CmdAskEM410xDemod(const char *Cmd printDemodBuff(); } PrintAndLog("EM410x pattern found: "); ++ if (BitLen > 64) PrintAndLog("\nWarning! Length not what is expected - Length: %d bits\n",BitLen); printEM410x(lo); return 1; } return 0; } --//by marshmellow --//takes 3 arguments - clock, invert, maxErr as integers --//attempts to demodulate ask while decoding manchester --//prints binary found and saves in graphbuffer for further commands --int Cmdaskmandemod(const char *Cmd) ++int ASKmanDemod(const char *Cmd, bool verbose, bool emSearch) { int invert=0; int clk=0; int maxErr=100; -- char cmdp = param_getchar(Cmd, 0); -- if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') { -- PrintAndLog("Usage: data rawdemod am [clock] <0|1> [maxError]"); -- PrintAndLog(" [set clock as integer] optional, if not set, autodetect."); -- PrintAndLog(" , 1 for invert output"); -- PrintAndLog(" [set maximum allowed errors], default = 100."); -- PrintAndLog(""); -- PrintAndLog(" sample: data rawdemod am = demod an ask/manchester tag from GraphBuffer"); -- PrintAndLog(" : data rawdemod am 32 = demod an ask/manchester tag from GraphBuffer using a clock of RF/32"); -- PrintAndLog(" : data rawdemod am 32 1 = demod an ask/manchester tag from GraphBuffer using a clock of RF/32 and inverting data"); -- PrintAndLog(" : data rawdemod am 1 = demod an ask/manchester tag from GraphBuffer while inverting data"); -- PrintAndLog(" : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors"); -- -- return 0; -- } ++ uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr); if (invert != 0 && invert != 1) { @@@ -366,33 -360,33 +349,58 @@@ if (g_debugMode==1) PrintAndLog("no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk); return 0; } -- PrintAndLog("\nUsing Clock: %d - Invert: %d - Bits Found: %d",clk,invert,BitLen); ++ if (verbose) PrintAndLog("\nUsing Clock: %d - Invert: %d - Bits Found: %d",clk,invert,BitLen); //output if (errCnt>0){ -- PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt); ++ if (verbose) PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt); } -- PrintAndLog("ASK/Manchester decoded bitstream:"); ++ if (verbose) PrintAndLog("ASK/Manchester decoded bitstream:"); // Now output the bitstream to the scrollback by line of 16 bits setDemodBuf(BitStream,BitLen,0); -- printDemodBuff(); ++ if (verbose) printDemodBuff(); uint64_t lo =0; size_t idx=0; -- lo = Em410xDecode(BitStream, &BitLen, &idx); -- if (lo>0){ -- //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 (emSearch){ ++ lo = Em410xDecode(BitStream, &BitLen, &idx); ++ if (lo>0){ ++ //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: "); ++ if (verbose) printEM410x(lo); ++ return 1; } -- PrintAndLog("EM410x pattern found: "); -- printEM410x(lo); -- return 1; } return 1; } ++//by marshmellow ++//takes 3 arguments - clock, invert, maxErr as integers ++//attempts to demodulate ask while decoding manchester ++//prints binary found and saves in graphbuffer for further commands ++int Cmdaskmandemod(const char *Cmd) ++{ ++ char cmdp = param_getchar(Cmd, 0); ++ if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') { ++ PrintAndLog("Usage: data rawdemod am [clock] <0|1> [maxError]"); ++ PrintAndLog(" [set clock as integer] optional, if not set, autodetect."); ++ PrintAndLog(" , 1 for invert output"); ++ PrintAndLog(" [set maximum allowed errors], default = 100."); ++ PrintAndLog(""); ++ PrintAndLog(" sample: data rawdemod am = demod an ask/manchester tag from GraphBuffer"); ++ PrintAndLog(" : data rawdemod am 32 = demod an ask/manchester tag from GraphBuffer using a clock of RF/32"); ++ PrintAndLog(" : data rawdemod am 32 1 = demod an ask/manchester tag from GraphBuffer using a clock of RF/32 and inverting data"); ++ PrintAndLog(" : data rawdemod am 1 = demod an ask/manchester tag from GraphBuffer while inverting data"); ++ PrintAndLog(" : data rawdemod am 64 1 0 = demod an ask/manchester tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors"); ++ return 0; ++ } ++ return ASKmanDemod(Cmd, TRUE, TRUE); ++} ++ //by marshmellow //manchester decode //stricktly take 10 and 01 and convert to 0 and 1 @@@ -505,34 -499,34 +513,17 @@@ int CmdBiphaseDecodeRaw(const char *Cmd //takes 4 arguments - clock, invert, maxErr as integers and amplify as char //attempts to demodulate ask only //prints binary found and saves in graphbuffer for further commands --int Cmdaskrawdemod(const char *Cmd) ++int ASKrawDemod(const char *Cmd, bool verbose) { int invert=0; int clk=0; int maxErr=100; uint8_t askAmp = 0; char amp = param_getchar(Cmd, 0); -- char cmdp = param_getchar(Cmd, 0); -- if (strlen(Cmd) > 12 || cmdp == 'h' || cmdp == 'H') { -- PrintAndLog("Usage: data rawdemod ar [clock] [maxError] [amplify]"); -- PrintAndLog(" [set clock as integer] optional, if not set, autodetect"); -- PrintAndLog(" , 1 to invert output"); -- PrintAndLog(" [set maximum allowed errors], default = 100"); -- PrintAndLog(" , 'a' to attempt demod with ask amplification, default = no amp"); -- PrintAndLog(""); -- PrintAndLog(" sample: data rawdemod ar = demod an ask tag from GraphBuffer"); -- PrintAndLog(" : data rawdemod ar a = demod an ask tag from GraphBuffer, amplified"); -- PrintAndLog(" : data rawdemod ar 32 = demod an ask tag from GraphBuffer using a clock of RF/32"); -- PrintAndLog(" : data rawdemod ar 32 1 = demod an ask tag from GraphBuffer using a clock of RF/32 and inverting data"); -- PrintAndLog(" : data rawdemod ar 1 = demod an ask tag from GraphBuffer while inverting data"); -- PrintAndLog(" : data rawdemod ar 64 1 0 = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors"); -- PrintAndLog(" : data rawdemod ar 64 1 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp"); -- return 0; -- } uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; sscanf(Cmd, "%i %i %i %c", &clk, &invert, &maxErr, &); if (invert != 0 && invert != 1) { -- PrintAndLog("Invalid argument: %s", Cmd); ++ if (verbose) PrintAndLog("Invalid argument: %s", Cmd); return 0; } if (clk==1){ @@@ -545,26 -539,26 +536,50 @@@ int errCnt=0; errCnt = askrawdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp); if (errCnt==-1||BitLen<16){ //throw away static - allow 1 and -1 (in case of threshold command first) -- PrintAndLog("no data found"); -- if (g_debugMode==1) PrintAndLog("errCnt: %d, BitLen: %d, clk: %d, invert: %d", errCnt, BitLen, clk, invert); ++ if (verbose) PrintAndLog("no data found"); ++ if (g_debugMode==1 && verbose) PrintAndLog("errCnt: %d, BitLen: %d, clk: %d, invert: %d", errCnt, BitLen, clk, invert); return 0; } -- PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d", clk, invert, BitLen); ++ if (verbose) PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d", clk, invert, BitLen); //move BitStream back to DemodBuffer setDemodBuf(BitStream,BitLen,0); //output -- if (errCnt>0){ ++ if (errCnt>0 && verbose){ PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d", errCnt); } -- PrintAndLog("ASK demoded bitstream:"); -- // Now output the bitstream to the scrollback by line of 16 bits -- printBitStream(BitStream,BitLen); -- ++ if (verbose){ ++ PrintAndLog("ASK demoded bitstream:"); ++ // Now output the bitstream to the scrollback by line of 16 bits ++ printBitStream(BitStream,BitLen); ++ } return 1; } ++//by marshmellow - see ASKrawDemod ++int Cmdaskrawdemod(const char *Cmd) ++{ ++ char cmdp = param_getchar(Cmd, 0); ++ if (strlen(Cmd) > 12 || cmdp == 'h' || cmdp == 'H') { ++ PrintAndLog("Usage: data rawdemod ar [clock] [maxError] [amplify]"); ++ PrintAndLog(" [set clock as integer] optional, if not set, autodetect"); ++ PrintAndLog(" , 1 to invert output"); ++ PrintAndLog(" [set maximum allowed errors], default = 100"); ++ PrintAndLog(" , 'a' to attempt demod with ask amplification, default = no amp"); ++ PrintAndLog(""); ++ PrintAndLog(" sample: data rawdemod ar = demod an ask tag from GraphBuffer"); ++ PrintAndLog(" : data rawdemod ar a = demod an ask tag from GraphBuffer, amplified"); ++ PrintAndLog(" : data rawdemod ar 32 = demod an ask tag from GraphBuffer using a clock of RF/32"); ++ PrintAndLog(" : data rawdemod ar 32 1 = demod an ask tag from GraphBuffer using a clock of RF/32 and inverting data"); ++ PrintAndLog(" : data rawdemod ar 1 = demod an ask tag from GraphBuffer while inverting data"); ++ PrintAndLog(" : data rawdemod ar 64 1 0 = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors"); ++ PrintAndLog(" : data rawdemod ar 64 1 0 a = demod an ask tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors, and amp"); ++ return 0; ++ } ++ return ASKrawDemod(Cmd, TRUE); ++} ++ int CmdAutoCorr(const char *Cmd) { static int CorrelBuffer[MAX_GRAPH_TRACE_LEN]; @@@ -820,7 -814,7 +835,7 @@@ int CmdDetectClockRate(const char *Cmd //fsk raw demod and print binary //takes 4 arguments - Clock, invert, fchigh, fclow //defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a)) --int CmdFSKrawdemod(const char *Cmd) ++int FSKrawDemod(const char *Cmd, bool verbose) { //raw fsk demod no manchester decoding no start bit finding just get binary from wave //set defaults @@@ -828,23 -822,23 +843,7 @@@ int invert=0; int fchigh=0; int fclow=0; -- char cmdp = param_getchar(Cmd, 0); -- if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') { -- PrintAndLog("Usage: data rawdemod fs [clock] [fchigh] [fclow]"); -- PrintAndLog(" [set clock as integer] optional, omit for autodetect."); -- PrintAndLog(" , 1 for invert output, can be used even if the clock is omitted"); -- PrintAndLog(" [fchigh], larger field clock length, omit for autodetect"); -- PrintAndLog(" [fclow], small field clock length, omit for autodetect"); -- PrintAndLog(""); -- PrintAndLog(" sample: data rawdemod fs = demod an fsk tag from GraphBuffer using autodetect"); -- PrintAndLog(" : data rawdemod fs 32 = demod an fsk tag from GraphBuffer using a clock of RF/32, autodetect fc"); -- PrintAndLog(" : data rawdemod fs 1 = demod an fsk tag from GraphBuffer using autodetect, invert output"); -- PrintAndLog(" : data rawdemod fs 32 1 = demod an fsk tag from GraphBuffer using a clock of RF/32, invert output, autodetect fc"); -- PrintAndLog(" : data rawdemod fs 64 0 8 5 = demod an fsk1 RF/64 tag from GraphBuffer"); -- PrintAndLog(" : data rawdemod fs 50 0 10 8 = demod an fsk2 RF/50 tag from GraphBuffer"); -- PrintAndLog(" : data rawdemod fs 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer"); -- return 0; -- } ++ //set options from parameters entered with the command sscanf(Cmd, "%i %i %i %i", &rfLen, &invert, &fchigh, &fclow); @@@ -876,22 -870,22 +875,50 @@@ rfLen = detectFSKClk(BitStream, BitLen, fchigh, fclow); if (rfLen == 0) rfLen = 50; } -- PrintAndLog("Args invert: %d - Clock:%d - fchigh:%d - fclow: %d",invert,rfLen,fchigh, fclow); ++ if (verbose) PrintAndLog("Args invert: %d - Clock:%d - fchigh:%d - fclow: %d",invert,rfLen,fchigh, fclow); int size = fskdemod(BitStream,BitLen,(uint8_t)rfLen,(uint8_t)invert,(uint8_t)fchigh,(uint8_t)fclow); if (size>0){ -- PrintAndLog("FSK decoded bitstream:"); setDemodBuf(BitStream,size,0); // Now output the bitstream to the scrollback by line of 16 bits if(size > (8*32)+2) size = (8*32)+2; //only output a max of 8 blocks of 32 bits most tags will have full bit stream inside that sample size ++ if (verbose) { ++ PrintAndLog("FSK decoded bitstream:"); printBitStream(BitStream,size); ++ } return 1; } else{ -- PrintAndLog("no FSK data found"); ++ if (verbose) PrintAndLog("no FSK data found"); } return 0; } ++//by marshmellow ++//fsk raw demod and print binary ++//takes 4 arguments - Clock, invert, fchigh, fclow ++//defaults: clock = 50, invert=1, fchigh=10, fclow=8 (RF/10 RF/8 (fsk2a)) ++int CmdFSKrawdemod(const char *Cmd) ++{ ++ char cmdp = param_getchar(Cmd, 0); ++ if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') { ++ PrintAndLog("Usage: data rawdemod fs [clock] [fchigh] [fclow]"); ++ PrintAndLog(" [set clock as integer] optional, omit for autodetect."); ++ PrintAndLog(" , 1 for invert output, can be used even if the clock is omitted"); ++ PrintAndLog(" [fchigh], larger field clock length, omit for autodetect"); ++ PrintAndLog(" [fclow], small field clock length, omit for autodetect"); ++ PrintAndLog(""); ++ PrintAndLog(" sample: data rawdemod fs = demod an fsk tag from GraphBuffer using autodetect"); ++ PrintAndLog(" : data rawdemod fs 32 = demod an fsk tag from GraphBuffer using a clock of RF/32, autodetect fc"); ++ PrintAndLog(" : data rawdemod fs 1 = demod an fsk tag from GraphBuffer using autodetect, invert output"); ++ PrintAndLog(" : data rawdemod fs 32 1 = demod an fsk tag from GraphBuffer using a clock of RF/32, invert output, autodetect fc"); ++ PrintAndLog(" : data rawdemod fs 64 0 8 5 = demod an fsk1 RF/64 tag from GraphBuffer"); ++ PrintAndLog(" : data rawdemod fs 50 0 10 8 = demod an fsk2 RF/50 tag from GraphBuffer"); ++ PrintAndLog(" : data rawdemod fs 50 1 10 8 = demod an fsk2a RF/50 tag from GraphBuffer"); ++ return 0; ++ } ++ return FSKrawDemod(Cmd, TRUE); ++} ++ //by marshmellow (based on existing demod + holiman's refactor) //HID Prox demod - FSK RF/50 with preamble of 00011101 (then manchester encoded) //print full HID Prox ID and some bit format details if found @@@ -1013,9 -1007,9 +1040,12 @@@ int CmdFSKdemodParadox(const char *Cmd } 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", -- hi>>10, (hi & 0x3)<<26 | (lo>>10), fc, cardnum, (lo>>2) & 0xFF ); ++ 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); @@@ -1185,16 -1179,16 +1215,16 @@@ int CmdFSKdemodAWID(const char *Cmd fc = bytebits_to_byte(BitStream+9, 8); cardnum = bytebits_to_byte(BitStream+17, 16); code1 = bytebits_to_byte(BitStream+8,fmtLen); -- PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo); ++ PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo); } else { cardnum = bytebits_to_byte(BitStream+8+(fmtLen-17), 16); if (fmtLen>32){ code1 = bytebits_to_byte(BitStream+8,fmtLen-32); code2 = bytebits_to_byte(BitStream+8+(fmtLen-32),32); -- PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x%08x, Raw: %x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo); ++ PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo); } else{ code1 = bytebits_to_byte(BitStream+8,fmtLen); -- PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo); ++ PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo); } } if (g_debugMode){ @@@ -1305,21 -1299,21 +1335,21 @@@ int CmdFSKdemodPyramid(const char *Cmd fc = bytebits_to_byte(BitStream+73, 8); cardnum = bytebits_to_byte(BitStream+81, 16); code1 = bytebits_to_byte(BitStream+72,fmtLen); -- PrintAndLog("Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %x%08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi3, rawHi2, rawHi, rawLo); ++ PrintAndLog("Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi3, rawHi2, rawHi, rawLo); } else if (fmtLen==45){ fmtLen=42; //end = 10 bits not 7 like 26 bit fmt fc = bytebits_to_byte(BitStream+53, 10); cardnum = bytebits_to_byte(BitStream+63, 32); -- PrintAndLog("Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo); ++ PrintAndLog("Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo); } else { cardnum = bytebits_to_byte(BitStream+81, 16); if (fmtLen>32){ //code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen-32); //code2 = bytebits_to_byte(BitStream+(size-32),32); -- PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo); ++ PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo); } else{ //code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen); -- PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo); ++ PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo); } } if (g_debugMode){ @@@ -1449,7 -1443,7 +1479,7 @@@ int CmdFSKdemod(const char *Cmd) //old //by marshmellow //attempt to psk1 demod graph buffer --int PSKDemod(const char *Cmd, uint8_t verbose) ++int PSKDemod(const char *Cmd, bool verbose) { int invert=0; int clk=0; @@@ -1460,7 -1454,7 +1490,7 @@@ clk=0; } if (invert != 0 && invert != 1) { -- PrintAndLog("Invalid argument: %s", Cmd); ++ if (verbose) PrintAndLog("Invalid argument: %s", Cmd); return -1; } uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; @@@ -1469,11 -1463,11 +1499,11 @@@ int errCnt=0; errCnt = pskRawDemod(BitStream, &BitLen,&clk,&invert); if (errCnt > maxErr){ -- if (g_debugMode==1) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); ++ if (g_debugMode==1 && verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); return -1; } if (errCnt<0|| BitLen<16){ //throw away static - allow 1 and -1 (in case of threshold command first) -- if (g_debugMode==1) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); ++ if (g_debugMode==1 && verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); return -1; } if (verbose) PrintAndLog("Tried PSK Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen); @@@ -1567,27 -1561,27 +1597,12 @@@ int CmdIndalaDecode(const char *Cmd // takes 3 arguments - clock, invert, maxErr as integers // attempts to demodulate nrz only // prints binary found and saves in demodbuffer for further commands --int CmdNRZrawDemod(const char *Cmd) ++ ++int NRZrawDemod(const char *Cmd, bool verbose) { int invert=0; int clk=0; int maxErr=100; -- char cmdp = param_getchar(Cmd, 0); -- if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') { -- PrintAndLog("Usage: data rawdemod nr [clock] <0|1> [maxError]"); -- PrintAndLog(" [set clock as integer] optional, if not set, autodetect."); -- PrintAndLog(" , 1 for invert output"); -- PrintAndLog(" [set maximum allowed errors], default = 100."); -- PrintAndLog(""); -- PrintAndLog(" sample: data nrzrawdemod = demod a nrz/direct tag from GraphBuffer"); -- PrintAndLog(" : data nrzrawdemod 32 = demod a nrz/direct tag from GraphBuffer using a clock of RF/32"); -- PrintAndLog(" : data nrzrawdemod 32 1 = demod a nrz/direct tag from GraphBuffer using a clock of RF/32 and inverting data"); -- PrintAndLog(" : data nrzrawdemod 1 = demod a nrz/direct tag from GraphBuffer while inverting data"); -- PrintAndLog(" : data nrzrawdemod 64 1 0 = demod a nrz/direct tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors"); -- -- return 0; -- } -- sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr); if (clk==1){ invert=1; @@@ -1603,27 -1597,27 +1618,48 @@@ int errCnt=0; errCnt = nrzRawDemod(BitStream, &BitLen, &clk, &invert, maxErr); if (errCnt > maxErr){ -- if (g_debugMode==1) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); ++ if (g_debugMode==1 && verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); return 0; } if (errCnt<0|| BitLen<16){ //throw away static - allow 1 and -1 (in case of threshold command first) -- if (g_debugMode==1) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); ++ if (g_debugMode==1 && verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); return 0; } -- PrintAndLog("Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen); ++ if (verbose) ++ PrintAndLog("Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen); //prime demod buffer for output setDemodBuf(BitStream,BitLen,0); -- if (errCnt>0){ ++ if (errCnt>0 && verbose){ PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt); -- }else{ } ++ if (verbose) { PrintAndLog("NRZ demoded bitstream:"); // Now output the bitstream to the scrollback by line of 16 bits printDemodBuff(); ++ } return 1; } ++int CmdNRZrawDemod(const char *Cmd) ++{ ++ char cmdp = param_getchar(Cmd, 0); ++ if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') { ++ PrintAndLog("Usage: data rawdemod nr [clock] <0|1> [maxError]"); ++ PrintAndLog(" [set clock as integer] optional, if not set, autodetect."); ++ PrintAndLog(" , 1 for invert output"); ++ PrintAndLog(" [set maximum allowed errors], default = 100."); ++ PrintAndLog(""); ++ PrintAndLog(" sample: data nrzrawdemod = demod a nrz/direct tag from GraphBuffer"); ++ PrintAndLog(" : data nrzrawdemod 32 = demod a nrz/direct tag from GraphBuffer using a clock of RF/32"); ++ PrintAndLog(" : data nrzrawdemod 32 1 = demod a nrz/direct tag from GraphBuffer using a clock of RF/32 and inverting data"); ++ PrintAndLog(" : data nrzrawdemod 1 = demod a nrz/direct tag from GraphBuffer while inverting data"); ++ PrintAndLog(" : data nrzrawdemod 64 1 0 = demod a nrz/direct tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors"); ++ return 0; ++ } ++ return NRZrawDemod(Cmd, TRUE); ++} ++ // by marshmellow // takes 3 arguments - clock, invert, maxErr as integers // attempts to demodulate psk only @@@ -1645,7 -1639,7 +1681,7 @@@ int CmdPSK1rawDemod(const char *Cmd PrintAndLog(" : data psk1rawdemod 64 1 0 = demod a psk1 tag from GraphBuffer using a clock of RF/64, inverting data and allowing 0 demod errors"); return 0; } -- errCnt = PSKDemod(Cmd, 1); ++ errCnt = PSKDemod(Cmd, TRUE); //output if (errCnt<0){ if (g_debugMode) PrintAndLog("Error demoding: %d",errCnt); @@@ -1653,7 -1647,7 +1689,6 @@@ } if (errCnt>0){ PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt); -- }else{ } PrintAndLog("PSK demoded bitstream:"); // Now output the bitstream to the scrollback by line of 16 bits diff --cc client/cmddata.h index dada6e58,c1a7ecae..c7dbf297 --- a/client/cmddata.h +++ b/client/cmddata.h @@@ -14,9 -14,7 +14,9 @@@ command_t * CmdDataCommands(); int CmdData(const char *Cmd); +void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx); void printDemodBuff(); - void printBitStream(uint8_t BitStream[], uint32_t bitLen); ++ int CmdAmp(const char *Cmd); int Cmdaskdemod(const char *Cmd); int CmdAskEM410xDemod(const char *Cmd); @@@ -60,6 -58,6 +60,11 @@@ int CmdThreshold(const char *Cmd) int CmdDirectionalThreshold(const char *Cmd); int CmdZerocrossings(const char *Cmd); int CmdIndalaDecode(const char *Cmd); ++int ASKmanDemod(const char *Cmd, bool verbose, bool emSearch); ++int ASKrawDemod(const char *Cmd, bool verbose); ++int FSKrawDemod(const char *Cmd, bool verbose); ++int PSKDemod(const char *Cmd, bool verbose); ++int NRZrawDemod(const char *Cmd, bool verbose); #define MAX_DEMOD_BUF_LEN (1024*128) extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN]; diff --cc client/cmdhf15.c index c3ff7dd6,c3ff7dd6..1263329e --- a/client/cmdhf15.c +++ b/client/cmdhf15.c @@@ -668,9 -668,9 +668,9 @@@ int CmdHF15CmdRaw (const char *cmd) */ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdlen) { int temp; -- uint8_t *req=c->d.asBytes; ++ uint8_t *req = c->d.asBytes; uint8_t uid[8] = {0x00}; -- uint32_t reqlen=0; ++ uint32_t reqlen = 0; // strip while (**cmd==' ' || **cmd=='\t') (*cmd)++; @@@ -763,10 -763,10 +763,10 @@@ int CmdHF15CmdSysinfo(const char *Cmd) UsbCommand resp; uint8_t *recv; UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv? -- uint8_t *req=c.d.asBytes; -- int reqlen=0; ++ uint8_t *req = c.d.asBytes; ++ int reqlen = 0; char cmdbuf[100]; -- char *cmd=cmdbuf; ++ char *cmd = cmdbuf; char output[2048]=""; int i; @@@ -782,13 -782,13 +782,11 @@@ PrintAndLog(" s selected tag"); PrintAndLog(" u unaddressed mode"); PrintAndLog(" * scan for tag"); -- PrintAndLog(" start#: page number to start 0-255"); -- PrintAndLog(" count#: number of pages"); return 0; } prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15_CMD_SYSINFO},1); -- reqlen=c.arg[0]; ++ reqlen = c.arg[0]; reqlen=AddCrc(req,reqlen); c.arg[0]=reqlen; diff --cc client/cmdhfmf.c index 507e97fa,d0852ea5..3c9f2543 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@@ -1023,6 -1023,6 +1023,7 @@@ int CmdHF14AMf1kSim(const char *Cmd PrintAndLog(" x (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)"); PrintAndLog(""); PrintAndLog(" sample: hf mf sim u 0a0a0a0a "); ++ PrintAndLog(" : hf mf sim u 0a0a0a0a i x"); return 0; } uint8_t pnr = 0; diff --cc client/lualibs/mf_default_keys.lua index cca4699e,757112c6..810f0d6e --- a/client/lualibs/mf_default_keys.lua +++ b/client/lualibs/mf_default_keys.lua @@@ -158,22 -158,8 +158,8 @@@ local _keys = 'eff603e1efe9', '644672bd4afe', - 'b5ff67cba951', - } - - --[[ - Kiev metro cards - --]] - '8fe644038790', - 'f14ee7cae863', - '632193be1c3c', - '569369c5a0e5', - '9de89e070277', - 'eff603e1efe9', - '644672bd4afe', - 'b5ff67cba951', - } +} --- -- The keys above have just been pasted in, for completeness sake. They contain duplicates. diff --cc client/lualibs/utils.lua index 3015c419,c5baa406..f7749ca6 --- a/client/lualibs/utils.lua +++ b/client/lualibs/utils.lua @@@ -135,7 -135,7 +135,7 @@@ local Utils while IN>0 do I=I+1 IN , D = math.floor(IN/B), math.modf(IN,B)+1 -- OUT=string.sub(K,D,D)..OUT ++ OUT = string.sub(K,D,D)..OUT end return OUT end, @@@ -191,6 -191,6 +191,30 @@@ return table.concat(t) end, ++ Chars2num = function(s) ++ return (s:byte(1)*16777216)+(s:byte(2)*65536)+(s:byte(3)*256)+(s:byte(4)) ++ end, ++ ++ -- use length of string to determine 8,16,32,64 bits ++ bytes_to_int = function(str,endian,signed) ++ local t={str:byte(1,-1)} ++ if endian=="big" then --reverse bytes ++ local tt={} ++ for k=1,#t do ++ tt[#t-k+1]=t[k] ++ end ++ t=tt ++ end ++ local n=0 ++ for k=1,#t do ++ n=n+t[k]*2^((k-1)*8) ++ end ++ if signed then ++ n = (n > 2^(#t*8-1) -1) and (n - 2^(#t*8)) or n -- if last bit set, negative. ++ end ++ return n ++ end, ++ -- function convertStringToBytes(str) -- local bytes = {} -- local strLength = string.len(str) diff --cc client/nonce2key/crapto1.c index ca926a73,1015e27a..1d7441c7 --- a/client/nonce2key/crapto1.c +++ b/client/nonce2key/crapto1.c @@@ -147,9 -147,9 +147,9 @@@ extend_table(uint32_t *tbl, uint32_t ** *p ^= in; } else { // drop *p-- = *(*end)--; - } - } + } - + } + } @@@ -206,13 -206,13 +206,13 @@@ recover(uint32_t *o_head, uint32_t *o_t } bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket); - + for (int i = bucket_info.numbuckets - 1; i >= 0; i--) { sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks, - bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks, + bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks, rem, sl, in, bucket); } - + return sl; } /** lfsr_recovery