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

182 commits

Author SHA1 Message Date
Philippe Teuwen
5c55664fc5 use more static and fix [-Wmissing-prototypes] 2019-04-13 21:57:13 +02:00
iceman1001
4572acc1eb cleaning out the helptext 
mingw got some bad asciiarts
 2019-04-13 13:34:02 +02:00
Philippe Teuwen
cbf81cf5c3 remove compilation warning 2019-04-02 22:43:00 +02:00
Philippe Teuwen
64ce30c06c make style 2019-04-02 22:32:45 +02:00
Philippe Teuwen
21be6d4400 FPC: got RX working, got client over usart somehow working..., see detailed commit msg 
* using WITH_FPC:
  * activate basic usart
  * no double buffer for now, no interrupt
  * usart_dataavailable/usart_readbuffer/usart_writebuffer, to demo it:
    * pm3 client over USB, minicom over usart
    * analyse a d 414243
* using WITH_FPC_HOST:
  * it implies WITH_FPC as it's based on it
  * control pm3 with client over usart
  * EXPERIMENTAL! still some frame desync issues
  * you can connect both from usart & USB with two pm3 clients
    * actually you *have* to connect USB for the moment because
      it's used to send debug messages about buggy usart... See Dbprintf_usb below
  * "sessions": msgs are directed to the latest client to have sent a cmd
  * Dbprintf_usb macro to send msgs to USB client to help debugging usart...
  * We now have an option to run client at different speed as usart is 115200:
    client/proxmark3 /dev/ttyUSB0 -b 115200
  * Consequently, argc,argv handling is a bit revamped, it was so messy...
  * USB and flashing are still at 460800, don't try flashing over usart yet ^^
 2019-04-02 22:06:10 +02:00
Philippe Teuwen
961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen
0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen
0d9223a547 client: fix mix of spaces & tabs 2019-03-09 23:35:06 +01:00
Philippe Teuwen
60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
Philippe Teuwen
4dfcb727af cmds history: don't push to history if last command is replayed 2019-03-05 21:15:54 +01:00
iceman1001
ad72a424ef chg: use calloc 2019-01-30 21:40:50 +01:00
Chris
92d89dd539 fix: readline not installed on mac by default.. 2018-11-03 11:10:55 +01:00
Chris
d30454fc5a fix: fflush(stdout), should sort out the blocking pipe problem 
add:  line length (@merlokk)
 2018-11-02 18:27:42 +01:00
Chris
be57354478 chg: seems to be a free bug on macos 2018-09-09 12:36: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
Chris
206ea46483 update text 2018-08-18 12:12:28 +02:00
Chris
1b0a49c8ab chg: from offical 2018-06-17 13:07:00 +02:00
iceman1001
99d7546ca4 @micolous changes 
CHG: - Make all examples platform-specific
CHG: - Remove ModemManager rant on non-Linux platforms

Ref:  e2aa5eb47c
 2018-05-06 22:43:46 +02:00
iceman1001
eb2e3ce681 chg: to debug.. 2018-04-06 23:02:56 +02:00
4m4rOk
2c490063da
Fixed undeclared identifier 
Building the client fails because the identifier "ERROR" is undeclared. Changing it to "ERR" fixes this.
 2018-04-06 22:53:37 +02:00
iceman1001
2aa9372534 CHG: rename of global variable 
CHG: adjusted outputs.
 2018-04-06 09:25:34 +02:00
iceman1001
d0b3f1311e chg: using_history? (suggestion of @pwpiwi) 2018-03-28 20:29:34 +02:00
iceman1001
4dd7c19be1 fix: causes readline to crash a lot on ubuntu 2018-03-21 08:13:07 +01:00
iceman1001
4c666e3832 add: OSX readline fixes ( @micolous ) 
0763239363
 2018-03-17 14:35:34 +01:00
iceman1001
24482211ad chg: the dot progress is not logged anymore. Force fflush afterwards. 2018-03-05 20:07:29 +01:00
iceman1001
184ab1aeab fix: output from reconnect, seems to get stuck and not continue into cli. 2018-02-28 08:23:49 +01:00
iceman1001
a9c652bb6c no need for formatting 2018-02-21 18:20:50 +01:00
iceman1001
a29b2328db fix: g_debugMode - client side global debugvariable, moved to util.c 2018-02-21 15:54:13 +01:00
Brian Pow
e9185085c7 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 21:02:28 +08:00
iceman1001
e6f51451aa chg: added the mutex lock to printing in communications thread. 2018-02-18 10:36:15 +01:00
iceman1001
09b2a079ba chg: enable ansi-colors for OSX 2018-02-06 19:21:47 +01:00
iceman1001
88becf8b09 chg: missed a spot.. showBanner should not be shown on apple 2018-02-06 12:45:38 +01:00
iceman1001
c72548562e chg: remove double exit text 
chg: escape chars didn't work on apple
 2018-02-05 16:38:00 +01:00
