Commit graph

2124 commits

Author SHA1 Message Date
pwpiwi ad939de501
USB comms: part 4 towards @micolous PR #463
* make uart_communication(), storeCommand() and getCommand() static in comms.c
* move receiver thread creation and respective mutexes to comms.c
* add mutex and signal for tx buffer
* use comms.c for flasher as well
* remove comm functions from client/proxmark3.h
* this completes isolating all USB communication related functions in comms.c
* don't assume a port to be defined by a name. Change parameter in OpenProxmark() to void*
* comms.c: set sp and serial_port_name to NULL when offline
2018-06-03 14:25:20 +02:00
Fl0-0 9b4661c53b Delete .DS_Store (#613)
Mac hidden file accidentally merged in PR #593.
2018-05-29 18:05:32 +02:00
Dominic Celiano 803674b2d6 Added mifarePlus.lua script for communication with Mifare Plus. (#593)
Personalize MifarePlus EV1 cards
2018-05-28 21:32:48 +02:00
marshmellow42 e8924be8ba fix gui (plot) bugs (#604)
G keypress event would cause a crash if no data
Q keypress didn't work.

Thanks to @iceman1001 for identifying and providing the fixes.
2018-05-15 08:19:49 +02:00
pwpiwi 0000a4cda2
fix HitagS simulation erors (issue #605) (#606) 2018-05-11 05:24:02 +02:00
pwpiwi babca445ff
rework of GetFromBigBuf() (#597)
* this should fix crashes reported in issue #497
* don't allow receiver thread to write directly into arbitrary main thread's memory
* instead use cmdBuffer[] for CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K as well
* add timeout and warning options to GetFromBigBuf(), same as in WaitForResponseTimeoutW()
* move GetFromBigBuf() from data.c to comms.c
* remove data.c and data.h
2018-05-08 07:54:49 +02:00
Iceman 03cdcca03f
Merge pull request #600 from marshmellow42/master
more graceful exit to lf search if no signal found
2018-05-05 06:59:39 +02:00
marshmellow42 a468b4277a more graceful exit to lf search if no signal found 2018-05-04 23:54:01 -04:00
pwpiwi e475fce44d
Update CHANGELOG.md 2018-05-04 08:25:08 +02:00
pwpiwi dbac9ffb40
Change driver file proxmark3.inf to support both old and new Vendor/Product IDs
(see http://www.proxmark.org/forum/viewtopic.php?pid=32072#p32072)
2018-05-04 08:19:37 +02:00
marshmellow42 854fdf15e0 fix bug if -DWITH_ISO14443a_StandAlone is removed from makefile (#598) 2018-05-03 19:36:51 +02:00
pwpiwi 818efbebb8
USB comms: part 3 towards @micolous PR#463
* change variable 'sp' from global to static
* move code to open and close USB port to comms.c (OpenProxmark() and CloseProxmark())
* change scope of USBCommandReceived() to static
* (flasher still unchanged)
2018-04-28 10:09:16 +02:00
pwpiwi 61aaee35cc
USB comms: part 2 towards @micolous PR#463 (#595)
* change variable 'offline' from global to static
* change variable 'FlushAfterWrite' from global to static
* remove unused global variable 'current_command'
* WaitForResponseTimeoutW(CMD_UNKNOWN, ...) waits for any command
* #include "printf.h" or <stdio.h> in iso15693tools.c to define sprintf()
* and some minor changes/comments
2018-04-24 08:27:29 +02:00
Tom Harkness e069547c27 Fix for swapped parity when using lf_bulk_program.lua (#591) 2018-04-03 08:14:51 +02:00
pwpiwi f5ecd97b15
USB comm: prepare for @micolous change (PR#463) (#587)
* move communication related code from proxmark3.c and cmdmain.c to new file comms.c
* replace byte_t by uint8_t in uart_posix.c and uart_win32.c
* move OpenProxmark() and CloseProxmark() from flasher.c to flash.c
* move print_lock mutex including initializer to ui.c
* minor changes in printing help texts
* no changes in comms functionality yet
2018-03-31 09:52:43 +02:00
pwpiwi 3bcc4d77e1
add: save and load options in hf list (#577) 2018-03-30 17:55:41 +02:00
AnthraX1 53c7a7053d Fix empty key list bug in mfkeys.lua (#579)
When input key list size is greater than 85, table.concat() returns empty because the last parameter is the end offset not the increment value.
2018-03-30 17:54:45 +02:00
pwpiwi 3316fc1d11
Merge pull request #589 from Proxmark/revert-588-indala-preamble-fix
Revert "Fix offset Indala UID display"
2018-03-28 14:58:46 +02:00
marshmellow42 7ecf7cf6cc
Revert "Fix offset Indala UID display" 2018-03-28 08:50:08 -04:00
Iceman 6c7a3bd7ce
Merge pull request #588 from megabug/indala-preamble-fix
Fix offset Indala UID display
2018-03-28 13:10:33 +02:00
Matthew Daley b05611a30b Fix offset Indala UID display
Commit 1dae9811f2 extended the amount of
fixed bits searched for when decoding 64-bit Indala. These additional
bits come from the end of one UID, and therefore need to be skipped past
when actually retrieving the UID.
2018-03-28 23:43:57 +13:00
James Chambers b24930c764 mfu read block: retry block with bad CRC (#584)
* mfu read block: retry block with bad CRC, command timeout, or unknown response.
2018-03-23 20:26:30 +01:00
Michael Farrell a5a830168f OSX: Multiple libedit/readline fixes (#585)
* OSX: Multiple libedit/readline fixes.
2018-03-21 16:05:03 +01:00
W8M2Hg9lLmWqXSGC 51d51c6782
Merge pull request #580 from Proxmark/iceman1001-patch-1
Update README.md
2018-02-26 17:25:21 +11:00
Iceman d4d439a8aa
Update README.md
Added hackerwarehouse
2018-02-26 07:16:08 +01:00
Iceman c50e55a4a5
Merge pull request #578 from Tom5ive/master
fix for swapped parity bits
2018-02-22 14:08:33 +01:00
Tom Harkness f43b1038a2 fix for swapped parity bits 2018-02-22 23:38:53 +11:00
Iceman b8196bf8ee
Merge pull request #565 from Proxcloud/usb_android
Allow non-root access on Android devices
2018-02-17 12:39:19 +01:00
Iceman d6e5b54f40
Merge pull request #572 from merlokk/hflistms_fix
`hf list mf` fix key length in printf
2018-02-14 23:36:41 +01:00
merlokk 738ed6e476 small fix 2018-02-15 00:20:00 +02:00
merlokk 6dec58aa44 small fix hf list mf 2018-02-15 00:18:02 +02:00
Iceman 902c470d38
Merge pull request #571 from merlokk/hf_list_mf
added command `hf list mf`
2018-02-14 22:06:29 +01:00
Iceman f69f1de80c
Merge pull request #570 from marshmellow42/master
improve lf cmdread
2018-02-14 22:06:00 +01:00
marshmellow42 2896e490d9 update changelog
+fix a comment typo
+ move clear bigbuf after fpgadownloadandgo...
2018-02-14 15:41:39 -05:00
merlokk 079563a092 small fix and added line to changelog. 2018-02-14 12:36:22 +02:00
merlokk 868deeb783 move annotate* functions 2018-02-13 17:14:51 +02:00
merlokk 45b4ac09c9 added hardnested sketch. final cleaning. 2018-02-13 17:07:49 +02:00
merlokk 0113dcf3fd nested works 2018-02-13 15:12:41 +02:00
merlokk 8253ca0e1b code cleaning 2018-02-13 12:35:33 +02:00
merlokk 597fca4ff1 check parity works 2018-02-13 12:33:15 +02:00
merlokk 2d7bdee30b added parity check of deciphered command 2018-02-12 18:53:12 +02:00
Oleg Moiseenko bf52d74adc small fix 2018-02-11 00:45:12 +02:00
Oleg Moiseenko 856da9a1c0 added cipherstream recovery 2018-02-11 00:44:24 +02:00
Oleg Moiseenko e01bc7942c move ks to authdata 2018-02-11 00:40:24 +02:00
marshmellow42 779d9a0e90 reconfigure lf cmdread ...
to use lf config settings instead of it's own settings.  (now allows
full options of lf config...)

also it will now run `data samples` when the command completes making it
not necessary to run manually...

note: adjusted client wait message as it was confusing.
2018-02-10 17:30:32 -05:00
Oleg Moiseenko 7bea15816e added some cone in nested. not tested. 2018-02-11 00:28:23 +02:00
Oleg Moiseenko e0158d3373 added destroy 2018-02-10 23:28:15 +02:00
Oleg Moiseenko dca8220f72 mock of key checking 2018-02-10 23:25:28 +02:00
Oleg Moiseenko c6a886fb4f added mock of key check 2018-02-10 23:06:01 +02:00
Oleg Moiseenko 747885a6ed hf list mf 1st auth works 2018-02-10 22:33:32 +02:00