dandri/proxmark3
1
0 Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-10-22 11:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
794 Commits 3 Branches 21 Tags
f595de25e95a66b9cf0e31c1925500db0abdae08
Commit Graph
57 Commits
Author SHA1 Message Date
iceman1001 7bd30f12ac Small fixes, 
Fix: removed a call to free,  which I think made linux people unhappy during "lf t55xx rd 0"...
Add: "lf t55xx fsk"  now kind of outputs binary from "FSK2a R/40 R/50"..
 2014-10-16 15:05:27 +02:00
iceman1001 75465377b9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/iclass.c
	client/Makefile
	client/cmdhficlass.c
	client/loclass/cipher.c
	client/loclass/fileutils.c
	client/loclass/ikeys.h
	include/usb_cmd.h
 2014-09-19 10:50:34 +02:00
iceman1001 f38a152863 First check in. 2014-09-11 23:23:46 +02:00
Martin Holst Swende 3ad48540d4 Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research 
Conflicts:
	README.txt
	armsrc/apps.h
	client/Makefile
	client/cmdhficlass.c
	client/cmdhficlass.h
 2014-06-28 20:52:37 +02:00
iZsh 7cc204bff8 THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand. 2014-06-20 01:02:59 +02:00
Andrew Davies a66fca86b9 Updated proxmark research with Holiman's loclass framework 2014-05-02 11:11:54 +01:00
penturalabs a1f3bb120f Added Kantech ioProx Support 2014-03-18 20:52:48 +00:00
martin.holst@gmail.com 77cd612f15 Added a lua bit manipulation library, added Lua-api to iso 15693 crc-calculation 2013-11-06 18:34:10 +00:00
roel@libnfc.org b1231445c7 removed unused compiler directives, cleaned up some code 2013-10-09 09:59:14 +00:00
douniwan5788@gmail.com b19bd5d689 Add support in 'hf mf mifare' for some unlicensed/compatible mifare card which always answer NACK. 
Change the 'nttmp' start from nt distance 500 to 100 in mifarecmd.c to compatible some unlicensed/compatible mifare card.
 2013-09-29 11:44:07 +00:00
martin.holst@gmail.com 427cdbe2cd Fixed error from r769 where I added -ldl switch for linux, but still forgot to remove it for others... 2013-09-20 10:11:17 +00:00
martin.holst@gmail.com eaea9de900 Removed the -ldl switch from r763, so it only is added for Linux (it apparently caused errors on windows/mingw) 2013-09-19 19:33:56 +00:00
martin.holst@gmail.com 500c972914 Fixed some kind of of linking error 2013-09-01 20:22:22 +00:00
martin.holst@gmail.com cda2a4c0a5 Merged latest trunk changes into scripting-branch 2013-09-01 20:00:56 +00:00
martin.holst@gmail.com a763eb2126 Added a comment 2013-09-01 18:40:08 +00:00
martin.holst@gmail.com 3a4c72fe59 Added lua-mac building, added cleaning of lua files 2013-06-26 11:02:37 +00:00
martin.holst@gmail.com 30a46ed86a Attempt to make the makefile generic, so lua compilation works well also under windows 2013-06-25 20:25:18 +00:00
martin.holst@gmail.com f057bddb70 Added binlib, to handle binary data from lua, based on lpack http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lpack 2013-05-26 20:05:13 +00:00
martin.holst@gmail.com a0655c45bd Added 'core'-api, also added some error handling in scripts 2013-05-24 21:05:45 +00:00
martin.holst@gmail.com 806dc07542 First implementation of user scripts - very experimental - YMMV 2013-05-21 18:37:43 +00:00
roel@libnfc.org 759c16b31f client should compile without warnings on linux, mac, windows 2013-03-14 15:03:04 +00:00
roel@libnfc.org 829fb342b5 uploaded new mingw-proxmark.zip, QT working again, so re-enabled QUI under windows 2013-03-01 14:28:14 +00:00
roel@libnfc.org 54a942b05d merged all patches into CDC repository 2013-02-28 17:04:23 +00:00
roel@libnfc.org 28fdb04fd8 Finally, rewrote bootrom and flasher program, much faster now 2013-02-28 15:11:52 +00:00
roel@libnfc.org 985ef1c315 temporarely disabled QT for winows, no clue why it gives a failure 2012-12-07 11:01:55 +00:00
roel@libnfc.org 902cb3c00b major USB update 2012-12-04 23:39:18 +00:00
roel@libnfc.org db09cb3adb MAJOR update, added hitag2 reader, emulation and eavesdropping, lots of new code, including FPGA tweaks 2012-09-18 13:52:50 +00:00
frederikmoellers@aol.de 5acd09bdfb Basic support for EAC documents (e.g. German Identification Card) 
-new files armsrc/epa.[ch] for ePA (electronic "Personalausweis") related functions
    -Offers elementary functions (EPA_PACE_MSE_Set_AT etc.)
    -Also offers one new USB command: EPA_PACE_Collect_Nonce
-created new command subtree in client: client/hfepa.[ch] ("hf epa")
    -offers "hf epa cnonces" (collect encrypted PACE nonces)
-more to come
 2012-08-28 21:39:50 +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
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 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 f89c705002 improved version of "hf 14a mifare" command 
with merge with utility nonce2key
 2011-05-31 11:31:20 +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 bd84638614 create target for binary file archive (linux version) 2010-05-09 12:17:42 +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 fddf220a8b Add -O3 on the client's side and fix yielding warnings 2010-02-21 20:01:56 +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 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 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
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
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
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