iceman1001
1965927009 chg: https://github.com/Proxmark/proxmark3/pull/558 (@pwpiwi) might solve the mystery crashes. 2018-02-01 15:24:36 +01:00
iceman1001
c2725bfa99 chg: enhanced rtrim for command prompt. 2017-12-21 10:08:07 +01:00
iceman1001
b734fe5e18 chg: textual, to fit in @uzlonewolf 's PR texts 2017-12-13 19:58:09 +01:00
iceman1001
994248265d FIX: changing the result booleran when sending over serial. 2017-10-29 19:22:03 +01:00
iceman1001
74842edf1d CHG: flush stdout, https://github.com/Proxmark/proxmark3/pull/443 (@doegox) 2017-10-24 14:27:02 +02:00
iceman1001
666284b130 chg: matching versionnumber... 2017-10-23 23:31:20 +02:00
iceman1001
14cf93f523 chg:... banner.. not showing.. I should rethink sundaymornings coding sessions 2017-10-22 11:27:22 +02:00
iceman1001
dbb392c212 chg: ...NOT showing banner.. before it was enforcing it :) 2017-10-22 11:07:37 +02:00
iceman1001
2aa17c0ddc chg: not showing banner when executing direct from shell 2017-10-22 11:05:25 +02:00
iceman1001
d15cf5ff2f CHG: pip:ing, command, lua, from CLI has less output. 2017-10-21 15:01:23 +02:00
iceman1001
dc23a6d5ce chg: commandline mode execution now has less output 2017-10-21 14:50:29 +02:00
iceman1001
80573aa7f6 fix: 'proxmark3.exe -c zzzzz' command from cli didnt work 2017-10-21 14:24:23 +02:00
iceman1001
5da60668dc chg: Serialnumber is shorter. Will be better for OSX ppl 2017-10-21 13:07:07 +02:00
iceman1001
b27a9920b1 ADD: https://github.com/Proxmark/proxmark3/pull/417 (@merlokk) 
CHG:  https://github.com/Proxmark/proxmark3/pull/434 (@pwpiwi)
 2017-10-20 20:39:57 +02:00
iceman1001
16028f7d33 CHG: appmain now calls cmd_recieve as it should 
CHG: flasher -  removed unneeded parameter to function
CHG: flasher - increased limit to fpga-files that can be loaded
FIX: main client,  wrong windows define fixed.
CHG: device side - recieve usb command does not always get 544 bytes.  usb packages can be incomplete.
CHG: usb_cdc.c also got piwi's changes.
CHG: uart_posix.c removed a debug value
CHG: uart_win32.c clean up.
 2017-10-17 20:58:17 +02:00
iceman1001
d3654ab41c chg: some debug 2017-10-12 15:20:41 +02:00
iceman1001
08bf63c748 fix: double free shouldn't happen now 2017-09-26 22:22:23 +02:00
iceman1001
b18920b9f9 CHG: enables proxmark3 client to reconnect to serial port without exiting / restarting. 2017-09-26 17:04:25 +02:00
iceman1001
f4d703edf0 chg: monero 2017-09-05 15:25:35 +02:00
iceman1001
a971c03877 chg: the version text layout 2017-08-29 08:46:26 +02:00
iceman1001
0fdb3feb19 minor textual chg 2017-08-28 22:31:30 +02:00
iceman1001
292a4ca602 'hf 14b sniff' - removed stuff which wasn't very useful. cleaner now. Not sure if it works :( 
'hf iclass sniff' - playing with this one.  Don't expect it to work yet :(
   - increase dma_buffer_size to 256
   - moved initialization to a own function. Just looks cleaner :)
   - change the debug output to follow MF_DBGLEVEL
'hf mf sniff' - unnecessary cast removed
 2017-08-27 19:41:24 +02:00
iceman1001
3764b02a2e FIX: when running on ssh, client would fail. see https://github.com/Proxmark/proxmark3/pull/387 (thanks @uzlonewolf) 2017-08-27 08:50:55 +02:00
iceman1001
163510ca55 # is not //.... 2017-08-26 13:20:15 +02:00
iceman1001
cd59616e24 banner for linux ppl. 2017-08-26 13:18:34 +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
69b7c149e3 CHG: 'usb communication' voliatile boolean variable to signal between threads isn' threadsafe. Test to switch to the c11 builtin atomic 2017-08-01 09:21:06 +02:00
iceman1001
e598aec890 lf t55xx commands works again. Need to find a better sprinf_bin_break function 2017-07-31 15:12:38 +02:00
iceman1001
f28da2da6e monster merge... 
all those changes marshmellow did..  and more...
 2017-07-30 09:17:48 +02:00
