Commit graph

3872 commits

Author SHA1 Message Date
fnargwibble@gmail.com 18856d8894 Navigate a page at a time in plot window 2012-01-23 17:57:42 +00:00
fnargwibble@gmail.com 3bc2349df1 Oops. Fix grid lock when zoomed in or out. 2012-01-21 14:32:39 +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
Merlokbr@gmail.com 23487cd23c 1. update SAK
2. ratte's fix. http://www.proxmark.org/forum/viewtopic.php?id=979
2011-11-04 12:35:00 +00:00
cex123@gmail.com ec09b62d88 2011-10-15 15:15:49 +00:00
caioxmag 6c064e161c small updates to hf mf restore1k 2011-09-19 12:58:58 +00:00
roel@libnfc.org 0f7f9edc14 fixed iso14443b snoop, plus compiling issue of redefined parameter, please take care about this next time before a commit 2011-09-06 10:28:22 +00:00
caioxmag 9d71094388 updates to function hf mf retore1k 2011-09-06 09:16:32 +00:00
roel@libnfc.org e6b8c965bb fix command-line issue generating core dump on OSX 2011-09-05 13:04:11 +00:00
roel@libnfc.org 245e844e80 fix temp changes 2011-09-05 11:48:08 +00:00
roel@libnfc.org 38c4979dae fix compiling under MAC OSX 2011-09-05 11:44:45 +00:00
caioxmag 3d77fdfab5 Dump1k now writes keys to dumpdata.bin even when they are masked with zeroes in a read command 2011-09-02 08:33:45 +00:00
zveriu@gmail.com 1f947c4b09 - Added very basic scripting support to PM3 client-side (proxmark3 application)
- Created several scripts to aid in EML/MFD file conversion
 - Created script which generates PM3-scripts for emulation based on MFD/EML input files
2011-09-01 09:03:20 +00:00
caioxmag 2115626711 Fixes to Mifare nested function... 2011-09-01 08:13:18 +00:00
caioxmag 5ff9150e3b Corrected some errors from r487, WHICH I FORGOT TO COMMENT.
Log for r487 should have been:
"added hf mf dump1k and hf mf restore1k functions"
"modified hf mf nested function to add option to create dumpkeys.bin file from its output"
2011-08-31 07:09:50 +00:00
caioxmag 26fdb4ab49 2011-08-30 09:52:18 +00:00
Merlokbr@gmail.com 0014cb46da 1. emulator works. tested on ARC1302, NXP pegoda, touchtag, my firm's readers.
2. added increment, decrement, restore, transfer commands
3. fixed several small bugs and small code cleaning
4. there is strange behavier in the emulator: for 7BUID is seems that there is must be a feature that cam make work card withouth 2nd anticollision loop. NXP reader authenticates, but cant read card contents. all the rest readers works, BUT.... my 7BUID mifare card dont work AT ALL  .... I dont know what i should do )
2011-06-25 13:03:01 +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
Merlokbr@gmail.com ab8b654efa added functionality: dump card memory, save|load card memory.
50% fixed problem with readline lib
2011-06-22 01:25:16 +00:00
Merlokbr@gmail.com 8556b852ed 1. updated usb commands
2. added abilities to: clear, get, set, load from card, load from nested card emulator dump
3. tried to fix proxmark promt have seen everywhere (not so good)
4. reorganized arm code
2011-06-17 18:39:54 +00:00
Merlokbr@gmail.com 9ca155ba44 0. its alpha version!!!
1. commands changed from "hf 14a" to "hf mf" 
2. some code cleaning and small bugfixes
3. alpha version hf mf sim
4. added internal function GetTickCount() for time measuring
2011-06-10 13:35:10 +00:00
Merlokbr@gmail.com 873014de8a linux patch by Wil
http://www.proxmark.org/forum/profile.php?id=1639
2011-06-07 14:30:07 +00:00
Merlokbr@gmail.com f397b5cc87 1. fixed hf 14a mifare. added functionality to ignore one Nt
2. completed hf 14a nested
3. added hf 14a chk to check keys
5. added check keys to hf 14a mifare and hf 14a nested
6. added debug level to mifare commands
7. small bugs and improvements
2011-06-07 12:35:52 +00:00
Merlokbr@gmail.com 50193c1e3e 1. small bugfix in hf 14a mifare
2. now in cmd  hf 14a mifare - blinks LED_C
3. bugfix in readblock
2. bugfix in USB CommandReceived
3. small improvements
2011-06-01 14:12:11 +00:00
Merlokbr@gmail.com f89c705002 improved version of "hf 14a mifare" command
with merge with utility nonce2key
2011-05-31 11:31:20 +00:00
Merlokbr@gmail.com 4abe4f5867 nested authentication works ok (tested)
and code cleaning
2011-05-26 15:20:03 +00:00
Merlokbr@gmail.com 20f9a2a1d5 1. Mifare read block command
2. Mifare read sector (via 1)
3. Mifare write block
4. fixed several bugs in iso 14443 select
added
Issue 23
Issue 26
2011-05-26 12:55:15 +00:00
dekoninggans@gmail.com cee5a30d53 Added iClass eavesdrop support for Proxmark3 2011-05-18 12:33:32 +00:00
adam@algroup.co.uk 9455b51c2a Issue 20 patch (refactored code of the iso15693 implementation as well as several enhancements) [Adrian Dabrowski "atrox"] 2010-10-19 14:25:17 +00:00
adam@algroup.co.uk 534983d735 iso14a reader patches [Hagen Fritsch] 2010-07-13 13:39:30 +00:00
adam@algroup.co.uk 7e758047e4 iso14a cleanup and implement RATS [Hagen Fritsch] 2010-06-26 08:24:21 +00:00
adam@algroup.co.uk 6c45a008f5 bring snooper into line with new command format 2010-06-26 08:22:42 +00:00
adam@algroup.co.uk 602ac4d7c5 multiple proxmark device support [Mohamed Elsabagh] 2010-05-14 11:04:28 +00:00
adam@algroup.co.uk bd84638614 create target for binary file archive (linux version) 2010-05-09 12:17:42 +00:00
adam@algroup.co.uk 3612a8a8e2 legic write/simulate [Anon] 2010-05-06 11:24:01 +00:00
adam@algroup.co.uk 346ad5fbbb Fix linux GUI crash [Hagen Fritsch] 2010-04-20 08:22:05 +00:00
ksjoberg 15cdabd474 Fix issue 14: mandemod and lf em4x em410xread crashes the proxmark3 client app
This fix is quick-and-dirty since it only reduces the amount of stackspace allocated by changing the data type of the array to uint8_t instead of the 32 bit integers. The reduced number of bits is OK since only (at most) 2 of the available bits are used in each element.

