Commit graph

  • adaf8d48a5
    Merge 845e4f4acb into 6116334485 Yiheng Cao 2024-02-03 21:32:39 +0800
  • 845e4f4acb
    Backport CVE-2020-24370's patch Yiheng Cao 2024-02-03 21:29:27 +0800
  • e487809711
    Merge 8a3c48ba2d into 6116334485 Michael Farrell 2021-03-30 21:08:09 -0400
  • 28fd46f124
    Merge 14c765af6a into 6116334485 Vladimir Serbinenko 2021-03-30 21:08:07 -0400
  • 85d6ad4009
    Merge ccf82d598a into 6116334485 pwpiwi 2021-03-30 21:07:48 -0400
  • 39cb41eb18
    Merge e495771602 into 6116334485 g3gg0.de 2021-03-30 21:07:46 -0400
  • b04cfa0088
    Merge 956a725adb into 6116334485 wh201906 2021-03-30 21:07:44 -0400
  • 6116334485
    Merge pull request #969 from pwpiwi/gcc10_fixes master pwpiwi 2021-03-30 08:59:58 +0200
  • cbecb8a209 gcc10 compiler fixes: - Check for availability of getenv_s() in argtable3.c pwpiwi 2021-03-18 08:25:16 +0100
  • d3f8d76d6c Fix gcc10 compiler warnings - update argtable3 to latest versions pwpiwi 2021-01-29 09:33:19 +0100
  • 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 +0100
  • ad326d84ad Fix gcc 10 link issues - avoid linker error by providing string.[ch] in bootrom pwpiwi 2021-01-28 09:00:08 +0100
  • 555fa19773
    Cleanup armsrc/string.c and string.h (#964) pwpiwi 2021-01-25 09:27:38 +0100
  • efd0327132
    Avoid link error due to duplicate definition of blocknr in hitag.c and hitagS.c (#963) pwpiwi 2021-01-25 09:26:27 +0100
  • 91592df4ec Cleanup armsrc/string.c and string.h - remove unnecessary memxor(), strreverse(), and itoa() functions - Use correct types in function declarations and definitions - add memmove() function. Gcc may generate calls to memcmp(), memcpy(), memset() and memmove() pwpiwi 2021-01-25 09:16:59 +0100
  • 4f81d9007b Avoid link error due to duplicate definition of blocknr in hitag.c and hitagS.c pwpiwi 2021-01-24 18:50:57 +0100
  • 622dd1af3b
    Merge pull request #938 from pwpiwi/fix_printf_scanf pwpiwi 2021-01-22 17:34:42 +0100
  • 18ab921cd2
    Update cmdhf14a.c libin-ka 2020-10-16 13:19:05 +0800
  • e495771602 return an error when READBLOCK goes beyond tag size during emulation g3gg0 2020-09-13 15:42:25 +0200
  • 956a725adb Align the usage message wh201906 2020-08-23 10:10:47 +0800
  • 3aaa9c45ba Add downlinks mode for lf t55xx dump wh201906 2020-08-20 16:40:57 +0800
  • e6158a48ec
    Update README.md Iceman 2020-07-29 17:33:56 +0200
  • 4b27ca5cf6
    Merge pull request #943 from dgorbunov/patch-1 pwpiwi 2020-07-14 09:00:27 +0200
  • 79d9ddc584
    Add string.h Daniel Gorbunov 2020-07-12 10:13:15 -0400
  • dddbb67c40 send an ACK back upon emulation end g3gg0 2020-06-09 22:01:20 +0200
  • 8be3a37bb9 fix transmitting too many bytes to host in case of a failed SetPassSlixLIso15693 g3gg0 2020-05-19 01:19:27 +0200
  • 3d411bee02 removed some commands again moved internal commands to only build in standalone mode send NACK if DisablePrivacySlixLIso15693 fails g3gg0 2020-05-19 01:11:55 +0200
  • 98a67bc908 Fix some printf/scanf format strings pwpiwi 2020-05-11 14:46:22 +0200
  • 31e4c66f00 when emulating ISO15693, check for the correct address when addressed mode was selected g3gg0 2020-04-13 22:09:34 +0200
  • 2e69d17693 cancel blocking ISO15693 operations or standalone mode whenever USB packets appear g3gg0 2020-04-12 01:15:51 +0200
  • a9b59a1b07 added SLIX-L functions and extended hf 15 sim g3gg0 2020-04-11 23:03:42 +0200
  • ebf1404a81
    Merge pull request #926 from pwpiwi/fix_iso15693_fpga pwpiwi 2020-04-11 08:56:14 +0200
  • c85805b8a2
    update CI/.travis.yml (#929) pwpiwi 2020-04-09 09:19:25 +0200
  • e1d815d4a4 update CI/.travis.yml * drop checks for MacOS 10.11 and 10.12 * add checks for Ubuntu 16.04 and 18.04 * add libnewlib-arm-none-eabi as prerequisite on Ubuntu pwpiwi 2020-04-08 17:07:33 +0200
  • 852ecedc16
    compatibility fix: get_clocktime() is not always available pwpiwi 2020-04-07 09:04:47 +0200
  • 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 +0200
  • f66d28afcc Merge branch 'master' into fix_iso15693_fpga pwpiwi 2020-03-31 08:55:35 +0200
  • 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 +0100
  • ccf82d598a
    minor fix pwpiwi 2020-03-21 12:11:16 +0100
  • 056f80a141 fix 'make install_kext' for hid-flasher * based on https://www.tonymacx86.com/threads/guide-installing-3rd-party-kexts-el-capitan-sierra-high-sierra-mojave-catalina.268964/ pwpiwi 2020-03-19 08:52:28 +0100
  • 5bc3841ad1
    fix 'hf mf perso' result feedback (#920) pwpiwi 2020-03-16 13:33:19 +0100
  • aa8ff592ae
    add a specific check function for static nonces (used in 'hf mf nested') (#911) pwpiwi 2020-03-16 13:32:00 +0100
  • 2b77cf710b fix 'hf mf perso' result feedback pwpiwi 2020-03-06 18:13:49 +0100
  • 9dd8c2af44 a simpler fix. Force POSIX compliance pwpiwi 2020-03-06 17:35:59 +0100
  • 687ee7236e compatibility fix: get_clocktime() is not a available with older glibc pwpiwi 2020-02-24 11:37:38 +0100
  • 05820ee736 minor fix, CHANGELOG update pwpiwi 2020-02-13 20:01:05 +0100
  • bedae7768c
    Merge pull request #913 from 0x2b3bfa0/patch-1 pwpiwi 2020-02-13 08:37:17 +0100
  • d5975d4dfc
    Merge pull request #1 from Proxmark/master andrerodr 2020-02-12 00:02:35 +0100
  • 8f831ceb0b Fix #912 Helio Machado 2020-02-09 18:04:46 +0100
  • d6e1d48284
    Merge pull request #910 from pwpiwi/small_USB_response pwpiwi 2020-02-06 21:49:15 +0100
  • ab1d75a294 add a specific check function for static nonces in 'hf mf nested' * uses a fixed nr_enc and does all the crypto operations on client * for all possible keys calculate par_enc and ar_enc and send them to device pwpiwi 2019-12-24 15:38:33 +0100
  • df7b80fecc fix WaitForResponse (without timeout) pwpiwi 2020-02-06 07:59:18 +0100
  • 01aa068b6f reenable intermediate "Waiting for a response from the proxmark..." message pwpiwi 2020-02-04 08:21:17 +0100
  • 3458bb279b replace msleep() by thread signalling in comms.c pwpiwi 2020-01-27 14:55:40 -0500
  • 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 -0500
  • fd66752193 cleaning up uart_posix.c * whitespace fixes * sorting out #includes pwpiwi 2020-01-24 03:24:39 -0500
  • ac37ee816b Add missing includes pwpiwi 2020-01-23 17:02:33 -0500
  • 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 +0100
  • 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 +0100
  • 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 +0100
  • 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 +0100
  • d00a30d56f
    Merge pull request #909 from pwpiwi/fix_button_break pwpiwi 2020-01-15 18:31:56 +0100
  • 6b34699adc fix "Sending bytes to proxmark failed" after BUTTON_PRESS() pwpiwi 2020-01-10 08:33:50 +0100
  • 1d04b933df appmain.c cleanup * reformatting * whitespace fixes * replace byte_t by uint8_t pwpiwi 2020-01-10 08:21:07 +0100
  • a749b1e58b
    speedup 'hf mf chk' (#901) pwpiwi 2020-01-09 15:42:31 +0100
  • d1009af506 speedup 'hf mf chk' * fix abort by pressing the PM3 button pwpiwi 2020-01-09 07:43:11 +0100
  • f0c48553cb
    fix hf search (#908) pwpiwi 2020-01-07 22:33:55 +0100
  • cff093d075 fix hf search * fix memory access violation in HF14B_Other_Reader() pwpiwi 2020-01-07 19:21:59 +0100
  • fef3084ec2
    fix gcc8 compiler warnings on string overflows (#905) pwpiwi 2020-01-03 07:17:21 +0100
  • ac2668f898 speedup hf mf chk * revert queuing change * instead allow arbitrary number of keys in MifareChkKeys() * and move progress printing to MifareChkKeys() pwpiwi 2019-12-30 14:55:52 +0100
  • 829b3b299b fix gcc8 compiler warnings on string overflows pwpiwi 2019-12-29 16:15:23 +0100
  • 766c978bd0 mf chk queue up the next set of keys to check (#1) uzlonewolf 2019-12-29 06:10:51 -0800
  • 24683e5381 fix drop_field handling pwpiwi 2019-12-29 12:51:30 +0100
  • a4ff62be63
    fix 'hf iclass writebl' and 'hf iclass clone' (#896) pwpiwi 2019-12-28 17:03:20 +0100
  • 1d4b67cb3d "hf mf ekeyprn d" doesn't works properly (#904) Phil 2019-12-28 14:04:46 +0100
  • d89dd848b7
    "hf mf ekeyprn d" doesn't works properly Phil 2019-12-27 22:44:04 +0100
  • 7d7d514ca6 speedup 'hf mf chk' * fishing for microseconds in TransmitFor14443a() * some reformatting pwpiwi 2019-12-24 16:01:04 +0100
  • e0ca05575c speedup 'hf mf chk' * add separate timeout for tag response to nr_ar * measure response time and use it for response timeout * don't drop field between keyblocks * some reformatting * some whitespace fixes pwpiwi 2019-12-19 18:38:38 +0100
  • 5a03ea993f Nested loop fix for static nonces uzlonewolf 2019-12-23 07:08:23 -0800
  • d7a3d17819 More column tweaks for 'N keys left' message LW 2019-12-23 06:40:15 -0800
  • 1f4789fe53
    fix 'hf 15 csetuid' (#890) pwpiwi 2019-12-20 08:25:14 +0100
  • 1f0ef06374 iso15693: decode WRITE_MULTI_BLOCK in 'hf list 15' pwpiwi 2019-12-20 08:22:23 +0100
  • fcf36b8b62 Column width tweaks for 'N keys left' message LW 2019-12-19 13:32:33 -0800
  • f3d287b9ad Fix width of 'N keys left' message LW 2019-12-19 02:06:25 -0800
  • ed58af887c Print keys remaining only every 10 seconds, and add estimated worst-case time LW 2019-12-19 01:56:20 -0800
  • 4792fbdf9b more cleanup LW 2019-12-18 19:21:00 -0800
  • a906a0f457 some cleanup and better error passing LW 2019-12-18 19:12:42 -0800
  • 4701e6111c finish removing 'not vulnerable to nested' error message LW 2019-12-18 02:32:30 -0800
  • 74da62269b remove 'not vulnerable to nested' error message LW 2019-12-18 02:29:39 -0800
  • 3772d1651a modify mfCheckKeys() to pass button press events upstream, don't abort nested when a static nonce is encountered, and modify nested to try multiple keys in a single operation LW 2019-12-18 02:26:40 -0800
  • b461e6e367 add tag nonce to error message LW 2019-12-17 19:56:14 -0800
  • fd32c73b4a fix a comment and remove unrelated 14b fix LW 2019-12-17 18:54:38 -0800
  • 141283ef1f add detection of static tag nonces LW 2019-12-17 18:50:03 -0800
  • 2f00f5a9b9 fix nested loop with cards that do not NACK LW 2019-12-14 01:43:44 -0800
  • 9b6d1f74da fix nested loop with cards that do not NACK LW 2019-12-14 01:41:16 -0800
  • 98a94f7000 fix 'hf iclass clone' * Drop field after dump and clone functions * If dumping AA1 with Credit Key, authenticate as Debit Key * Initialize reader when beginning to clone pwpiwi 2019-12-12 12:55:54 +0100
  • 72096cac73 fix 'hf iclass writebl' and 'hf iclass clone' * check for correct responses after block updates * reduce number of tries from 10 to 3 * Allow to override warning on attempt to clone blocks < 5 * add same warning and override option to 'hf iclass writebl' * some reformatting and minor refactoring pwpiwi 2019-12-06 18:41:43 +0100
  • e73c9f1bd4
    fix 'hf iclass chk' (#894) pwpiwi 2019-12-09 08:27:42 +0100
  • 763d1befc1 Bugfix: Output typing on print of HID card formats (#895) grauerfuchs 2019-12-06 10:06:24 -0500
  • 329f495fe9
    Update hidcardformats.c grauerfuchs 2019-12-06 09:51:18 -0500