RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-15 04:27:46 +08:00
Code Issues Projects Releases Packages Wiki Activity
553 commits 3 branches 15 tags 87 MiB
Commit graph

209 commits

Author SHA1 Message Date
dekoninggans@gmail.com
1e26214152 Extended iClass support with Card and Reader emulation! 2012-06-28 13:38:40 +00:00
adrian@atrox.at
e6304bca2d reduces (but does not eliminate) a coil/fpga setup glitch before every iso15693 command (confuses some cards), also: little cleanup 2012-06-20 17:20:21 +00:00
GooglePlus@YoungJules.net
9f69393035 Commented out unused, set but never read variables (cause build to fail if warnings treated as errors) 2012-06-12 12:21:26 +00:00
douniwan5788
aea4d76687 Enhanced hf mf chk , add default key,support dic file and so on. 
modify hf mf mifare to automatically use an invalid key'nt try again.
make some changes to support mifare classic 4k.
 2012-05-30 03:45:55 +00:00
dn337t@gmail.com
13d8c68d86 removed redundant Dbprintfs from SnoopIso1443a (issue 25) 2012-05-29 14:16:09 +00:00
dn337t@gmail.com
7431536de7 optimized loop in MifareNested (issue 36) 2012-05-29 13:23:07 +00:00
dn337t@gmail.com
db389d52cc fixed assignment vs. equals operator (issue 35) 2012-05-29 12:47:13 +00:00
marcin.mielczarczyk
2d4eae7617 Support for EM410x card mode in T5555/T55x7 tags. 2012-03-07 13:44:53 +00:00
roel@libnfc.org
7e67e42f7e cleaned up some if-def routines 2011-12-16 11:00:51 +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
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
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
8f51ddb0bd 1. fixed send manchester 
2. emulator commands select, authenticate, read block, write block works
3. nested authentication - not working (maybe next release)
4. small bugfixes
5. mifare1ksim - in alpha state!!! code not so clear!!!
 2011-06-16 14:43:49 +00:00
Merlokbr@gmail.com
0a39986e01 alpha2 mifare emulator 2011-06-14 15:28:21 +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
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
dekoninggans@gmail.com
593924e751 Bitsync fix 2. Gerhard 2011-02-04 19:43:48 +00:00
dekoninggans@gmail.com
2f2d9fc5ac Fixed some small mistakes in the bit synchronization of Miller and Manchester decoding part. Gerhard 2011-02-04 16:25:31 +00:00
dekoninggans@gmail.com
d82c6ebb84 Fixed ISSUE 15 in iso14443a.c - Gerhard 2011-01-28 12:34:05 +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
henryk@ploetzli.ch
6c1e2d95f4 Add a ramfunc section in the data segment, which will be copied to ram on startup. 
Add a RAMFUNC function attribute to have functions copied to and run from ram.
Fix "blew circular buffer" error in hf 14a snoop by executing SnoopIso14443a from ram (eats about 3.5k of ram)
 2010-10-08 10:23:04 +00:00
henryk@ploetzli.ch
d3b1f4e406 Flash green LED during sample transmission ("data samples" and "data hexsamples" commands) to indicate activity (and that the device hasn't hung) 2010-08-23 07:49:44 +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
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
d18c7db
72934aa313 Streamline some code, tidy up redundant functions, no change in functionality. 2010-03-05 04:14:04 +00:00
d18c7db
0aa4cfc2f1 Fix up small error in main osc startup delay and replace more custom defines with standard Atmel defines 2010-03-04 08:15:59 +00:00
izsh@fail0verflow.com
ed82636b49 There is no proof this fix anything. This could just be out of randomness or subtle compiler optimization differences due to the change. 2010-03-04 00:30:54 +00:00
marcansoft
928727a45b Use sane optimization for armsrc 2010-03-03 13:19:29 +00:00
d18c7db
bad6eab230 Fix possible type casting issue. Add another JTAG config file :) 2010-03-03 02:27:14 +00:00
marcansoft
9af4835863 Add KEEP() to version information section 
Prevents it from being garbage collected
 2010-02-26 23:29:22 +00:00
