RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-15 19:59:34 +08:00
Code Issues Projects Releases Packages Wiki Activity
4268 commits 3 branches 15 tags 87 MiB
Commit graph

174 commits

Author SHA1 Message Date
Oleg Moiseenko
b7fa407830
Merge branch 'master' into fido 2018-11-12 15:06:21 +02:00
merlokk
ab196ad2ee added jansson 2018-11-12 15:00:35 +02:00
merlokk
074c138de7 all works except of jansson private symbols linking 2018-11-08 19:55:51 +02:00
merlokk
f03261be9a compiled. not linking.... 2018-11-08 19:14:30 +02:00
merlokk
4fed815b88 added core files. 
need to add:
1. jansson (maybe needs jansson-devel)
2. arm and client side of exchangeapdu14a
 2018-11-08 17:29:58 +02:00
merlokk
ec1e04342c compiles 2018-11-07 18:31:36 +02:00
merlokk
6ab12db7a0 mbedtls added 2018-11-07 18:05:02 +02:00
merlokk
8bb192fc75 added some crypto 2018-10-26 14:12:20 +03:00
merlokk
61ea3109c9 start merge 2018-10-24 18:18:05 +03:00
merlokk
ab5233d29f now it needs to resolve issues in reveng 2018-10-11 11:48:46 +03:00
Chris
1fb121474e osx: fix annoying focus behaviour (@anticat) 
https://github.com/Proxmark/proxmark3/pull/689

OS X has a global menu bar and a per app dock icon. Therefore, all
GUI applications launched from a terminal will become focused - even
if they don’t show any windows. Thereby the terminal loses focus.

Since is it very annoying to re-focus the terminal after each proxmark
client launch, this change makes the client unfocusable during launch
and restores the regular behaviour when a window is created.
 2018-10-07 09:01:24 +02:00
Chris
7d09a466fb FIX: OSX disable app-nap during serial comm (@anticat) 
https://github.com/Proxmark/proxmark3/pull/687
 2018-10-06 13:29:20 +02:00
Chris
df70619888 chg: turn off FPC specific functions (still work in progress) 2018-09-15 18:33:16 +02:00
Chris
24eaac8681 CHG: the thread comms refactoring from offical pm3 repo 
chg: FPC com speed limited to 115200 when compiled with FPC
chg: USART remake (@drandreas)
 2018-09-06 21:43:20 +02:00
iceman1001
4d8488e14b CHG: https://github.com/Proxmark/proxmark3/pull/631 from offical repo. (piwi) 
CHG: textual adjustments
 2018-07-28 14:25:12 +02:00
Chris
f70b8be5de add: 'sc' - smart card commad [rdv40] 
chg: test to read out firmware
 2018-07-05 10:48:24 +02:00
iceman1001
c15e755e5f add: base64 support 2018-05-23 10:37:11 +02:00
iceman1001
021c0a1349 ADD: 'mem' commands. For RDV40 devices only. 
If you don't have one,  comment out inside client/Makefile this line

CFLAGS += -DWITH_FLASH
 2018-05-03 12:15:03 +02:00
iceman1001
be4c5118b1 chg: remove obsolete data.c 2018-05-02 08:16:59 +02:00
iceman1001
71ce6e07ee CHG: moved trace commands into its own category (from hf) 
'trace list'

there will also the load / save of trace buffer come.

For backwardfunctionality the old commands still works.
 2018-03-18 18:00:41 +01:00
iceman1001
ad99b4f394 add: 'hf list mf' - old 'hf mf sniff' decoding of data has now been incorporated annotations instead. (@merlokk) 
---most likely broke something.. :)  needs proper testing.
 2018-02-14 23:03:39 +01:00
iceman1001
c9479276dc textu 2018-02-07 22:02:04 +01:00
iceman1001
e95313cc22 fix: reveng needs a macro to compile. 2018-02-03 22:58:43 +01:00
iceman1001
52d69ed4ee CHG: refactor CRC16 algos. This is a big change, most likely some parts broke, hard to test it all. 2018-02-01 15:19:47 +01:00
iceman1001
5dc1761943 FIX: solution one, for more avx, avx2, avx512 
ab0582d672
 2018-01-06 18:52:28 +01:00
iceman1001
1a2973a319 fix: 'hf mf hardnested' - crashes on SSE2 with mingw / windows, Huge thanks to @merlokk @pwpiwi for bug and fix! 
https://github.com/Proxmark/proxmark3/issues/404
 2018-01-05 18:01:59 +01:00
