From: pwpiwi Date: Mon, 21 Oct 2019 19:25:44 +0000 (+0200) Subject: Merge pull request #862 from pwpiwi/fix_iclass_sim X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/b41be3cb11103739d2fa92ced09d1e29f8151b7b?ds=inline;hp=-c Merge pull request #862 from pwpiwi/fix_iclass_sim fix hf iclass sim: * sim 2: add responses to read(1) (Config) and read(5) (AIA) * sim 2/3: don't restrict CC to 00 bytes only * sim 3: add responding to read block commands * sim 2/3: add responding to READ_CHECK_KC * fix sizes of pre-encoded tag answers * sim 2: change default card challenge * remove commented code * use #defines instead of numerical constants for simulation modes * some reformatting and whitespace fixes * fix debug print on unhandled commands * deduplicate: use sim functions from iso15693.c * fix times in tracelog and 'hf list iclass' (sim only) * don't check parity in 'hf list iclass' * fix timing in TransmitTo15693Reader() * add simulation of block 3 and 4 (Kd and Kc) reads * add simulation of READ4 (4 blocks read) * FPGA change (hi_simulate.v): avoid spp_clk phase changes * chg to reader command decoder in iso15693.c (require no modulation before SOF) * add 'has_been_low_for' logic to hi_simulate.v (same as in other FPGA modes, default to "no modulation") * add simulation of chip status (IDLE, ACTIVE, SELECTED, HALTED) * check ACSN on SELECT * add simulation of RESELECT * always check length of reader commands * fix printing of NR, MAC in sim 2 mode * fix response length to CHECK command * implement UPDATE and CHECK[Kc] * add simulation of multiple pages (PAGESEL by @sherhannn9) * maintain cipher states per page * update cipher state after UPDATE commands (@sherhannn9) * add simulation of personalization mode * respond with SOF on HALT * display "\" instead of "0f" in 'hf list iclass' * standard LED handling * speedup CodeIso15693AsTag() * TransmitTo15693Tag(): don't send unmodulated start of SOF * reduce modulation depth in hi_simulate.v --- b41be3cb11103739d2fa92ced09d1e29f8151b7b