Commit graph

6335 commits

Author SHA1 Message Date
Philippe Teuwen
d11684fcab Get proxmark.sh supporting WSL 2019-07-13 00:14:23 +02:00
Philippe Teuwen
ec534305de Document WSL and update ProxSpace instructions 2019-07-12 21:47:56 +02:00
Philippe Teuwen
cbfd195abf Document compilation options 2019-07-12 01:55:36 +02:00
Philippe Teuwen
e51b4f0fdd changelog 2019-07-11 14:08:58 +02: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
Iceman
11941e0e8f
Merge pull request #238 from 3ldidi94/master
Update default_keys.dic with keys from an APK
2019-07-11 11:18:11 +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
3ldidi94
0080edfe7f
Merge pull request #1 from RfidResearchGroup/master
test
2019-07-11 10:32:48 +02:00
Philippe Teuwen
fd5c30f555 jtag tools: add config for RaspberryPi 2019-07-10 22:51:42 +02:00
Philippe Teuwen
1ae85d20d7 jtag tools: add config for FTDI C232HM-DDHSL-0 2019-07-10 22:37:30 +02:00
Philippe Teuwen
4bd15d900b jtag tools: some factorisation 2019-07-10 22:35:29 +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
Philippe Teuwen
c388f66b81
Merge pull request #233 from ViRb3/master
Add hitag2 write password auth
2019-07-10 09:59:21 +02:00
Victor
cb45313981 Add hitag2 write password auth 2019-07-09 23:00:57 +01:00
Philippe Teuwen
4100f0dd76 changelog 2019-07-09 22:58:28 +02:00
Philippe Teuwen
aab0558a58 minor txt alignments 2019-07-09 22:49:57 +02:00
slurdge
71b70f4ffb Add compiler info for proxmark3 armsrc 2019-07-09 22:35:23 +02:00
slurdge
248b109c9a Check if bootloader segment is within bounds 2019-07-09 22:12:39 +02:00
Iceman
77c5e28bce
Merge pull request #229 from uhei/bt_mac_doc
BT Manual: Update device info for macOS
2019-07-07 21:41:11 +02:00
Uli Heilmeier
0b1479b43c BT Manual: Update device info for macOS 2019-07-07 21:33:00 +02:00
Iceman
ade54ffea2
Merge pull request #228 from t0m4-null/master
Changelog update
2019-07-07 15:05:11 +02:00
t0m4
c096a422a8 Changelog update 2019-07-07 14:33:29 +02:00
Iceman
23cd87096f
Merge pull request #227 from t0m4-null/master
Add 'hf 15 csetuid' command to set UID on ISO15693 Magic tags
2019-07-07 14:08:04 +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
Iceman
135f618c3f
Merge pull request #226 from slurdge/master
Gitignore more linux profile related files
2019-07-06 16:46:54 +02:00
slurdge
8926114b41 Gitignore more linux profile related files 2019-07-06 16:31:06 +02:00
Iceman
672158e0a5
Merge pull request #225 from slurdge/master
Fix #224
2019-07-06 15:34:34 +02:00
slurdge
5fbbbc30ba Fix #224 2019-07-06 15:31:32 +02:00
Philippe Teuwen
e047d223e4 Fix #216: skip --as-needed linker options under MacOSX 2019-07-06 10:06:04 +02:00
Philippe Teuwen
db572df923
Merge pull request #222 from ViRb3/master
Print help if unknown arg for hitag reader/writer
2019-07-05 00:13:49 +02:00
Victor
773845f411 Print help if unknown arg for hitag reader/writer 2019-07-04 22:12:48 +01:00
Philippe Teuwen
ee222095c3 bt manual: add scan on step 2019-07-04 20:55:24 +02:00
Iceman
660fac3027
Merge pull request #221 from ViRb3/master
Fix clock deadlock in hitag sniff
2019-07-04 12:33:34 +02:00
Iceman
ae4c3374cb
Update default_keys.dic
More keys from 6b6bafed54
2019-07-04 12:33:01 +02:00
Victor
6646c20ef3 Fix clock deadlock in hitag sniff 2019-07-04 11:28:43 +01:00
Iceman
a3962c16c3
Merge pull request #218 from joanbono/master
Added documentation: Compiling for other boards
2019-07-03 21:28:24 +02:00
Slurdge
7205a910c5 Add compiler name in [CLIENT] section 2019-07-03 16:08:09 +02:00