Commit Graph

4062 Commits

Author SHA1 Message Date
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
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
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 https://github.com/korsehindi/proxmark3/commit/6b6bafed5472cdfc793f5487e870705a7fb65b8a
2019-07-04 12:33:01 +02:00
Slurdge 7205a910c5 Add compiler name in [CLIENT] section 2019-07-03 16:08:09 +02:00
Iceman 3938933c63 Update default_keys.dic
from mct app pr.
2019-06-28 15:50:19 +02:00
Philippe Teuwen 0eea50f5a0 Add support for compilation on RaspberryPiZero (armv6)
More generally, add support for platforms with atomics, which not really linked to
architecture but compiler features. This may also help on some mips for example.
2019-06-26 00:12:32 +02:00
iceman1001 c6d245b843 fix: syntax erros in luascripts 2019-06-23 08:13:17 -04:00
Jacopo Jannone 7e1d4a54ad Fix syntax errors with Calypso & 14443b Lua 2019-06-23 11:53:48 +02:00
iceman1001 7961ff982d unique and added some more keys from @korsehindi 2019-06-15 12:05:40 -04:00
iceman1001 f11500f60f revert and double check empty buffers 2019-06-13 15:13:41 -04:00
Philippe Teuwen 2382ad551b update msleep in deprecated-hid-flasher 2019-06-12 13:57:02 -07:00
Philippe Teuwen 1ebfa897c8 remove some cppcheck warnings 2019-06-12 06:41:23 -07:00
Iceman cb07f2f807 Merge pull request #210 from javastraat/master
<added keys for Transportes Insular La Palma (Public Transport)>
2019-06-09 11:23:28 +02:00
iceman1001 db578e9f5f fix: read14a.lua - wrong call 2019-06-09 04:59:16 -04:00
Albert Einstein b344e7c133 <added keys for Transportes Insular La Palma (Public Transport)> 2019-06-09 10:27:20 +02:00
iceman1001 e7d00dce83 chg: upgrade always possible 2019-06-08 15:26:05 -04:00
iceman1001 fd2ac38ac3 chg: lf em 4x05_info 2019-06-08 15:24:12 -04:00
iceman1001 a6fc729f22 style 2019-06-08 10:11:18 -04:00
iceman1001 7fd7b539be textual 2019-06-08 10:10:04 -04:00
iceman1001 d3f26fe7b7 style 2019-06-08 10:09:13 -04:00
Philippe Teuwen a55e597e36 make style 2019-06-07 21:40:33 +02:00
Philippe Teuwen f7dfd2a1f2 Fix arg names mismatches between decl & def 2019-06-07 21:26:03 +02:00
Philippe Teuwen 732bc766f9 Reduce some var scopes 2019-06-07 18:41:39 +02:00
Philippe Teuwen 7a06a77283 text of data setdebugmode 2019-06-06 11:34:33 +02:00
Philippe Teuwen 1a39ec3026 hf mf/mfu dbg => hw dbg 2019-06-06 11:31:47 +02:00
Philippe Teuwen d7614684f8 Make sure standalone modes can be launched when connected on USB without client 2019-06-02 23:20:02 +02:00
Philippe Teuwen 742fe16830 Makefile verbose mode: make V=1 as for CMake 2019-06-02 16:04:35 +02:00
Philippe Teuwen 8c0cd4cfa2 Cleaner makefile execution, use 'make Q=' if you want to see full lines 2019-06-02 00:25:25 +02:00
Philippe Teuwen 9b668e3827 client Makefile doesn't depend on platform specs anymore 2019-06-01 01:03:34 +02:00
Philippe Teuwen 5e83fcbd58 client Makefile doesn't use PLATFORM_DEFS anymore 2019-06-01 00:59:11 +02:00
Philippe Teuwen e98c4e246d rework standalone makefile 2019-06-01 00:23:38 +02:00