Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-09-22 07:46:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
1953 commits 3 branches 11 tags 34 MiB
Commit graph

139 commits

Author SHA1 Message Date
menshiyun 5bac3d9b3c fix client/Makefile 2016-09-25 14:32:06 +08:00
menshiyun 94e27a0961 fix client/Makefile 2016-09-25 14:26:11 +08:00
menshiyun 775c4c4a28 test-pr 2016-09-24 12:56:08 +08:00
Johnny Bengtsson 887f6ab4b3 Better Linux compilation compability 
Addition of the termcap and ncurses libraries fixes the compilation issue on Slackware Linux 14.2.

/usr/lib64/gcc/x86_64-slackware-linux/5.4.0/../../../../lib64/libreadline.so: undefined reference to `PC'
collect2: fel: ld returnerade avslutningsstatus 1
Makefile:132: receptet för målet "proxmark3" misslyckades
make[1]: *** [proxmark3] Fel 1
make[1]: Lämnar katalogen "/home/github/proxmark3/proxmark3/client"
Makefile:12: receptet för målet "client/all" misslyckades
make: *** [client/all] Fel 2
make: Lämnar katalogen "/home/github/proxmark3/proxmark3"
 2016-09-12 16:03:46 +02:00
marshmellow42 6923d3f14f Add @iceman1001 s presco and pyramid functions + 
plus comment some includes.
fix indala error checking bugs
cmddata.h previously relied on several headers being included prior to
cmddata.h, now self contained.
 2016-03-05 23:45:28 -05:00
marshmellow42 7f0d592636 Merge remote-tracking branch 'upstream/master' into pm3+reveng 2016-02-15 14:13:49 -05:00
marshmellow42 fe876493f8 include cmdlfviking.c in makefile and cmdlf 
fix minor typos
 2015-11-26 21:05:46 -05:00
pwpiwi 8e21541e77 Merge branch 'master' into topaz 2015-08-25 07:53:00 +02:00
Craig Young dbf6e824f9 Adding support for AWID26 realtime demodulation as well as cloning and simulation from facility code and card number 2015-07-13 15:45:28 -04:00
pwpiwi db2b81ba11 Merge branch 'master' into topaz 
Conflicts:
	client/Makefile
	client/cmdhf.c
	client/cmdhf14a.c
 2015-07-01 08:17:00 +02:00
marshmellow42 bf7ebb7b20 Merge remote-tracking branch 'upstream/master' into pm3+reveng 
Conflicts:
	client/Makefile
 2015-06-29 00:06:59 -04:00
pwpiwi 2da2e92837 Merge pull request #109 from pwpiwi/image_shrink 
Compress FPGA configs and initialized data
 2015-06-24 07:47:45 +02:00
marshmellow42 fe81b47811 add reveng-1.30 
new command menu:
crc help
crc calc
crc calc -h for help on command set
 2015-06-06 01:09:54 -04:00
marshmellow42 1c4c0b0681 add @Iceman1001 s sha1 scripting changes. 2015-05-30 21:51:15 -04:00
pwpiwi dc20a1f639 Fix linking under linux. liblua requires libld on linux. 2015-05-29 18:18:10 +02:00
pwpiwi 8e074056ac also delete *.bin and fpga_compressor when "make clean". 
Add target to make fpga_compressor when client is not yet compiled.
Get version information and cache it when client starts (avoids clearing
BigBuf when calling hw version).
Add some comments and remove debugging printouts.
Add version info and ChangeLog in modified zlib.
 2015-05-26 18:12:40 +02:00
pwpiwi 4b3f6d79ea Add option -d (decompress) to fpga_compress. Allows testing. 
Improve zlib deflate (note: no change required to inflate).
 2015-05-26 08:31:35 +02:00
pwpiwi 0fa01ec7da Compress the .data section as well (saves another 4KBytes and comes for free) 
zlib tuning: prevent fpga_compress from generating fixed code blocks
armsrc/Makefile: replace osimage with fullimage
 2015-05-26 08:31:32 +02:00
pwpiwi f39198789b replaced gzip with an own compressor tool (fpga_compress.c, based on zlib) 
This allows to remove the gzip header support and the z_crc32.[ch] files
(which saves more than 2KBytes of the ARM's flash memory)
 2015-05-26 08:31:26 +02:00
pwpiwi e61530408c add: hw ver: show FPGA versions for both HF and LF FPGA configs 
add: hw ver: show used and free flash memory
chg: prepare fpgaloader for compressed FPGA configs
 2015-05-26 08:31:19 +02:00
marshmellow42 d730878d8c scripting updates from @iceman1001 
it compiles but i'm not sure how to fully test it...
:)
 2015-05-13 21:14:35 -04:00
pwpiwi 6306ff4bac Merge branch 'master' into topaz 
Conflicts:
	armsrc/Makefile
	client/Makefile
 2015-04-05 19:45:59 +02:00
pwpiwi 05ddb52c43 fix: introduced a stupid error when refactoring the start bit detector in MillerDecoding() 
chg: use -O2 instead of -Os when compiling ARM sources
chg: don't clear the Miller decoders input buffer on reset
chg: be more specific for the Miller decoders start bit pattern
add: new option c in hf list: mark CRC bytes (default is off)
 2015-03-18 18:32:43 +01:00
marshmellow42 9f7bbd24c9 data autocorr additions 2015-03-13 12:23:26 -04:00
pwpiwi 8c04722db6 (issue #47) use Qt5 includes and libraries, if present 2015-03-10 19:00:39 +01:00
Martin Holst Swende 1defcf606f More work on iclass full simulation, and some work on iclass tag dump parsing 2015-02-19 10:48:33 +01:00
Jesse Hallio e9281ae812 Add flasher from SVN r623 for HID bootprom and current Mac OS X kext 2015-02-03 23:22:39 +02:00
Martin Holst Swende dca558bf9e Removed last trace of crypto from makefile 2015-01-26 20:56:33 +01:00
Martin Holst Swende afceaf4018 Removed openssl from the mfu-stuff 2015-01-22 21:02:21 +01:00
iceman1001 5ee701292f Step 2 - Ultralight / Ultralight-C 
With this the Pentura Labs / Midnitsnakes's original ultralight / ultralight-c implementation is enhanced and move to its own file. cmdhfmfu.c
 2015-01-20 21:23:04 +01:00
iceman1001 c8b6da2295 Merge branch 'master' of https://github.com/holiman/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h

Step 1 for the Ultralight / Ultralight-c
 2015-01-20 20:59:24 +01:00
Martin Holst Swende 1f6417a9b2 Removed dependency on openssl, added AES implementation from polarssl instead 2015-01-12 21:47:36 +01:00
iceman1001 002c1ce57a CHG: removed leftover debugging statements proxmark3.c 
CHG: hint from Marshmellow that the flag "-lcrypto" needs be also in CFLAGS.
 2015-01-07 11:10:46 +01:00
iceman1001 9484ff3d6e ADD: tnp3xxx identification in luascripts. 
CHG: minor code clean up.
 2015-01-06 21:20:41 +01:00
marshmellow42 eb191de615 LF Demod streamlining 
one shared location for demoding lf for arm and client.  also added a
few raw demod commands.
 2014-12-28 20:33:32 -05: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
bushing f39c4119e0 Fix QT CXXFLAGS/LDFLAGS 2009-12-30 00:49:27 +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
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 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 cd00aa3043 merge linux and windows clients into one directory... will consolidate makefiles shortly 2009-12-22 12:11:15 +00:00
Renamed from linux/Makefile (Browse further)