marcansoft
9b87d273b5 Fix minor consistency issue in armsrc/ldscript 
BSS should be AT>ram (though it really doesn't matter because load size
is 0)
 2010-02-26 21:40:14 +00:00
marcansoft
cc7580be7a Minor fix to armsrc ldscript 2010-02-26 15:14:27 +00:00
marcansoft
98bf65a640 Fix up armsrc/ldscript (create proper PHDRs, cleanup) 
Now explicitly creates PHDRs (to avoid including e.g. ELF headers inside
the first PHDR)
 2010-02-26 14:03:21 +00:00
marcansoft
98540684df Link using gcc and get rid of the LIBGCC stuff 
GCC knows how to find libgcc, and the proper way to link C code is to
use gcc, not ld.
 2010-02-26 14:03:03 +00:00
marcansoft
e949e6a63e Add license header to armsrc/ldscript 2010-02-26 14:01:31 +00:00
izsh@fail0verflow.com
9e13f87517 Fix a couple of warnings 2010-02-24 20:34:13 +00:00
marcansoft
c1bd1140c4 Some random cleanup 2010-02-21 00:13:08 +00:00
marcansoft
bd20f8f478 Add license headers to armsrc/bootrom/common stuff 
I have kept whatever copyright notices exist. 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:12:52 +00:00
marcansoft
9ab7a6c755 Split str* and mem* into string.[ch] 2010-02-21 00:10:28 +00:00
marcansoft
f7e3ed8287 Clean up data types, some header cleanup, etc. 2010-02-20 22:51:00 +00:00
marcansoft
e30c654b19 More en masse cleanup (whitespace/newlines/headers/etc) 2010-02-20 21:57:20 +00:00
marcansoft
15c4dc5ace Clean up line endings, switch everything to LF instead of CRLF 
Doing this for bootrom and armsrc for now. If you're using Windows,
please configure your editor for LF line endings.
 2010-02-20 21:24:25 +00:00
marcansoft
72c4af087f Add obj/.dummy for clients that don't track empty dirs 2010-02-20 21:20:47 +00:00
izsh@fail0verflow.com
5e174a511b marcan's patch until he gets commit access. Remove C library's includes from the firmware side since it's not available anyway and not used 2010-02-20 03:07:55 +00:00
adam@algroup.co.uk
4c8db262c0 usability hint 2010-02-06 15:50:20 +00:00
adam@algroup.co.uk
b279e3efc1 more helpful error message (from Sourcerer) 2010-02-06 09:54:38 +00:00
adam@algroup.co.uk
a2b1414f43 Andreas fix for LEGIC MIM1024 2010-02-06 09:43:33 +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
adam@algroup.co.uk
502def6d63 oops. in the spirit of cleaner code, don't do stuff twice! 2010-02-04 23:31:23 +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
henryk@ploetzli.ch
92e592ce71 Limit DbpString size to the buffer size, patch by Andreas from proxmark forums 2010-02-04 02:49:21 +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
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
8caef54055 Increased buffer sizes for hi14snoop. Added blinking LED for feedback 2010-01-09 15:30:47 +00:00
daniel.boteanu
d724614963 Trim long debug string message in hitune 2010-01-09 15:13:49 +00:00
daniel.boteanu
1eb7596aad Added hitune command for continuously measuring HF antenna tuning 2010-01-09 14:59:42 +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
850427c8a9 switch away entirely from using DbpInteger to Dbprintf 2010-01-02 00:34:43 +00:00
bushing
a9bc033bdd create Dbprintf convenience function 2010-01-01 23:36:17 +00:00
bushing
0d974852ce ARM code cleanup (lfops) 2009-12-30 02:52:33 +00:00
bushing
6f5cb60c46 Add printf, and start transitioning away from DbpInteger 2009-12-30 02:18:25 +00:00
roel@libnfc.org
32cfae439e mifare firmware update 2009-12-30 00:11:50 +00:00
henryk@ploetzli.ch
2561caa24c Implement card reading with a few simple fixed obfuscation strings 2009-12-28 18:19:00 +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
84c02e97e0 iso14443a cleanup, cascade2 level working again 2009-12-28 17:21:50 +00:00
roel@libnfc.org
d24438f85c cleaning up endless copy-paste of trace functionality 2009-12-28 00:16:05 +00:00
bushing
d5be6f7cd4 fix OS detection, libgcc detection 2009-12-22 12:50:34 +00:00
bushing
1dea88f976 fix some ARM build fail 2009-12-22 12:48:33 +00:00
henryk@ploetzli.ch
8d40aba58b Add capability to correlate against subcarriers of 212kHz (argument FPGA_HF_READER_RX_XCORR_QUARTER_FREQ | FPGA_HF_READER_RX_XCORR_848_KHZ) and 106kHz (argument FPGA_HF_READER_RX_XCORR_QUARTER_FREQ) 2009-12-09 02:31:01 +00:00
henryk@ploetzli.ch
68d9d60a4d Add generic CRC calculation code 2009-11-25 20:41:41 +00:00
edouard@lafargue.name
c86cc30801 Added the new SRIX4K reading routine, thanks to jonor. Regression tested against SRI512 tags, 
but I do not have SRIX4K tags to test this with.
 2009-11-23 09:34:57 +00:00