iceman1001
9ca75c1cfd disable some debug output 2017-07-28 03:00:28 +02:00
iceman1001
6ca92fa4ed and the QT part of monstermerge.. 2017-07-27 21:32:15 +02:00
n4k
94ea581d83 Fix missing null byte : my_executable_directory 2017-04-02 20:16:45 +02:00
iceman1001
1b6cc9746e FIX: removing compiler warning about double const. 
thanks to @spaceteddy  ref: https://github.com/iceman1001/proxmark3/issues/83
 2017-02-26 21:28:06 +01:00
iceman1001
6ac2301423 CHG: forgot some changes to previous commit. 2017-02-24 15:00:49 +01:00
iceman1001
3e83ff2159 CHG: '-DWITH_EMV' - fixing some compilation errors when compiling with peter fillmore's emv code. Warning a 256kb Proxmark3 device will only have 7% memory left if you enable this 2017-02-05 21:09:36 +01:00
iceman1001
e772774ba1 chg: more debug statements to find sending errors 2017-02-04 15:02:36 +01:00
iceman1001
d1e197e9ec FIX: the changes to uart.c timings seems to have fixed my problem with the pm3 device getting unresponsive. 
CHG: "script run hard"  now iterates all sectors on the tag and output the table style like "hf mf chkkey" do.
 2016-11-22 01:58:11 +01:00
Gabriele Gristina
0325c12f35 Speedup Mifare Plus Attack v2.1 (stable) 2016-10-21 00:43:43 +02:00
iceman1001
1bf1db845f CHG: syntax suger 2016-10-07 00:17:18 +02:00
iceman1001
ad5bc8cc8c In my attempts to make the LEGIC code better, its not working now. Timings if off. 
CHG: switching to US clock.
CHG: better trace annotation for legic
CHG: Legic prng can now give a x bits in once.
 2016-09-09 11:56:20 +02:00
iceman1001
4b3655e7f4 FIX: spelling misstakes. 
FIX: output of block number should be two digits for nicer layout
FIX: strange branching in the pyramid demod in cmddata.c,  it will now always print the unknown length message
FIX: another go at the coverity scan bug in proxmark3.c. (resource leak for cmd)
 2016-02-27 09:21:19 +01:00
iceman1001
95215e873f FIX: this free call still annoys Coverity Scan. 2016-02-19 22:31:35 +01:00
iceman1001
75cf8623d6 FIX: Undo one of my fixes.. *sigh* need to be more specific when / where to call free. 2016-02-18 20:48:24 +01:00
iceman1001
aacb96d7ed FIX: Coverity scan fixes, hard to keep track of stringlengths while reading and copying in C. 2016-02-17 10:46:08 +01:00
iceman1001
46a33c182d CHG: moved a call to "free" to outside of if-statement. 2016-02-09 14:48:42 +01:00
iceman1001
109def22c8 FIX: Moved a free() call. 2016-01-25 20:22:00 +01:00
iceman1001
87b28d31a1 CHG: Syntax suger 2016-01-20 17:45:42 +01:00
iceman1001
cc3c0a5148 ADD: @piwi's fixes to .history 2015-11-09 21:46:57 +01:00
iceman1001
9783989b40 ADD: pwpiwi 's FPGA compress 2015-06-25 12:22:34 +02:00
iceman1001
64d1b4efc9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/Makefile
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/epa.c
	armsrc/iclass.c
	armsrc/iso14443a.c
	armsrc/iso14443a.h
	armsrc/iso15693.c
	armsrc/lfops.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	armsrc/string.h
	armsrc/util.h
	bootrom/bootrom.c
	client/Makefile
	client/cmddata.c
	client/cmddata.h
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhf14b.c
	client/cmdhf15.c
	client/cmdhficlass.c
	client/cmdhfmf.c
	client/cmdhfmfu.c
	client/cmdlf.c
	client/cmdlfem4x.c
	client/cmdlfhid.c
	client/cmdlfhitag.c
	client/cmdlfio.c
	client/cmdmain.c
	client/data.h
	client/flash.c
	client/graph.c
	client/graph.h
	client/loclass/elite_crack.c
	client/loclass/fileutils.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/lualibs/mf_default_keys.lua
	client/lualibs/utils.lua
	client/mifarehost.c
	client/nonce2key/crapto1.c
	client/proxmark3.c
	client/scripting.c
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
	client/scripts/tracetest.lua
	common/Makefile.common
	common/cmd.c
	common/cmd.h
	common/lfdemod.c
	common/lfdemod.h
	common/usb_cdc.c
	common/usb_cdc.h
	include/usb_cmd.h
 2015-01-29 21:39:33 +01:00
