Commit Graph

  • 6116334485
    Merge pull request #969 from pwpiwi/gcc10_fixes master pwpiwi 2021-03-30 08:59:58 +02:00
  • cbecb8a209 gcc10 compiler fixes: - Check for availability of getenv_s() in argtable3.c pwpiwi 2021-03-18 08:25:16 +01:00
  • d3f8d76d6c Fix gcc10 compiler warnings - update argtable3 to latest versions pwpiwi 2021-01-29 09:33:19 +01:00
  • 8ac5d5cba1 Fix gcc10 compiler warnings - fix attribute format for MINGW in tinycbor/cbor.h - add pragma to prevent "unaligned pointer" warning in cmddata.c. We know what we are doing there. - whitespace fixes pwpiwi 2021-01-29 08:26:33 +01:00
  • ad326d84ad Fix gcc 10 link issues - avoid linker error by providing string.[ch] in bootrom pwpiwi 2021-01-28 09:00:08 +01:00
  • 555fa19773
    Cleanup armsrc/string.c and string.h (#964) pwpiwi 2021-01-25 09:27:38 +01:00
  • efd0327132
    Avoid link error due to duplicate definition of blocknr in hitag.c and hitagS.c (#963) pwpiwi 2021-01-25 09:26:27 +01:00
  • 622dd1af3b
    Merge pull request #938 from pwpiwi/fix_printf_scanf pwpiwi 2021-01-22 17:34:42 +01:00
  • e6158a48ec
    Update README.md Iceman 2020-07-29 17:33:56 +02:00
  • 4b27ca5cf6
    Merge pull request #943 from dgorbunov/patch-1 pwpiwi 2020-07-14 09:00:27 +02:00
  • 79d9ddc584
    Add string.h Daniel Gorbunov 2020-07-12 10:13:15 -04:00
  • 98a67bc908 Fix some printf/scanf format strings pwpiwi 2020-05-11 14:46:22 +02:00
  • ebf1404a81
    Merge pull request #926 from pwpiwi/fix_iso15693_fpga pwpiwi 2020-04-11 08:56:14 +02:00
  • c85805b8a2
    update CI/.travis.yml (#929) pwpiwi 2020-04-09 09:19:25 +02:00
  • 852ecedc16
    compatibility fix: get_clocktime() is not always available pwpiwi 2020-04-07 09:04:47 +02:00
  • 6792435739 fixing iso15693 * NOISE_THRESHOLD /= 2 (starting with c41dd5f it became a relative threshold) * remove superfluous reader initialization pwpiwi 2020-04-03 17:41:11 +02:00
  • f66d28afcc Merge branch 'master' into fix_iso15693_fpga pwpiwi 2020-03-31 08:55:35 +02:00
  • 7a53739728 fixing some fpga and iclass issues * make fpga_version_info.c phony and delete it on 'make clean' * wait for transfer to complete before returning from FpgaSendCommand() * log correct tag times in iclass simulation * shorten pulse from TC1 to TC0 in StartCountSspClk() * shorten ssp_frame pulse in fpga/hi_reader.v * some reformatting and whitespace fixes pwpiwi 2020-03-06 17:14:35 +01:00
  • 5bc3841ad1
    fix 'hf mf perso' result feedback (#920) pwpiwi 2020-03-16 13:33:19 +01:00
  • aa8ff592ae
    add a specific check function for static nonces (used in 'hf mf nested') (#911) pwpiwi 2020-03-16 13:32:00 +01:00
  • bedae7768c
    Merge pull request #913 from 0x2b3bfa0/patch-1 pwpiwi 2020-02-13 08:37:17 +01:00
  • 8f831ceb0b Fix #912 Helio Machado 2020-02-09 18:04:46 +01:00
  • d6e1d48284
    Merge pull request #910 from pwpiwi/small_USB_response pwpiwi 2020-02-06 21:49:15 +01:00
  • df7b80fecc fix WaitForResponse (without timeout) pwpiwi 2020-02-06 07:59:18 +01:00
  • 01aa068b6f reenable intermediate "Waiting for a response from the proxmark..." message pwpiwi 2020-02-04 08:21:17 +01:00
  • 3458bb279b replace msleep() by thread signalling in comms.c pwpiwi 2020-01-27 14:55:40 -05:00
  • d2ca5dbfe8 uart_posix.c rework * added some LED handling in appmain.c (helped with debugging) * finally replaced the infamous device unlink by msleep(1000) * fixed some format strings in comms.c (with -DCOMMS_DEBUG) * made uart_receive() and uart_send() behave as described in header * some formating pwpiwi 2020-01-27 13:28:34 -05:00
  • fd66752193 cleaning up uart_posix.c * whitespace fixes * sorting out #includes pwpiwi 2020-01-24 03:24:39 -05:00
  • ac37ee816b Add missing includes pwpiwi 2020-01-23 17:02:33 -05:00
  • 929b61c670 Always enable fast response mode (was enabled for flasher only) * ensure that CMD_ACK is used exclusively for the very last response of each PM3 operation. All Dbprintf() must be before. * always switch off field before exiting * append null packet for USB transfers % 64 bytes * reformatting and whitespace fixes pwpiwi 2020-01-23 22:07:17 +01:00
  • b8ed9975e5 modify USB communications * use different data types for commands and responses * use variable length responses * maintain client/flasher compatibility with old format (e.g. when using old bootloader) * maintain bootloader compatibility with old format (e.g. when using old or RRG flasher.exe) * fix length of version string in appmain.c pwpiwi 2020-01-12 17:29:07 +01:00
  • 867e10a5fd usb communication (device side) refactoring * merge cmd.c into usb_cdc.c * move back usb_cdc.[ch] to common/ * declare low level functions usb_read() and usb_write() and more functions as static * use cmd_receive() in bootrom.c and appmain.c * remove unused memory wasting csrTab[100] in usb_cdc.c * replace more byte_t by uint8_t * more whitespace fixes pwpiwi 2020-01-11 22:10:40 +01:00
  • 72622d6429 usb communication (device side) housekeeping * move cmd.[ch] and usb_cdc.[ch] to armsrc * sorting out #includes * replace byte_t by uint8_t * some reformatting * whitespace fixes * (no functional changes) pwpiwi 2020-01-11 17:11:19 +01:00
  • d00a30d56f
    Merge pull request #909 from pwpiwi/fix_button_break pwpiwi 2020-01-15 18:31:56 +01:00
  • 6b34699adc fix "Sending bytes to proxmark failed" after BUTTON_PRESS() pwpiwi 2020-01-10 08:33:50 +01:00
  • 1d04b933df appmain.c cleanup * reformatting * whitespace fixes * replace byte_t by uint8_t pwpiwi 2020-01-10 08:21:07 +01:00
  • a749b1e58b
    speedup 'hf mf chk' (#901) pwpiwi 2020-01-09 15:42:31 +01:00
  • f0c48553cb
    fix hf search (#908) pwpiwi 2020-01-07 22:33:55 +01:00
  • fef3084ec2
    fix gcc8 compiler warnings on string overflows (#905) pwpiwi 2020-01-03 07:17:21 +01:00
  • a4ff62be63
    fix 'hf iclass writebl' and 'hf iclass clone' (#896) pwpiwi 2019-12-28 17:03:20 +01:00
  • 1d4b67cb3d "hf mf ekeyprn d" doesn't works properly (#904) Phil 2019-12-28 14:04:46 +01:00
  • 5a03ea993f Nested loop fix for static nonces uzlonewolf 2019-12-23 07:08:23 -08:00
  • 1f4789fe53
    fix 'hf 15 csetuid' (#890) pwpiwi 2019-12-20 08:25:14 +01:00
  • e73c9f1bd4
    fix 'hf iclass chk' (#894) pwpiwi 2019-12-09 08:27:42 +01:00
  • 763d1befc1 Bugfix: Output typing on print of HID card formats (#895) grauerfuchs 2019-12-06 10:06:24 -05:00
  • 28ae37b746
    fix 'hf iclass replay' (#888) pwpiwi 2019-12-04 18:34:53 +01:00
  • 00848e096b
    Hitag fixes (#887) pwpiwi 2019-11-25 08:38:23 +01:00
  • e938f71011
    Merge pull request #884 from pwpiwi/fix_iclass_snoop pwpiwi 2019-11-19 18:11:26 +01:00
  • cd028159be implement 'hf iclass snoop -j' * fix long option --jam * make room for one more bit for FPGA minor mode * new mode FPGA_HF_READER_MODE_SEND_JAM * implement jamming in Handle15693SampleFromReader pwpiwi 2019-11-13 16:42:29 +01:00
  • be09ea8603 fix 'hf iclass snoop' * code deduplication: use ISO15693 snoop function * speed up SnoopIso15693(), reduce DMA buffer size * add jamming option '-j' to 'hf iclass snoop' * fix issue #882 * whitespace fixes pwpiwi 2019-11-08 14:27:09 +01:00
  • 1ce689684f fix 'hf iclass snoop' * 'hf 15 snoop': determine and write meaningful times into trace pwpiwi 2019-11-08 07:47:14 +01:00
  • d3bcdbdabf
    mod 'hf list' (#881) pwpiwi 2019-11-13 18:00:51 +01:00
  • 496bb4be33
    fix 'hf iclass' (#879) pwpiwi 2019-11-13 18:00:33 +01:00
  • ea5e5d042e
    fix 'hf 14b sriwrite' (#880) pwpiwi 2019-11-05 11:43:03 +01:00
  • e55b441992
    Merge pull request #876 from pwpiwi/fix_iclass_reader pwpiwi 2019-10-30 18:55:13 +01:00
  • ece38ef311 fix 'hf iclass reader' and 'hf iclass readblk' * don't do READCHECK when not trying to authenticate * standard LED handling * remove unused FLAG_ICLASS_READER_ONLY_ONCE and FLAG_ICLASS_READER_ONE_TRY * sanity check for negative times in TransmitTo15693Tag() * increase reader timeout for 'hf 15' functions to be enough for slot 7 answers to ACTALL * add 'hf iclass permute' inspired by RRG repository * whitespace fixes pwpiwi 2019-10-27 16:51:27 +01:00
  • a3bef9863b iso14443b: trying to approach iClass * decode and handle SOF only responses in Handle14443bSamplesDemod() * allow 1 byte commands with 'hf 14b raw' pwpiwi 2019-10-23 09:09:13 +02:00
  • a334de73d2 'hf 14b' formatting * renaming a few functions * whitespace * moving a bit towards RRG repo pwpiwi 2019-10-22 21:02:02 +02:00
  • c41dd5f9f6 fix 'hf iclass reader' * code deduplication. Use functions from iso15693.c * speedup CodeIso15693AsReader() * invert reader command coding. 0 now means 'unmodulated' ( = field on) * decode SOF only as a valid tag response in Handle15693SamplesFromTag() * complete decoding of EOF in Handle15693SamplesFromTag() * determine and write correct times to trace * FPGA-change: generate shorter frame signal to allow proper sync in StartCountSspClk() * modify StartCountSspClk() for 16bit SSC transfers * whitespace in util.c * add specific LogTrace_ISO15693() with scaled down duration. Modify cmdhflist.c accordingly. * allow 'hf 15 raw' with single byte commands * check for buffer overflow, card timeout and single SOF in 'hf 15 raw' pwpiwi 2019-10-16 09:36:37 +02:00
  • b41be3cb11
    Merge pull request #862 from pwpiwi/fix_iclass_sim pwpiwi 2019-10-21 21:25:44 +02:00
  • 3fb6e1fa40
    Merge pull request #873 from quantum-x/patch-2 Iceman 2019-10-08 14:47:17 +02:00
  • 5eacacfd9a
    Update README.md quantum-x 2019-10-08 14:40:11 +02:00
  • a534629505
    Update README.md quantum-x 2019-10-08 13:24:25 +02:00
  • f31b4cd888 Merge branch 'master' into fix_iclass_sim pwpiwi 2019-10-08 11:54:22 +02:00
  • f784539dfb
    fix iclass reader functions pwpiwi 2019-10-08 11:48:49 +02:00
  • 8efd0b80f2 fix 'hf iclass sim' * fix tag response timing. iClass differs from ISO15693 in this respect. * speedup CodeIso15693AsTag() * TransmitTo15693Tag(): don't send unmodulated start of SOF * reduce modulation depth in hi_simulate.v * calculate CRC for configuration block when simulating * Show real response time instead of planned response time in 'hf list iclass' pwpiwi 2019-10-05 17:57:16 +02:00
  • ae60ceca92 fix 'hf iclass sim' * 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 "<SOF>" instead of "0f" in 'hf list iclass' * standard LED handling pwpiwi 2019-10-01 21:03:18 +02:00
  • 26d0156a46
    fix 'hf iclass eload' (thanks to @sherhannn79) pwpiwi 2019-09-30 07:29:20 +01:00
  • 8ddb81a217 fix 'hf iclass sim': * implement CHECK[Kc] based on @sherhannn79 * implement UPDATE based on @sherhannn79 pwpiwi 2019-09-25 18:40:05 +02:00
  • e49d31c0e7 fix 'hf iclass sim': * ignore standard iso15693 INVENTORY commands silently * make iso15693 command decoder more strict (prevent decoding rubbish) * re-enable sim 3 pwpiwi 2019-09-25 14:24:36 +02:00
  • 1963cc9fe0 Merge branch 'master' into fix_iclass_sim pwpiwi 2019-09-24 19:34:05 +02:00
  • 5b12974a7f fix 'hf iclass sim': * 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 pwpiwi 2019-09-21 11:58:51 +02:00
  • 70dbfc3fc7
    fix compile issue with gcc 9.1.0 (issue #868) pwpiwi 2019-09-21 13:56:01 +01:00
  • d8ecc98a8e
    'hf iclass loclass': fix error handling (#865) pwpiwi 2019-09-12 09:21:10 +02:00
  • a66f26da18 fix 'hf iclass sim': * add simulation of block 3 and 4 reads * add simulation of READ4 (4 blocks read) * fixing TransmitTo15693Reader() (again) * FPGA change (hi_simulate.v): avoid spp_clk phase changes * some whitespace fixes pwpiwi 2019-09-10 18:18:54 +02:00
  • 3d2c9c9b06 fix 'hf iclass sim' * 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() pwpiwi 2019-09-02 11:10:45 +02:00
  • 0ab9002f36 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 * change default card challenge * remove commented code * use #defines instead of numerical constants for simulation modes * some reformatting pwpiwi 2019-08-28 11:57:53 +02:00
  • 8b2dd94e88
    Merge pull request #861 from pwpiwi/iclass_MAC_speedup pwpiwi 2019-08-30 17:14:26 +02:00
  • deb965b54d add iclass.h pwpiwi 2019-08-25 14:03:11 +02:00
  • a1ff338bd5 Merge branch 'master' into iclass_MAC_speedup pwpiwi 2019-08-24 18:27:01 +02:00
  • 1477ba8a3c iclass.c: speeding up MAC calculation pwpiwi 2019-08-24 15:07:56 +02:00
  • f2dbf3d2aa
    'lf hitag writer': add Hitag2 password auth pwpiwi 2019-08-22 07:54:55 +02:00
  • 0b4efbdef2
    add: 'hf mf personalize' (personalize UID on Mifare Classic EV1 7byte UID cards) pwpiwi 2019-08-22 07:53:17 +02:00
  • cfa9c98d57 PCF7931: Print found single/consecutive block(s), fixes to block 1 check Samuele 2019-08-22 07:51:46 +02:00
  • 17505ce2a7 cleaning up iclass.c and optimized_cipher.c * add iclass.h * reformatting * whitespace fixes * (no functional changes) pwpiwi 2019-08-21 22:10:24 +02:00
  • f98702bace
    chg 'hf mf chk': pwpiwi 2019-08-10 23:30:47 +02:00
  • 5a446cb212
    'hf 14a apdu' improvement pwpiwi 2019-08-01 11:01:56 -04:00
  • ca24170fd4
    fix emv search behavior pwpiwi 2019-08-01 10:58:22 -04:00
  • faa35ae029
    fix 'hf mf sim': access conditions to write Key B were not decoded correctly pwpiwi 2019-08-01 10:55:47 -04:00
  • 3a5ffba7c1
    Implement Originality Signature Check in 'hf mfu info' pwpiwi 2019-08-01 10:53:26 -04:00
  • 88b3dada70 Fix Issue #843 - hf mf chk - t Doesnt save to emulator memory mwalker33 2019-07-24 04:47:29 +10:00
  • 096dee1784 Add 'hf 15 csetuid' command to set UID on ISO15693 Magic tags (#842) t0m4 2019-07-14 12:31:33 +02:00
  • 817611f565 update em4x05 timing (#846) marshmellow42 2019-07-11 14:31:51 -04:00
  • 4d8a07c829
    Merge pull request #837 from mwalker33/master marshmellow42 2019-07-11 13:17:36 -04:00
  • 347efc1274 whitespace cleaning jmorsch 2019-07-11 13:01:36 -04:00
  • bdc9779645 Update lfops.c mwalker33 2019-07-07 05:00:08 +10:00
  • dcd936a1da Update lfops.c mwalker33 2019-07-06 15:20:25 +10:00
  • d7569065cb Code tidy mwalker33 2019-07-03 19:58:49 +10:00
  • 28597bb6c7 Update lfops.c mwalker33 2019-06-27 16:57:28 +10:00
  • 7db36608a2 Code improved for less memory mwalker33 2019-06-26 11:34:31 +10:00