RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-23 00:37:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
6438 commits 3 branches 14 tags 86 MiB
Commit graph

71 commits

Author SHA1 Message Date
Philippe Teuwen f6f14f82d4 Add option -i to flasher to query Pm3 for its memory size, and some doc tuning 2019-07-19 13:02:12 +02:00
slurdge 7bf3255a6c Flasher support for 512K flash 
A better way would be to cut the connecting function and flashing function and to move the whole mem computation to flash.c
Working flasher
 2019-07-19 12:35:04 +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 532dbf28a1 let OpenPm be responsible of setting session.pm3_present 2019-05-07 20:37:23 +02:00
iceman1001 f68a398e42 rename 2019-05-07 11:46:12 +02:00
iceman1001 535559a140 textual 2019-05-03 11:25:55 +02:00
Philippe Teuwen f217b47cbd style 2019-05-02 00:18:20 +02:00
Philippe Teuwen ca43afa19b begin of dynamic capabilities handling in client 2019-05-01 20:48:15 +02:00
iceman1001 5ab9716e77 textual 2019-05-01 06:04:33 +02:00
iceman1001 63d67e2b0f fix: setting pm3_present in flasher. 2019-05-01 05:48:20 +02:00
iceman1001 e6315b88a1 missing 2019-04-30 21:55:43 +02:00
Philippe Teuwen 63cd4a9fbb Merge branch 'better_color_handling' 
* better_color_handling:
  Remove cmd_debug from flasher, we've COMMS_DEBUG_RAW if needed
  Use PrintAndLogEx in flasher
  Simplify color & banner logic
  Smart color handling:
 2019-04-30 21:37:19 +02:00
Philippe Teuwen 27f7057961 Rename few USB -> PM3 to avoid misleading interpretations 2019-04-30 21:10:11 +02:00
Philippe Teuwen a5d05e8d42 Remove cmd_debug from flasher, we've COMMS_DEBUG_RAW if needed 2019-04-30 20:23:22 +02:00
Philippe Teuwen 5c9c38ff71 Use PrintAndLogEx in flasher 2019-04-30 20:19:29 +02:00
Philippe Teuwen 482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen 533667ea6d Better Reply structs 2019-04-17 23:44:48 +02:00
iceman1001 436910605b unified Proxmark3 text 2019-04-16 20:00:25 +02:00
iceman1001 4be92f129a style 2019-04-05 19:13:03 +02:00
iceman1001 ea5dddafef fix: invalidPrintfArg 2019-04-05 18:47:36 +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 da6cdf014b Keep string syntax in color macros 2019-03-10 00:56:00 +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
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 9d91856811 chg: from official 2018-06-17 12:55:32 +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 24482211ad chg: the dot progress is not logged anymore. Force fflush afterwards. 2018-03-05 20:07:29 +01:00
iceman1001 b10dca061a fix: too many arguments to function 2018-01-25 18:01:40 +01:00
iceman1001 f6d2d508b4 rem: removed old references to google code. 2017-10-29 19:25:34 +01:00
iceman1001 2cf3a0adb7 chg: helptext 2017-10-20 18:00:58 +02:00
iceman1001 b99b2dd30f FIX: stderr -> stdout 2017-10-19 13:41:55 +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 7f544803e7 CHG: shorter sleep from 1000 -> 500 2017-10-10 15:00:37 +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 19a2c05de0 FIX: ubuntu complains about sleep... 2017-07-30 09:30:42 +02:00
iceman1001 f28da2da6e monster merge... 
all those changes marshmellow did..  and more...
 2017-07-30 09:17:48 +02:00
iceman1001 83adc96d81 some missing include inttypes.. 2017-07-28 01:37:55 +02:00
iceman1001 5222785d69 some dummy files in order to keep folder structure ok when compiling.. 
removed some comments
 2017-07-27 21:19:39 +02:00
iceman1001 5f18400cbe FIX: 'hf iclass reader' marshmellows fixes. 
CHG:  removing some #define TRUE
 2017-07-07 12:38:49 +02:00
iceman1001 9c624f67b3 chg: @piwi's code cleanup and some more. 
ref: 43534cbad2
 2017-02-23 00:03:10 +01:00
iceman1001 5774b2b44d ADD: added a WIN sample. 2016-04-05 04:48:05 +02:00
iceman1001 93048e8b8b CHG: Added the urls to the new Wiki on github inside the flasher.c usuage text. 
CHG:  Syntax suger
 2016-01-21 08:02:41 +01:00
iceman1001 7838f4beba MERGED: @holimans changes 
MERGED: @piwi changes
MERGED: @marshmellows changes.

I'm not even gonna try write up all that stuff..

ADD: changed some commands inside the "Hf 14a sim" on deviceside.
ADD: @mobeius "two nonce" version for mfkey32.   It is also inside the "hf 14a sim" with the "x" parameter.
 2015-07-22 23:00:52 +02:00
iceman1001 225ccb910e ADD: new defines: iso14443_CMD_AUTH_KEYA, iso14443_CMD_AUTH_KEYB, iso14443_CMD_AUTH_RESPONSE, iso14443_CMD_AUTH_STEP1, iso14443_CMD_AUTH_STEP2, CHINESE_BACKDOOR_INIT, CHINESE_BACKDOOR_STEP2, 
REM: removed old comments in bootrom.c
CHG: mifare ultralight & desfire commands inside arm has been cleaned up. Next step is to refactor it into armsrc/mifaredesfire.c
 2015-01-07 17:42:57 +01:00
iceman1001 f38a152863 First check in. 2014-09-11 23:23:46 +02:00
fnargwibble@gmail.com e654346b79 i'm a retard. no idea why i did it that way! get rid of compile warnings, and print string properly. duh. 2013-10-05 16:55:53 +00:00