iceman1001
1d660bb993 Added Pm3-master changes from Holiman. 
REM: removed some old test code to cmdhf15 read.
 2015-01-07 23:52:33 +01:00
iceman1001
14edfd09c3 CHG: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault. 
Minor code clean up.
Added from Pm3-master which will make this fork one step closer to Pm3-master.
 2015-01-07 22:51:34 +01:00
iceman1001
002c1ce57a CHG: removed leftover debugging statements proxmark3.c 
CHG: hint from Marshmellow that the flag "-lcrypto" needs be also in CFLAGS.
 2015-01-07 11:10:46 +01:00
iceman1001
9484ff3d6e ADD: tnp3xxx identification in luascripts. 
CHG: minor code clean up.
 2015-01-06 21:20:41 +01:00
iceman1001
10403a6a30 ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list. 
ADD: added a manufacturer list for hf 14a reader,  only viable when UID is double or triple size.  Thanks to Asper for the list.
ADD: Some changes from Holimans commits.
CHG: some more code clean up.
 2015-01-06 11:17:02 +01:00
iceman1001
3fe4ff4f03 CHG: generic code clean up. Removal of commented code. 
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD:  tnp3xx support
ADD:  nxp tag idents.
ADD:  identifiction of chinese backdoor commands to hf 14a reader.
 2015-01-05 15:51:27 +01:00
iceman1001
d3a22c7dfa ADD: Holimans new changes in master. 2015-01-05 02:01:24 +01:00
iceman1001
463ca973e7 FIX: hf mf eload - now supports specifying 0,1,2,4 in card memory for the file to be loaded. 
FIX: hf mf esave - now supports specifying  0,1,2,4 in card memory for the file to be saved.
ADD: data.h -  added FILE_PATH_SIZE constant
ADD: hf legic load - a command help and checks for FILE_PATH_SIZE
ADD: hf legis save - now checks for FILE_PATH_SIZE
ADD: lf hitag - now checks for FILE_PATH_SIZE
ADD: util.c - AddLogLine now checks for FILE_PATH_SIZE
ADD: data load / save  - now checks for FILE_PATH_SIZE
FIX: ui.c - added a case of closing a filehandle
FIX: hf mf cload / csave now checks for FILE_PATH_SIZE
FIX: armsrc/mifarecmd.c - adjusted the buffersize in MifareEMemget from 48 to USB_CMD_DATA_SIZE
 2014-11-16 11:22:06 +01:00
iceman1001
72e930ef32 FIXED: lf t55xx fsk now demods but only to binary. 
ADD:  holimans lf io / hid fskdemod  changes.
 2014-10-23 18:36:44 +02:00
iceman1001
f38a152863 First check in. 2014-09-11 23:23:46 +02:00
Martin Holst Swende
07976a256d Refactoring low frequency operations, now 'lf hid fskdemod' is more stable. Also did changes to handling ioprox tags, this is yet untested, so until it's been tested it should be kept off 'stable' branch 2014-03-31 17:57:14 +02:00
Philippe Teuwen
dec8e8bd9f Provide option -m for markdown help dump, -h for text dump 2014-03-26 23:50:34 +01:00
Philippe Teuwen
6f5dd6010e Fix description in help dump 2014-03-26 22:44:25 +01:00
Martin Holst Swende
57c695563f Fixes to implement generation of markdown auto-generated documentation 2014-03-26 22:39:37 +01:00
Philippe Teuwen
ae7aa73dd5 Add option -h to dump complete set of supported commands 
Usage: ./proxmark3 -h
Display both offline & online commands, online commands are flagged.

git-svn-id: https://proxmark3.googlecode.com/svn/trunk@850 ef4ab9da-24cd-11de-8aaa-f3a34680c41f
 2014-03-26 22:33:11 +01:00
martin.holst@gmail.com
da9d456e9f Minor fix, sometimes when data is sent without the pm3 is connected, it causes a spin-loop condition to occur which blocks the processor. fixed 2013-11-06 18:32:11 +00:00
roel@libnfc.org
981bd4292e integrated MIFARE ultralight features, contributed by 'midnitesnake' 2013-10-11 08:43:23 +00:00