Commit Graph

  • 87e183e664 small fix merlokk 2019-07-17 16:26:10 +03:00
  • 81fa3f20df speed optimization merlokk 2019-07-17 16:22:14 +03:00
  • 67ad6298cd added 14a send/receive arm timeout merlokk 2019-07-17 15:54:22 +03:00
  • 6e1bd28aac Fix build for linux slurdge 2019-07-17 14:50:59 +02:00
  • 9a1c0ff8a8
    Merge pull request #1 from RfidResearchGroup/master mwalker33 2019-07-17 21:00:49 +10:00
  • 2bd1be9aba
    Merge pull request #262 from merlokk/fix_sea Oleg Moiseenko 2019-07-17 12:20:27 +03:00
  • 84022807a8 fix rare emv search behavior merlokk 2019-07-17 12:20:04 +03:00
  • 7c6facce94
    Merge pull request #261 from merlokk/emv_sea_bug Oleg Moiseenko 2019-07-17 12:00:02 +03:00
  • a6977860db fix emv search keep field bug merlokk 2019-07-17 11:27:05 +03:00
  • 777f9858cb
    Merge pull request #259 from cjbrigato/patch-2 Iceman 2019-07-17 07:55:43 +02:00
  • 2ad63c07ff
    FIX: Get a usable AES implementation again Colin J. Brigato 2019-07-17 03:16:13 +02:00
  • 8cb35893c4
    Merge pull request #256 from slurdge/patch-1 Philippe Teuwen 2019-07-16 23:46:49 +02:00
  • 8281d3a384 Fix hf_mattyrun bug introduced in 732bc766f9a9a0ec Philippe Teuwen 2019-07-16 22:47:34 +02:00
  • a784608d94
    Add the needed qt package on ArchLinux slurdge 2019-07-16 22:05:51 +02:00
  • 48279e85d9 Fix hf_colin standalone broken by recent include files reorganization Philippe Teuwen 2019-07-16 19:31:59 +02:00
  • 710b38f209 Move Makefile standalone stuff to armsrc/Standalone for easier access Philippe Teuwen 2019-07-16 19:18:45 +02:00
  • d3b6a8e193
    Merge pull request #253 from merlokk/emv_apdu Oleg Moiseenko 2019-07-16 18:08:39 +03:00
  • 638d698445 make style merlokk 2019-07-16 18:05:36 +03:00
  • 5fd2a7613f add check merlokk 2019-07-16 18:05:23 +03:00
  • e61a65fbe8 check PPSE instead of PSE and vice versa. I have one card with this strange behavior... merlokk 2019-07-16 17:15:32 +03:00
  • a30c62137b use apduencode for emv commands merlokk 2019-07-16 17:04:54 +03:00
  • cd307cc606
    Merge pull request #252 from merlokk/style Oleg Moiseenko 2019-07-16 16:13:29 +03:00
  • bd8824a2f3 make style merlokk 2019-07-16 16:10:11 +03:00
  • 7726ec6000 move sAPDU merlokk 2019-07-16 16:05:47 +03:00
  • ed4289d462
    Merge pull request #251 from merlokk/reorg_includes Philippe Teuwen 2019-07-16 14:52:14 +02:00
  • 12c6b5cb20 add the definition of PACKED in its client/deprecated-hid-flasher/flasher/proxmark3.h merlokk 2019-07-16 15:25:48 +03:00
  • 20d13d5509 added PACKED attribute for structures and reorganize include folder merlokk 2019-07-16 14:50:38 +03:00
  • d8763509de Add 'hw standalone' to jump to standalone mode from command line or script Philippe Teuwen 2019-07-15 22:31:19 +02:00
  • b845404f39 Remove misplaced comment Philippe Teuwen 2019-07-15 22:28:18 +02:00
  • 19469fc676
    Merge pull request #249 from merlokk/ext_apdu Philippe Teuwen 2019-07-15 18:27:00 +02:00
  • ddd4601c1e
    Merge branch 'master' into ext_apdu Oleg Moiseenko 2019-07-15 19:25:48 +03:00
  • ecf7eda08f changelog merlokk 2019-07-15 19:25:06 +03:00
  • 84c09ce881 added define PACKED merlokk 2019-07-15 19:21:19 +03:00
  • d2a2acf69c make style merlokk 2019-07-15 19:12:01 +03:00
  • df1dd71d14 apdu format and print works merlokk 2019-07-15 17:26:42 +03:00
  • caceea24a4
    Update default_keys.dic Iceman 2019-07-15 15:36:12 +02:00
  • 0ea7fa7784 buggy 'mem read' removed, 'mem save' renamed 'mem dump', can now display too Philippe Teuwen 2019-07-15 12:48:43 +02:00
  • 6a54de1184 changelog Philippe Teuwen 2019-07-15 12:47:42 +02:00
  • 23160f20cb
    Merge pull request #244 from cjbrigato/patch-1 Iceman 2019-07-15 11:40:24 +02:00
  • 7aabab2462
    Merge pull request #242 from slurdge/remove_aes_c Iceman 2019-07-15 09:02:07 +02:00
  • 2209a0c00d BUSY_TIMEOUT for mem wipe was too short, thanks @cjbrigato Philippe Teuwen 2019-07-15 01:13:11 +02:00
  • 31c3a15cd4 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 Philippe Teuwen 2019-07-15 00:31:46 +02:00
  • cad1d500ca add msleep command Philippe Teuwen 2019-07-15 00:31:38 +02:00
  • 1fa40fbac9
    Merge pull request #247 from McEloff/hf_mf_changelog Iceman 2019-07-14 23:05:08 +02:00
  • 5d63834512
    Merge branch 'master' into hf_mf_changelog Iceman 2019-07-14 23:04:56 +02:00
  • 1f9eb10d15 textual Chris 2019-07-14 23:02:24 +02:00
  • 0c3d2cee2b Changelog for PR #245, #246 Eloff 2019-07-15 00:00:34 +03:00
  • 859a5e80ce Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 Chris 2019-07-14 22:52:50 +02:00
  • 0a845df8c3 chg: 'script run read_pwd_mem' - now can correctly deal with more than 4096 bytes when printing mifare classic keys Chris 2019-07-14 22:52:34 +02:00
  • 9196bdc670
    Merge pull request #245 from McEloff/hf_mf_sim_auth_nack Iceman 2019-07-14 22:48:04 +02:00
  • 9af039e2d1
    Merge pull request #246 from McEloff/hf_mf_sim_anticol Iceman 2019-07-14 22:31:25 +02:00
  • a28e359095 Fix. More flexible anti-collision frame check Eloff 2019-07-14 23:18:07 +03:00
  • 055efaff88 proxmark.sh: remove leftover var Philippe Teuwen 2019-07-14 22:13:40 +02:00
  • f6f7e7a9f6 hf_mf_sim. Really tags not respond NACK on invalid authentication Eloff 2019-07-14 23:12:39 +03:00
  • 383d3327be remove spurious changes in make style Philippe Teuwen 2019-07-14 18:42:11 +02:00
  • fee9c0ef84 silent uart_close error message as it can be called from uart_open failing modes, e.g. when waiting for port to appear Philippe Teuwen 2019-07-14 18:26:04 +02:00
  • 82e0568e65 shellcheck bash scripts Philippe Teuwen 2019-07-14 18:20:41 +02:00
  • d746847d13 proxmark3.sh for WSL: handle case when chmod is needed Philippe Teuwen 2019-07-14 17:58:47 +02:00
  • a9d15d85e6 sketch2 merlokk 2019-07-14 15:14:54 +03:00
  • 51bcc80a2b small fix merlokk 2019-07-14 15:00:40 +03:00
  • 68bfbde185 CmdHF14AAPDU sketch merlokk 2019-07-14 14:59:59 +03:00
  • 2fc26fbf35
    HF_COLIN/STANDALONE: FIX Simulation/Writing Tag to flash/Reading back from flash Colin J. Brigato 2019-07-14 13:29:40 +02:00
  • 55602bf833 Fix few zelaous WARNING->ERR Philippe Teuwen 2019-07-14 12:17:34 +02:00
  • 8bf4b4ad97 Promote WARNING to ERR on some error msgs Philippe Teuwen 2019-07-14 00:35:18 +02:00
  • bb3c5e364e remove perror Philippe Teuwen 2019-07-14 00:30:57 +02:00
  • 25e2ab9a4c changelog Philippe Teuwen 2019-07-13 18:29:36 +02:00
  • 99d33f9479
    Merge pull request #243 from McEloff/hf_mf_chk_log Philippe Teuwen 2019-07-13 18:27:44 +02:00
  • 735077f358 Does clear trace log only at first call 'hf mf chk', to save whole process history Eloff 2019-07-13 18:26:52 +03:00
  • edcd2b974e wsl: no driver required Philippe Teuwen 2019-07-13 13:05:38 +02:00
  • b0dbbd3683 make style Philippe Teuwen 2019-07-13 00:38:30 +02:00
  • ed47ca7186 tuning windows doc Philippe Teuwen 2019-07-13 00:36:10 +02:00
  • d11684fcab Get proxmark.sh supporting WSL Philippe Teuwen 2019-07-13 00:06:19 +02:00
  • 996ed197fb Remove aes.c in favor of mbedtls implementation. Changelog slurdge 2019-07-12 23:48:54 +02:00
  • ec534305de Document WSL and update ProxSpace instructions Philippe Teuwen 2019-07-12 21:16:51 +02:00
  • d94c74b24b make style merlokk 2019-07-12 13:58:38 +03:00
  • cbfd195abf Document compilation options Philippe Teuwen 2019-07-12 01:48:39 +02:00
  • e51b4f0fdd changelog Philippe Teuwen 2019-07-11 14:08:58 +02:00
  • fec7d802b9 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 Philippe Teuwen 2019-07-11 13:54:48 +02:00
  • 844d732297 Replace ukbhit by kbd_enter_pressed, not requiring tcgetattr: Philippe Teuwen 2019-07-11 13:01:34 +02:00
  • 4d8a411413 APDUEncode merlokk 2019-07-11 13:08:43 +03:00
  • 11941e0e8f
    Merge pull request #238 from 3ldidi94/master Iceman 2019-07-11 11:18:11 +02:00
  • 6f457873cc
    Update default_keys.dic with keys from an APK 3ldidi94 2019-07-11 10:37:00 +02:00
  • 0080edfe7f
    Merge pull request #1 from RfidResearchGroup/master 3ldidi94 2019-07-11 10:32:48 +02:00
  • fd5c30f555 jtag tools: add config for RaspberryPi Philippe Teuwen 2019-07-10 22:51:42 +02:00
  • 1ae85d20d7 jtag tools: add config for FTDI C232HM-DDHSL-0 Philippe Teuwen 2019-07-10 22:37:30 +02:00
  • 4bd15d900b jtag tools: some factorisation Philippe Teuwen 2019-07-10 22:35:29 +02:00
  • 73bbb2e9e8 Silent properly GCC format-truncation warnings in jansson Philippe Teuwen 2019-07-10 22:32:55 +02:00
  • e53ac8b715 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 Philippe Teuwen 2019-07-10 21:49:54 +02:00
  • 99d2ed224a Minor changes on bootloader chip info Philippe Teuwen 2019-07-10 21:49:14 +02:00
  • 4727ab96d7 Dynamic report of the chipID for flashing purposes slurdge 2019-07-10 18:41:42 +02:00
  • 5924847e0c
    Merge pull request #234 from matrix/osx_makefiles Philippe Teuwen 2019-07-10 20:58:32 +02:00
  • fce082db56
    Merge pull request #235 from matrix/osx_warnings Philippe Teuwen 2019-07-10 20:50:29 +02:00
  • f466cbc8e1
    Merge pull request #236 from matrix/emv_bug Philippe Teuwen 2019-07-10 20:40:09 +02:00
  • 1740d43655 Fix EMV bug Gabriele Gristina 2019-07-10 18:48:15 +02:00
  • fa2595a619 Fix Clang warnings Gabriele Gristina 2019-07-10 18:46:30 +02:00
  • 563050c8ba Fix compilation under MacOSX Gabriele Gristina 2019-07-10 18:43:19 +02:00
  • 1169a6cf1b apdu rename and print merlokk 2019-07-10 19:21:54 +03:00
  • 16b6d7e529 apdu universal parser merlokk 2019-07-10 19:11:56 +03:00
  • c388f66b81
    Merge pull request #233 from ViRb3/master Philippe Teuwen 2019-07-10 09:59:21 +02:00
  • cb45313981 Add hitag2 write password auth Victor 2019-07-09 23:00:57 +01:00