d18c7db
e70140224f Fix define typo 2009-11-12 08:04:40 +00:00
d18c7db
c0d04e9540 Also defines to carve out LF related code 2009-11-12 07:23:12 +00:00
henryk@ploetzli.ch
b1083ec9f7 #ifdef out the calls to the ISO15693/14443/14443a functions so that the -D on the make command line actually can be used to reduce code size 2009-11-10 05:10:01 +00:00
henryk@ploetzli.ch
dcc10e5e31 Add basic communication shell for Legic RF in reader mode. Needs the new receive function of hi_read_tx. 2009-11-06 15:37:53 +00:00
henryk@ploetzli.ch
add16a6287 Refactor things around to make it easier to add a reader mode with code reuse 2009-11-05 11:13:46 +00:00
henryk@ploetzli.ch
4014b814fb Make canned responsed const 2009-10-25 09:58:23 +00:00
henryk@ploetzli.ch
ccedd6ae6b Simplify data types, now that I believe that 'frames' will always be rather short 2009-10-23 21:40:17 +00:00
henryk@ploetzli.ch
aac23b2434 Fix and generify legic response code 2009-10-16 22:07:00 +00:00
henryk@ploetzli.ch
a7247d858b Add basic LEGIC RF communication in tag simulation mode 2009-10-12 11:47:39 +00:00
henryk@ploetzli.ch
ecf53cb215 Add HF simulator modulation mode for 212kHz subcarrier 2009-10-12 07:46:03 +00:00
henryk@ploetzli.ch
5fc8250f7f Add command to manually set ADC mux source 2009-10-09 15:57:07 +00:00
d18c7db
6949aca9fa Pushed standard AT91 defines into main code 2009-09-29 12:13:41 +00:00
d18c7db
d3ae0de746 Small changes to some armsrc makefile to allow conditional compilation of various protocols via defines, change winsrc makefile to allow override of compiler location via external defines, finally change fpgaloader to actually check that the image upload succeeded instead of just blindly sending it and hoping for the best. 2009-09-22 09:57:03 +00:00
henryk@ploetzli.ch
1b2c893632 Fix data segement. You may now use stuff like int foo = 1; in global context (as opposed to both int foo = 0; which is bss and const int foo = 1; which is rodata) without having the sky come 
crashing down
 2009-09-08 15:40:22 +00:00
d18c7db
715d74c5be Fixed up last gcc 4.1 and 4.4 warnings, added OpenOCD wiggler config 2009-09-08 10:08:43 +00:00
henryk@ploetzli.ch
45dcfac2cc Hopefully correct code for C's strict aliasing rules 2009-09-08 02:36:50 +00:00