github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 12:59:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
2303 commits 3 branches 11 tags 34 MiB
Commit graph

24 commits

Author SHA1 Message Date
Fl0-0
994f21fe01 Fix format-truncation warning, missing string.h inclusion and strnlen warning (#723) 
* Fix format-truncation warning, missing string.h inclusion and strnlen warning

* Dynamic string width field
 2018-11-30 09:03:44 +01:00
Oleg Moiseenko
6b882a3918 Fido U2F complete (#716) 
* add pkwrite
* asn1print
* asn1dump and CA
* added PrintAndLogEx for merge commits between repo easier than now
* changelog
 2018-11-25 16:56:12 +01: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
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
Michael Farrell
a5a830168f OSX: Multiple libedit/readline fixes (#585) 
* OSX: Multiple libedit/readline fixes.
 2018-03-21 16:05:03 +01:00
Michael Farrell
3775e9e865 Allow externalisation of PrintAndLog (#506) 2017-12-28 18:27:39 +01:00
pwpiwi
3851172d81 Revert "Comms refactor (prerequisite of libproxmark work) (#371)" (#450) 
This reverts commit afdcb8c159.
 2017-10-27 09:56:46 +02:00
Michael Farrell
afdcb8c159 Comms refactor (prerequisite of libproxmark work) (#371) 
* Refactor the comms code only from PR#346, without comms_globals.h.
* OSX: Add note for example serial port
 2017-10-26 21:54:27 +02:00
Michael Farrell
ed50f7f327 OSX: Disable GNU readline-specific hack when libedit is used (fixes #110) 2017-06-25 12:26:33 +10:00
marshmellow42
b8fdac9e6f apply @holiman s graph changes + 
add demod data to graph.
some bugs are known:
if you close the graph window data plot will not bring it back.
exiting the application without closing the widget form results in
error.
autocorrect graph y labels are ugly
form has old askdemod tab.
sticky button purpose not defined/labeled well.
doesn't clear s_Buff when new graph loaded or sampled.
probably more...
 2017-04-12 14:35:07 -04:00
marshmellow42
3fe7103959 proper initialized values 2017-04-11 21:51:31 -04:00
marshmellow42
0f321d631a align clock grid with demods on graph 2017-04-11 10:34:43 -04:00
pwpiwi
acf0582d53 Provide msclock() as Milliseconds timer for performance measures (#231) 
- don't use clock(). It has different functionalities in Windows and Linux
- move sleep functions to util.h
 2017-03-12 15:06:27 +01:00
marshmellow42
f9f0e83b7c Add 2 pre-setable markers for the graph 2017-02-28 15:53:33 -05:00
martin.holst@gmail.com
ed77aabe00 Patch from 'buzzy' to add automatic flushing of output, see http://www.proxmark.org/forum/viewtopic.php?id=1740 for more details. 2013-10-08 18:30:01 +00:00
micki.held@gmx.de
9492e0b098 Major rework of hf mf nested: 
- PM: used GetCountMifare in MifareNested() for improved timing accuracy and to deliver better quality nonces
- PM: MifareNested now delivers exactly two different nonces to avoid time consuming multiple lfsr_recovery32() on client side
- Client: replaced quicksort by bucketsort in crapto1.c which is faster 
- Client: use multithreading (two parallel calls to lfsr_recovery32())
- Client: fixed a small bug in mfnested() (always showed trgkey=0)
- Client: introduced a mutex for PrintAndLog() to avoid interlaced printing
Minor rework of hf mf chk:
- Avoid time consuming off/on cycles. Send a "halt" instead.
 2013-09-15 09:33:17 +00:00
fnargwibble@gmail.com
7ddb990032 Add plot window keystroke help 
Add grid display/lock commands to plot window
 2012-01-21 13:32:54 +00:00
roel@libnfc.org
e6b8c965bb fix command-line issue generating core dump on OSX 2011-09-05 13:04:11 +00:00
Merlokbr@gmail.com
51969283ec 1. fixed (it seems) readline behavior. Now there is no proxmark3 prompts on the data. 
2. emulator goes into beta stage.
works:
- work with 4BUID and 7BUID dumps
- load/save/grab dumps
- emulate select
- emulate authentication (with nested)
- emulate read/write blocks
- emulate NACK-ACK ping-pong
 2011-06-23 16:49:39 +00:00
izsh@fail0verflow.com
212ef3a04d Apply copyright patch from Michael Gernoth 2010-02-25 21:57:35 +00:00
izsh@fail0verflow.com
a553f26748 Add License/Copyright headers/notices. Please add your own copyright notice if you have made any nontrivial changes or additions to the code. There are several files without any attribution, currently. 2010-02-21 00:47:22 +00:00
izsh@fail0verflow.com
4cd41f34ea Removing windows specific code. Everything now compile and work the same for the three OS 2010-02-20 23:35:09 +00:00
izsh@fail0verflow.com
91c38cf715 Fix windows compilation issues. But still not final. We should move to pthread and factorize the code with *nix). Ideally we should move to libusb-1.0 too. 2010-02-20 00:36:48 +00:00
izsh.f0f
7fe9b0b742 Client cleanup and restructuring. Stage 1... 
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.

The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P

The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.

Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)

client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.

client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.

client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.

client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.

include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.

common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.

armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.

common/Makefile.common, armsrc/Makefile: Modify accordingly.
 2010-02-04 01:27:07 +00:00