Commit graph

10044 commits

Author SHA1 Message Date
Bjoern Kerler
b0d969da24 Fix unsigned vs. signed 2020-06-13 16:55:30 +02:00
Bjoern Kerler
1ca5706c59
Merge pull request #5 from RfidResearchGroup/master
Update
2020-06-13 15:12:16 +02:00
Bjoern Kerler
631be7af32 Fixes 2020-06-13 15:11:10 +02:00
Philippe Teuwen
797fa7d01a Tolerate exit-like calls from embedded Python script
Now sys.exit(0) is silently accepted, while
quit() / raise SystemExit / sys.exit() / sys.exit(n) / exit()
will output sth a warning such as
"Script terminated by SystemExit -1"

Still, don't call os._exit(0), it immediately exits.
2020-06-13 14:53:47 +02:00
Bjoern Kerler
e0bf636aaf Make style 2020-06-13 14:25:40 +02:00
Bjoern Kerler
5adc8e876a Fix DES authentification and format picc 2020-06-13 14:19:21 +02:00
Philippe Teuwen
494a28da1c
Merge pull request #784 from HeroCC/patch-1
Additional CharlieCard Key
2020-06-13 11:15:50 +02:00
Conlan
e8c88d47ef
Additional CharlieCard Key 2020-06-12 20:01:55 -04:00
Philippe Teuwen
25fb6df229 Android cross-compilation to client cmake 2020-06-12 23:28:38 +02:00
iceman1001
94403bee59 textual 2020-06-12 22:49:42 +02:00
iceman1001
2bb110fef3 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-06-12 22:35:18 +02:00
iceman1001
9c6ce5be50 chg: "hf mf cwipe" - speed up using backdoor wipe cmd 2020-06-12 22:35:08 +02:00
Philippe Teuwen
020c6882ce colors 2020-06-12 19:52:13 +02:00
Philippe Teuwen
8c5be2678f Yet another color management, settings autodetection done earlier 2020-06-12 19:45:18 +02:00
Philippe Teuwen
30c0345c31 Fix fix colors 2020-06-12 18:21:03 +02:00
Philippe Teuwen
bb5c588935 Fix colors detection under Windows (when no ref & when redirected IOs) 2020-06-12 18:17:39 +02:00
Philippe Teuwen
ce61b67910 Remove spurious color 2020-06-12 18:01:06 +02:00
iceman1001
e71e70bd9d minor 2020-06-12 17:50:11 +02:00
iceman1001
20c46d1af5 chg: in order to be able to upgrade fw on smartcard it must be available 2020-06-12 17:49:52 +02:00
iceman1001
60c47a7e7d textual 2020-06-12 17:29:34 +02:00
iceman1001
09188221a8 textual 2020-06-12 09:51:24 +02:00
iceman1001
9ba03aec74 fix: "emv scan" - better fix for filename 2020-06-12 09:44:50 +02:00
iceman1001
cdbe6bc35b fix: "emv scan" - now dont save in execution folder 2020-06-12 09:27:55 +02:00
Bjoern Kerler
3bd14424ab
Merge pull request #4 from RfidResearchGroup/master
Update
2020-06-12 08:21:51 +02:00
Philippe Teuwen
def55011be and the other one... 2020-06-12 02:02:53 +02:00
Philippe Teuwen
d229364a21 Variant for fix #777 independent of sentence and nr of com port digits 2020-06-12 02:01:27 +02:00
iceman1001
47262ce1e9 fix #777 thanks @doegox 2020-06-12 01:34:42 +02:00
iceman1001
c460dcf12d test prox 2020-06-12 00:37:48 +02:00
iceman1001
6dc0aa53c7 textual... 2020-06-11 20:58:31 +02:00
iceman1001
c716bb9e31 textual, color, and "hf iclass info" does something 2020-06-11 20:11:44 +02:00
iceman1001
6a8ea64feb text 2020-06-11 19:53:21 +02:00
iceman1001
fc5feffa4b color 2020-06-11 19:23:15 +02:00
iceman1001
3832cf26fd color 2020-06-11 19:20:59 +02:00
Philippe Teuwen
ed2ff985bf
Merge pull request #776 from slurdge/pmlog
Happy colors for messages coming from pm3
2020-06-11 16:30:38 +02:00
slurdge
5f148bb835 Happy colors for messages coming from pm3 2020-06-11 16:21:27 +02:00
Philippe Teuwen
644b88faf4
Merge pull request #775 from slurdge/patch-1
Add stack size to CHANGELOG
2020-06-11 15:18:54 +02:00
slurdge
688d3388ba
Add stack size to CHANGELOG 2020-06-11 13:55:34 +02:00
Philippe Teuwen
54cbaf5b87 textual 2020-06-11 13:24:55 +02:00
Iceman
291238a2f0
Merge pull request #772 from slurdge/bigbigbuf
[WIP] Make BigBuf take dynamically the available space with a fixed (4K) stack
2020-06-11 13:09:20 +02:00
slurdge
05ed3f7018 Second try to fix appveyor 2020-06-11 12:12:20 +02:00
slurdge
53c5456f7a Fix ptr arithmetic hopefully 2020-06-11 11:35:15 +02:00
slurdge
35857f535d Compute the max usage 2020-06-11 11:14:53 +02:00
Philippe Teuwen
150017ce09
Merge pull request #773 from lukaskuzmiak/madv2-fixes
Mifare MADv2 fixes
2020-06-11 01:21:58 +02:00
Philippe Teuwen
73b6138f7f cmddata: Adjust bigbuf size on client side as before but fix 1b overflow 2020-06-11 01:18:50 +02:00
Lukas Kuzmiak
edff230d55 fix a bug in MADInfoByteDecode (did not return 0x00), textual fixes 2020-06-10 14:59:53 -07:00
slurdge
3b757a627b Increase stack to 5KiB 2020-06-10 23:03:17 +02:00
slurdge
c11c7ab545 Add support for client getting bigbufsize 2020-06-10 23:03:03 +02:00
iceman1001
6f1c074801 textual 2020-06-10 22:47:47 +02:00
slurdge
df4bdc89ea Fix BIGBUF_SIZE used in #WITH_FLASH 2020-06-10 19:06:40 +02:00
slurdge
cba76ca167 Fix stacksize & make common area size a variable 2020-06-10 14:06:45 +02:00