iceman1001
dc890104aa fix: spaces, and remove tabs 2017-12-24 10:56:17 +01:00
iceman1001
40b1922187 chg: added emv4 changes. 
broke out the includes into a variable instead. was getting long
 2017-12-24 10:29:50 +01:00
iceman1001
1f637d726f fix to darkside overdue. I needed to remove my old impl.. 2017-12-06 17:15:24 +01:00
iceman1001
0a1a48df01 chg: 'hf mf nack' - extracted in into mifarehost for easier usage in other cmds like 
'hf 14a info'
chg: 'hf mf nack' - changes on devices side from @doegox   Thanks!
 2017-12-05 23:34:52 +01:00
iceman1001
c0f91ddd09 revert... 2017-12-05 18:42:57 +01:00
iceman1001
c8a9813261 fix: better avr512 detection (@pwpiwi) https://github.com/Proxmark/proxmark3/pull/507 2017-12-05 18:28:29 +01:00
Iceman
66e0e18a35
Update Makefile 
Remove all subversionings like  
7.1.1-3   becomes  7.1.1
 2017-12-05 07:29:53 +01:00
iceman1001
e8e3256f7e add: compilation order 2017-11-25 08:03:53 +01:00
iceman1001
8b83db2c1b ADD: 'hf 14a apdu' @merlokk 2017-11-10 20:47:31 +01:00
iceman1001
8136decadd ADD: hooking up the new felica commands 2017-10-10 14:59:58 +02:00
iceman1001
a68887ce2d FIX: #402 https://github.com/Proxmark/proxmark3/pull/402 (piwi) 2017-09-28 22:31:20 +02:00
iceman1001
14550557be CHG: 'emv compilation' since the client makefile doesn't import makefile.common anymore, need to move some compilor directive. Now need to change two files for EMV compilation. 
* client/Makefile
 * common/Makefile.common
 2017-09-18 22:33:22 +02:00
iceman1001
28f1f23d48 chg: easy printing of MAKE variables 
Usage::
  make print-FLASHTOOL
  cd bootrom; make print-APP_CFLAGS
  cd client; make print-GCC_VERSION
 2017-09-18 18:59:51 +02:00
iceman1001
179748a5df add: Fix detection of AVX512 support for Apple clang compiler #392 (piwi) 
de1e68d34b
 2017-09-12 21:45:37 +02:00
iceman1001
6d98779ff8 chg: 'hf 15 read' - nice output and with lock info 
chg: 'hf 15 readmulti' - nicer output and with lock info

You can still break the client if you ask to read too many blocks at one time.
I suggest 'hf 15 dump' instead for that purpose
 2017-09-06 22:04:00 +02:00
iceman1001
dc202ee498 FIX: fixes some off missing chars, now the @GCC_GTEQ_490 contains a 1 or 0. 
ADD:  makefile,   print-%,   added an easy way to output Makefile variables,   you call make with the var you want to print like this::      make print-GCC_GTEQ_490
 2017-08-23 08:12:07 +02:00
iceman1001
2c198f75f5 FIX: gcc version | gcc -dumpversion only exists on later gcc versions. This fix address this problem by using gcc -version instead. Thanks to @winguru 
https://github.com/iceman1001/proxmark3/issues/123
 2017-08-23 07:37:49 +02:00
iceman1001
1d6b0c0c6a fix: compilation error on nethunter (piwi) 2017-08-16 14:15:16 +02:00
iceman1001
6ad546fa13 chg: removed extern on print_lock mutex. Since there is two of these, in proxmark3.c and ui.c 2017-08-11 11:40:25 +02:00
iceman1001
f28da2da6e monster merge... 
all those changes marshmellow did..  and more...
 2017-07-30 09:17:48 +02:00
iceman1001
830796cbef chg: the lualib file mf_default_keys.lua is now automatically created with "make clean && make all". 2017-07-28 02:45:58 +02:00
iceman1001
30b70bb388 adjusted to remove the usb_cmd.lua.. 2017-07-28 02:05:03 +02:00
iceman1001
70b58e46b1 sleep in the makefile , 2017-07-27 21:23:58 +02:00
iceman1001
475a19b937 part of monstermerge. 2017-07-27 20:59:54 +02:00