RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-12-10 05:25:53 +08:00
Code Issues Projects Releases Packages Wiki Activity
6388 commits 3 branches 18 tags 91 MiB
Commit graph

4090 commits

Author SHA1 Message Date
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
Oleg Moiseenko
ddd4601c1e
Merge branch 'master' into ext_apdu 2019-07-15 19:25:48 +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
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
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
Philippe Teuwen
383d3327be remove spurious changes in make style 2019-07-14 18:42:11 +02:00
merlokk
a9d15d85e6 sketch2 2019-07-14 15:14:54 +03:00
merlokk
51bcc80a2b small fix 2019-07-14 15:00:40 +03:00
merlokk
68bfbde185 CmdHF14AAPDU sketch 2019-07-14 14:59:59 +03:00
Philippe Teuwen
55602bf833 Fix few zelaous WARNING->ERR 2019-07-14 12:17:34 +02:00
Philippe Teuwen
8bf4b4ad97 Promote WARNING to ERR on some error msgs 2019-07-14 00:35:18 +02:00
Philippe Teuwen
bb3c5e364e remove perror 2019-07-14 00:30:57 +02:00
Eloff
735077f358 Does clear trace log only at first call 'hf mf chk', to save whole process history 2019-07-13 18:26:52 +03:00
Philippe Teuwen
b0dbbd3683 make style 2019-07-13 00:38:30 +02:00
merlokk
d94c74b24b make style 2019-07-12 13:58:38 +03:00
Philippe Teuwen
fec7d802b9 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  Update default_keys.dic with keys from an APK
 2019-07-11 13:54:48 +02:00
Philippe Teuwen
844d732297 Replace ukbhit by kbd_enter_pressed, not requiring tcgetattr: 
Note that it behaves differently now
* it looks for Enter key only, not any key
* it "eats" the input, no need for (void)getchar() after it
* it works the same no matter the value of ICANON
* the mingw version has been adapted to act the similarly

This should fix its usage on Android where tcgetattr always returns -1
 2019-07-11 13:01:34 +02:00
merlokk
4d8a411413 APDUEncode 2019-07-11 13:08:43 +03:00
3ldidi94
6f457873cc
Update default_keys.dic with keys from an APK 
Update the dic with keys from Android application "Scan Badge".
I did the diff between keys already present and keys from the application.
 2019-07-11 10:37:00 +02:00
Philippe Teuwen
73bbb2e9e8 Silent properly GCC format-truncation warnings in jansson 2019-07-10 22:32:55 +02:00
Philippe Teuwen
e53ac8b715 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  Fix compilation under MacOSX
 2019-07-10 21:49:54 +02:00
Philippe Teuwen
99d2ed224a Minor changes on bootloader chip info 2019-07-10 21:49:14 +02:00
slurdge
4727ab96d7 Dynamic report of the chipID for flashing purposes 2019-07-10 21:11:20 +02:00
Philippe Teuwen
5924847e0c
Merge pull request #234 from matrix/osx_makefiles 
Fix compilation under MacOSX
 2019-07-10 20:58:32 +02:00
Philippe Teuwen
fce082db56
Merge pull request #235 from matrix/osx_warnings 
Fix Clang warnings
 2019-07-10 20:50:29 +02:00
Philippe Teuwen
f466cbc8e1
Merge pull request #236 from matrix/emv_bug 
Fix EMV bug
 2019-07-10 20:40:09 +02:00
Gabriele Gristina
1740d43655 Fix EMV bug 2019-07-10 18:48:15 +02:00
Gabriele Gristina
fa2595a619 Fix Clang warnings 2019-07-10 18:46:30 +02:00
Gabriele Gristina
563050c8ba Fix compilation under MacOSX 2019-07-10 18:43:19 +02:00
merlokk
1169a6cf1b apdu rename and print 2019-07-10 19:21:54 +03:00
merlokk
16b6d7e529 apdu universal parser 2019-07-10 19:11:56 +03:00
Victor
cb45313981 Add hitag2 write password auth 2019-07-09 23:00:57 +01:00
slurdge
248b109c9a Check if bootloader segment is within bounds 2019-07-09 22:12:39 +02:00
t0m4
0a1b2698c9 Code review 2019-07-07 14:00:13 +02:00
t0m4
88df59722e Code cleaning 2019-07-07 12:10:51 +02:00
t0m4
95fd247e10 Add 'hf 15 csetuid' command to set UID on ISO15693 Magic tags 2019-07-07 10:52:00 +02:00
iceman1001
959a2a9c87 mysterious keys #issue 839 offical repo 2019-07-06 11:16:39 -04:00
Philippe Teuwen
e047d223e4 Fix #216: skip --as-needed linker options under MacOSX 2019-07-06 10:06:04 +02:00
Victor
773845f411 Print help if unknown arg for hitag reader/writer 2019-07-04 22:12:48 +01:00
Iceman
ae4c3374cb
Update default_keys.dic 
More keys from 6b6bafed54
 2019-07-04 12:33:01 +02:00