RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 23:36:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
6407 commits 3 branches 14 tags 85 MiB
Commit graph

6407 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
merlokk 67ad6298cd added 14a send/receive arm timeout 2019-07-17 15:54:22 +03:00
Oleg Moiseenko 2bd1be9aba
Merge pull request #262 from merlokk/fix_sea 
fix rare emv search behavior
 2019-07-17 12:20:27 +03:00
merlokk 84022807a8 fix rare emv search behavior 2019-07-17 12:20:04 +03:00
Oleg Moiseenko 7c6facce94
Merge pull request #261 from merlokk/emv_sea_bug 
fix emv search keep field bug
 2019-07-17 12:00:02 +03:00
merlokk a6977860db fix emv search keep field bug 2019-07-17 11:27:05 +03:00
Iceman 777f9858cb
Merge pull request #259 from cjbrigato/patch-2 
FIX: Get a usable AES implementation again
 2019-07-17 07:55:43 +02:00
Colin J. Brigato 2ad63c07ff
FIX: Get a usable AES implementation again 
see #258 for more information.
 2019-07-17 03:16:13 +02:00
Philippe Teuwen 8cb35893c4
Merge pull request #256 from slurdge/patch-1 
Add the needed qt package on ArchLinux
 2019-07-16 23:46:49 +02:00
Philippe Teuwen 8281d3a384 Fix hf_mattyrun bug introduced in 732bc766f9 2019-07-16 22:47:34 +02:00
slurdge a784608d94
Add the needed qt package on ArchLinux 
qt5-base is enough on my Arch
 2019-07-16 22:05:51 +02:00
Philippe Teuwen 48279e85d9 Fix hf_colin standalone broken by recent include files reorganization 2019-07-16 19:31:59 +02:00
Philippe Teuwen 710b38f209 Move Makefile standalone stuff to armsrc/Standalone for easier access 2019-07-16 19:18:54 +02:00
Oleg Moiseenko d3b6a8e193
Merge pull request #253 from merlokk/emv_apdu 
Emv apdu
 2019-07-16 18:08:39 +03:00
merlokk 638d698445 make style 2019-07-16 18:05:36 +03:00
merlokk 5fd2a7613f add check 2019-07-16 18:05:23 +03:00
merlokk e61a65fbe8 check PPSE instead of PSE and vice versa. I have one card with this strange behavior... 2019-07-16 17:15:32 +03:00
merlokk a30c62137b use apduencode for emv commands 2019-07-16 17:04:54 +03:00
Oleg Moiseenko cd307cc606
Merge pull request #252 from merlokk/style 
make style
 2019-07-16 16:13:29 +03:00
merlokk bd8824a2f3 make style 2019-07-16 16:10:11 +03:00
merlokk 7726ec6000 move sAPDU 2019-07-16 16:05:47 +03:00
Philippe Teuwen ed4289d462
Merge pull request #251 from merlokk/reorg_includes 
added PACKED attribute for structures and reorganize include folder
 2019-07-16 14:52:14 +02:00
merlokk 12c6b5cb20 add the definition of PACKED in its client/deprecated-hid-flasher/flasher/proxmark3.h 2019-07-16 15:25:48 +03:00
merlokk 20d13d5509 added PACKED attribute for structures and reorganize include folder 2019-07-16 14:50:38 +03:00
Philippe Teuwen d8763509de Add 'hw standalone' to jump to standalone mode from command line or script 2019-07-15 22:31:19 +02:00
Philippe Teuwen b845404f39 Remove misplaced comment 2019-07-15 22:28:18 +02:00
Philippe Teuwen 19469fc676
Merge pull request #249 from merlokk/ext_apdu 
`hf 14a apdu` improvement
 2019-07-15 18:27:00 +02:00
Oleg Moiseenko ddd4601c1e
Merge branch 'master' into ext_apdu 2019-07-15 19:25:48 +03:00
merlokk ecf7eda08f changelog 2019-07-15 19:25:06 +03:00
merlokk 84c09ce881 added define PACKED 2019-07-15 19:21:19 +03:00
merlokk d2a2acf69c make style 2019-07-15 19:12:01 +03:00
merlokk df1dd71d14 apdu format and print works 2019-07-15 17:26:42 +03:00
Iceman caceea24a4
Update default_keys.dic 2019-07-15 15:36:12 +02:00
Philippe Teuwen 0ea7fa7784 buggy 'mem read' removed, 'mem save' renamed 'mem dump', can now display too 2019-07-15 12:57:20 +02:00
Philippe Teuwen 6a54de1184 changelog 2019-07-15 12:47:42 +02:00
Iceman 23160f20cb
Merge pull request #244 from cjbrigato/patch-1 
HF_COLIN/STANDALONE: FIX Simulation/Writing Tag to flash/Reading back…
 2019-07-15 11:40:24 +02:00
Iceman 7aabab2462
Merge pull request #242 from slurdge/remove_aes_c 
Remove aes.c in favor of mbedtls implementation.
 2019-07-15 09:02:07 +02:00
Philippe Teuwen 2209a0c00d BUSY_TIMEOUT for mem wipe was too short, thanks @cjbrigato 2019-07-15 01:13:11 +02:00
Philippe Teuwen 31c3a15cd4 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  textual
  Changelog for PR #245, #246
  chg: 'script run read_pwd_mem' - now can correctly deal with more than 4096 bytes when printing mifare classic keys
  Fix. More flexible anti-collision frame check
  hf_mf_sim. Really tags not respond NACK on invalid authentication
 2019-07-15 00:31:46 +02:00
Philippe Teuwen cad1d500ca add msleep command 2019-07-15 00:31:38 +02:00
Iceman 1fa40fbac9
Merge pull request #247 from McEloff/hf_mf_changelog 
Changelog for PR #245, #246
 2019-07-14 23:05:08 +02:00
Iceman 5d63834512
Merge branch 'master' into hf_mf_changelog 2019-07-14 23:04:56 +02:00
Chris 1f9eb10d15 textual 2019-07-14 23:02:24 +02:00
Eloff 0c3d2cee2b Changelog for PR #245, #246 2019-07-15 00:00:34 +03:00
Chris 859a5e80ce Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-07-14 22:52:50 +02:00
Chris 0a845df8c3 chg: 'script run read_pwd_mem' - now can correctly deal with more than 4096 bytes when printing mifare classic keys 2019-07-14 22:52:34 +02:00
Iceman 9196bdc670
Merge pull request #245 from McEloff/hf_mf_sim_auth_nack 
hf_mf_sim. Really tags not respond NACK on invalid authentication
 2019-07-14 22:48:04 +02:00
Iceman 9af039e2d1
Merge pull request #246 from McEloff/hf_mf_sim_anticol 
Fix. More flexible anti-collision frame check (hf_mf_sim)
 2019-07-14 22:31:25 +02:00
Eloff a28e359095 Fix. More flexible anti-collision frame check 2019-07-14 23:18:07 +03:00
Philippe Teuwen 055efaff88 proxmark.sh: remove leftover var 2019-07-14 22:13:40 +02:00
Eloff f6f7e7a9f6 hf_mf_sim. Really tags not respond NACK on invalid authentication 2019-07-14 23:12:39 +03:00