At least array bit utilization is improved from 6.66% to 25% :)

Large structures such as these should probably be malloc()ed.
2010-04-06 13:41:37 +00:00
adam@algroup.co.uk 23e5d20eed strip trailing space in a more strictly correct place 2010-03-08 14:20:05 +00:00
adam@algroup.co.uk 9cb00f305c move trailing space stripping to client/proxmark3.c (per discussion on r426) 2010-03-08 09:16:28 +00:00
adam@algroup.co.uk fcdfc43e1f strip trailing space(s) (may have been added by readline) 2010-03-07 15:25:48 +00:00
adam@algroup.co.uk c6f1fb9dbd revert command offsets now leading spaces have been stripped (thanks iZsh!) 2010-03-06 08:01:08 +00:00
izsh@fail0verflow.com 035303ac5f client/cmdparser.c: Remove the leading spaces before calling the subparser. client/cmdlfhid.c: Modify accordingly. 2010-03-06 00:30:24 +00:00
adam@algroup.co.uk f443ff3ebc fix id offset in hid simulate 2010-03-05 23:39:07 +00:00
marcansoft 66d6ba7057 Get rid of flasher memory leak
Too bad the proxmark usb code still has a bajillion :(
2010-02-26 15:13:58 +00:00
marcansoft 0ae6234a5b Remove remnant junk and TODO -> FIXME 2010-02-26 14:08:54 +00:00
marcansoft 8fe1a992c7 New flasher, much more paranoid and much more correct.
Knows how to merge segments to solve the "data overwrites last text
block" issue.

Removed "partition" stuff. Now it just flashes any elf file you pass,
though there's still a -b option required to explicitly enable flashing
the bootloader.
2010-02-26 14:03:43 +00:00
marcansoft 85f2819c8a Add extra elf.h constants 2010-02-26 14:02:08 +00:00
marcansoft 4e3e51b612 Add beginnings of hopeful endian-independence 2010-02-26 14:01:51 +00:00
izsh@fail0verflow.com 212ef3a04d Apply copyright patch from Michael Gernoth 2010-02-25 21:57:35 +00:00
izsh@fail0verflow.com 243dc69001 Fix memset warning 2010-02-24 20:47:32 +00:00
izsh@fail0verflow.com 9e13f87517 Fix a couple of warnings 2010-02-24 20:34:13 +00:00
izsh@fail0verflow.com e3e96e56df client/Makefile: Typo for Darwin 2010-02-24 20:33:55 +00:00
izsh@fail0verflow.com 8691f5b7bb Fix QT compilation for Windows/MinGW and update the compilation instructions accordingly. 2010-02-24 19:33:29 +00:00
izsh@fail0verflow.com 9cc7c4b4d1 client/COMPILING: move to /COMPILING and add instructions to be able to compile the firmware as well. 2010-02-23 22:10:35 +00:00
izsh@fail0verflow.com 13bb3b4b11 client/COMPILING: Simplify dev. environment initial setup for Windows (WORK STILL IN PROGRESS) 2010-02-23 20:55:35 +00:00
izsh@fail0verflow.com 913d23c661 client/cmdlfem4x.c: Fix a warning about probable uninitialized variable with gcc 4.4 2010-02-23 20:52:50 +00:00
d18c7db 7b93d91671 Updated missing lib in ProxSpace 2010-02-22 03:54:44 +00:00
d18c7db 72de52ee7b Updates for new MinGW ProxSpace environment 2010-02-22 01:56:15 +00:00
izsh@fail0verflow.com fddf220a8b Add -O3 on the client's side and fix yielding warnings 2010-02-21 20:01:56 +00:00
d18c7db 428ee1df57 Updated COMPILING 2010-02-21 07:45:59 +00:00
d18c7db b97a3d994b Windows specific instructions regarding the compile environment. 2010-02-21 06:54:43 +00:00
izsh@fail0verflow.com 62b1302c97 client/Makefile: Cosmestic changes. 2010-02-21 01:07:11 +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 46cd40465a /client/Makefile: Output object files to the obj subdir. 2010-02-21 00:16:42 +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 cbb03be993 Oops forgot a file 2010-02-20 00:38:24 +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
d18c7db 3ec3a4724e Removed hackish usb.h file, re-added Info.plist 2010-02-19 23:24:49 +00:00
d18c7db baf39b0f16 Not a source code file 2010-02-18 08:32:41 +00:00
d18c7db 393c3ef933 Attempt at getting the windows client to at least compile without bombing out with errors, may not be fully usable, e.g. plot window doesn't come up, etc 2010-02-18 08:24:26 +00:00
adam@algroup.co.uk fffad860fc fix output inversion in mandemod 2010-02-15 21:15:52 +00:00
adam@algroup.co.uk dbf444a179 missing parameter in 'threshold' command help 2010-02-08 22:02:18 +00:00
adam@algroup.co.uk 33984c6a82 fix 'data load' filename pointer 2010-02-08 17:37:02 +00:00
izsh@fail0verflow.com 8381984556 Cosmetic changes, replace mismatched indentation 2010-02-08 11:58:40 +00:00
adam@algroup.co.uk 5d5311a223 command parser shortcuts e.g. 'd p' will call 'data plot' (from rumpeltux) 2010-02-08 09:23:39 +00:00
adam@algroup.co.uk 590f8ff949 get rid of implicit declaration warnings 2010-02-07 00:31:32 +00:00
izsh@fail0verflow.com 5a956258d3 alphabet ;) 2010-02-06 18:24:22 +00:00
adam@algroup.co.uk 26aa7d73ad damn that alphabet! 2010-02-06 18:11:49 +00:00
adam@algroup.co.uk 8d183c53b6 merge 'lfsamples' and 'hfsamples' into 'samples' 2010-02-06 18:06:31 +00:00
adam@algroup.co.uk ab2fd3d68b streamline CmdEM410xWatch 2010-02-06 18:05:05 +00:00
adam@algroup.co.uk a2b1414f43 Andreas fix for LEGIC MIM1024 2010-02-06 09:43:33 +00:00
adam@algroup.co.uk 83a9b236fe fix warning: implicit declaration of function ‘exit’ 2010-02-06 09:33:17 +00:00
adam@algroup.co.uk 313322658c FIXME: will crash if sample buffer does not contain valid legic data (fixed by Sourcerer) 2010-02-05 20:08:02 +00:00
izsh.f0f 41dab15305 Alphabetical order ;) And cosmetic changes (remove duplicated includes) 2010-02-05 17:16:14 +00:00
adam@algroup.co.uk 669c1b80c5 add LEGIC decoder (submitted by Sourcerer, untested by me) 2010-02-05 13:56:33 +00:00
izsh.f0f 535b5a59bd Change -std=c99 to -std=gnu99 to be able to compile libusb-0.1.* which uses u_int*_t and PATH_MAX 2010-02-05 11:16:07 +00:00
adam@algroup.co.uk c59c3405ec wun day i'll lern my alfabet 2010-02-05 08:29:09 +00:00
adam@algroup.co.uk 8e220a9126 put legic back in the system and add rumpletux's fast legic / prng code from forum 2010-02-05 08:18:02 +00:00
izsh.f0f 040a7baad0 client/cmdparser.c: Cosmetic changes.
client/cmdlf.c: Add missing include for "WaitForResponse".
2010-02-05 01:06:53 +00:00
adam@algroup.co.uk 37239a7c4b differentiate commands and sub-menus in help 2010-02-05 00:17:38 +00:00
adam@algroup.co.uk bdd1de1b02 make LF sampling ACK to fix USB timing issue in em410xwatch 2010-02-04 23:15:53 +00:00
adam@algroup.co.uk c37d2e7078 make parser slightly more user friendly (default to 'help') 2010-02-04 22:51:02 +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
adam@algroup.co.uk 6982ac2612 fix USB send data timing issue in CMD_DOWNLOADED_SIM_SAMPLES_125K 2010-01-29 09:28:47 +00:00
adam@algroup.co.uk 13a79da4e9 add 'losimman' command - simulate arbitrary Manchester encoded LF tags 2010-01-28 11:49:05 +00:00
bushing cef938d883 fix a stack overflow in the flasher routine (my bad) 2010-01-27 09:25:37 +00:00
daniel.boteanu 044a375b95 Added offset feature to hexsamples command 2010-01-14 23:11:31 +00:00
d18c7db 815f3f2559 Decreased BigBuff mem, some elf flasher fixes (needs more work) but flashing correctly currently. 2010-01-10 03:57:41 +00:00
daniel.boteanu 1eb7596aad Added hitune command for continuously measuring HF antenna tuning 2010-01-09 14:59:42 +00:00
bushing 8b576d2d31 first attempt at grouping commands into categories based on what I think they do
I could really use some help here, since I don't actually understand what every
command does :(
2010-01-07 04:39:12 +00:00
bushing 107ec6e4b5 fix broken formatting in command table 2010-01-07 04:09:27 +00:00
bushing 3210b50ec6 enable indalademod and vchipdemod in offline mode 2010-01-07 04:06:42 +00:00
izsh.f0f b961ef035a client/elf.h: Add missing Elf32_Phdr struct to compile under Mac OS X. client/flash.h: Add missing header ifndef. 2010-01-05 12:32:44 +00:00
bushing 2cab856f9f removed support for s19 files in the flasher and replaced it
with elf parsing.  can we stop specifying the "partition" yet?
2010-01-05 00:02:12 +00:00
bushing 6e4d4ee609 refactor flashing code into flash.h, so we can share it between platforms 2010-01-04 05:11:08 +00:00
d18c7db 1e1b303093 Fixed some compile warnings in client, minor tidy up with some dbprintf statements 2010-01-04 03:08:45 +00:00
bushing f39c4119e0 Fix QT CXXFLAGS/LDFLAGS 2009-12-30 00:49:27 +00:00
roel@libnfc.org fa03a110e9 mifare client update 2009-12-30 00:11:23 +00:00
henryk@ploetzli.ch 1d99b0df4a Remove LEGIC RF tag emulation code since it's useless without keystream generator 2009-12-28 18:18:25 +00:00
roel@libnfc.org 249deb42a0 cleaning up endless copy-paste of trace functionality 2009-12-28 00:15:38 +00:00
bushing 5ed2c738ed fix Mac build to use Qt framework
(e.g. http://get.qt.nokia.com/qt/source/qt-mac-cocoa-opensource-4.6.0.dmg)
2009-12-27 23:27:29 +00:00
henryk@ploetzli.ch 55a69489cd Properly exit usb thread (e.g. on Ctrl-D) 2009-12-22 20:32:40 +00:00
bushing 59936251ff remove some straggling files and fix paths in cockpit batch files 2009-12-22 13:05:32 +00:00
bushing 022c8791c1 fixes to make it work properly on the Mac 2009-12-22 12:54:24 +00:00
bushing 940a20122d merge makefiles into one 2009-12-22 12:52:02 +00:00
bushing f11f5c2738 fix target name for Windows compile 2009-12-22 12:47:10 +00:00
bushing 9b25560889 lean up event model so that this will work under OS X (and hopefully Linux)
still need to refactor some stuff -- lots of code duplication here that
we can get rid of
2009-12-22 12:46:04 +00:00
bushing aa81a8d3f1 rename ReceiveCommandP -> ReceiveCommandPoll for consistency 2009-12-22 12:44:38 +00:00
bushing a99c6a1921 There's no painless way to do this, but it needs to be done --
the only reason any of the Windows code was in CPP files was
because the MS compiler doesn't support C99.  Switch to using
MinGW, and that problem goes away, so we can rename the files back.
2009-12-22 12:42:54 +00:00
bushing a146075d74 remove most of the references to translate.h 2009-12-22 12:35:36 +00:00
bushing 3a8464f067 change usb_cmd struct to be more sane
wean ourselves off translate.h
2009-12-22 12:34:24 +00:00
bushing cd00aa3043 merge linux and windows clients into one directory... will consolidate makefiles shortly 2009-12-22 12:11:15 +00:00