Martin Holst Swende
e80aeb9695
Started iclass emulator support on device side. Not functional yet
2015-02-14 21:30:26 +01:00
Martin Holst Swende
61972abbdd
Merge branch 'master' into GenericTracing
...
Conflicts:
armsrc/iso14443a.c
2015-02-10 21:25:14 +01:00
Martin Holst Swende
3000dc4e7e
Generic tracing; removed iso14a_XX-functions, removed traceLen as global varible
2015-02-07 20:49:40 +01:00
pwpiwi
3b692427ac
Bugfix hw tune, hf tune: voltage measures were VERY wrong
...
Modified hw detectreader: display reader field strength in mV units and to be less phony
2015-02-07 10:14:49 +01:00
Martin Holst Swende
7d5ebac993
Merge branch 'master' into GenericTracing
...
Conflicts:
armsrc/iso14443.c
armsrc/iso14443a.c
client/cmdhf.c
client/cmdhf14b.c
2015-02-06 08:41:02 +01:00
Martin Holst Swende
0644d5e3a3
Merged with master
2015-01-31 18:21:38 +01:00
Martin Holst Swende
31abe49fd3
Some more fixes to longer lf recordings. Now also supports longer snoops, and an additional command 'lf config' has been defined, instead of having to specify all params for every call
2015-01-30 23:03:44 +01:00
Martin Holst Swende
f6d9fb173f
Added client-side support for recording longer samples, fixed last (?) issues on device-side
2015-01-29 00:57:22 +01:00
pwpiwi
f71f4deb8f
BigBuf and tracing rework: allow much longer traces in in hf commands
...
- provided a BigBuf_malloc() function to dynamically allocate parts of BigBuf
e.g. for DMA-Buffers, Frame-Buffers, Emulator-Memory
- the whole rest of BigBuf is now available for traces (instead of a small fixed amount)
- send actual traceLen together with trace data
- changed client side to cope with varying traceLen
- changed small buffers to automatic variables instead of parts of BigBuf
2015-01-28 07:18:51 +01:00
pwpiwi
117d9ec25c
Refactoring of BigBuf handling in order to prepare for more efficient memory allocation and longer traces.
2015-01-27 22:25:55 +01:00
Martin Holst Swende
9e8255d4e9
Generic tracing pt.3 : reworking how iso14443b-traces are stored in ARM-memory
2015-01-21 23:53:40 +01:00
Martin Holst Swende
f164662363
Merge branch 'master' of https://github.com/iceman1001/ForPm3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
2015-01-15 21:50:03 +01:00
iceman1001
a631936e84
ADD: Midnitesnaks's & Pentura labs Ultralight-c modifications in ARMSRC.
...
ADD: des.c , aes.c in ARMSRC
2015-01-13 23:18:04 +01:00
Martin Holst Swende
31d1caa526
Reverted some minor things, altered other things to get it to compile cleanly
2015-01-08 17:51:52 +01:00
iceman1001
787b5bd8a4
CHG: minor code clean up in ArmSrc.
...
ADD: added some more default keys in Hf mf nested, maybe it runs faster :)
2015-01-08 00:08:33 +01:00
iceman1001
52ab55ab0d
ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list.
...
ADD: added a manufacturer list in "hf 14a reader", only viable when UID is double or triple size. Thanks to Asper for the list.
ADD: detect chinese magic backdoor commands in "hf 14a reader"
CHG: minor code clean up.
2015-01-07 21:06:15 +01:00
iceman1001
3fe4ff4f03
CHG: generic code clean up. Removal of commented code.
...
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD: tnp3xx support
ADD: nxp tag idents.
ADD: identifiction of chinese backdoor commands to hf 14a reader.
2015-01-05 15:51:27 +01:00
marshmellow42
6bfa18eab4
Merge pull request #1 from Proxmark/master
...
Test
2014-12-29 16:14:23 -05:00
marshmellow42
66707a3b3c
LF Demod bug fixes and add lf em em410xdemod
...
fixed a few bugs in lf demod that the streamlining added. added new lf
em em410xdemod command that loops until button pressed. (similar to lf
hid fskdemod
2014-12-29 15:32:53 -05:00
pwpiwi
db4de4d82f
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-12-18 19:42:49 +01:00
pwpiwi
2bdd68c370
unify/refactor hw tune and data tune
...
- unified hw tune and Enio's great data tune
- don't use BigBuf (and hardcoded Offset)
- removed special handling of CMD_MEASURED_ANTENNA_TUNING
in UsbCommandReceived()
2014-12-17 20:57:26 +01:00
marshmellow42
083ca3de73
LF HID & IO prox fixes/options
2014-12-17 09:51:40 -05:00
pwpiwi
471c514167
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-12-16 07:47:02 +01:00
pwpiwi
6a1f2d82bb
bugfixes iso14443a (hf 14a commands)
...
- buffers were too small to handle 256 byte frames
- parity bits were only handled for up to 32 byte frames
- trace format was inefficient
- removed parity calculation from decoders in iclass.c (parity not used on air anyway)
2014-12-16 07:41:07 +01:00
Martin Holst Swende
d6a120a25b
Added Enios cool tuning-trick (LF) from forum-post: http://www.proxmark.org/forum/viewtopic.php?pid=13060#p13060
2014-11-30 22:30:36 +01:00
Martin Holst Swende
aa41c6058a
Merged two iclass-reader functions into one to remove duplicated code, update loclass library with hash2 algo
2014-06-29 23:34:24 +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
Martin Holst Swende
42f57e0294
Merged with master
2014-06-27 13:16:31 +02:00
iZsh
b014c96d68
new command "lf snoop" to snoop raw ADC values
...
fpga/lo_read.v (lf_field): new argument.
fpga/fpga_lf.v: modify accordingly.
armsrc/apps.h (FPGA_MAJOR_MODE_LF_READER): Rename as FPGA_MAJOR_MODE_LF_ADC.
armsrc/apps.h (FPGA_LF_ADC_READER_FIELD): New LF option.
armsrc/lfops.c: Modify accordingly.
client/cmdlf.c (CmdLFSnoop): New command.
armsrc/appmain.c, armsrc/lfops.c, client/cmdlf.h, include/usb_cmd.h: Modify accordingly.
2014-06-21 21:33:54 +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
penturalabs
fecd8202a5
implemented 'hf iclass dump xxxx',
...
all you need is the magic key to dump contents of an iclass card
2014-06-17 10:55:37 +01:00
Martin Holst Swende
ff7bb4ef17
Experimenting with hacking iclass
2014-04-17 09:53:54 +02:00
penturalabs
c3963755b7
Implement replay command.
2014-04-15 11:47:01 +01:00
Martin Holst Swende
cba867f202
Final (?) fixes to git versioning https://github.com/Proxmark/proxmark3/issues/10
2014-04-04 20:14:58 +02:00
penturalabs
a1f3bb120f
Added Kantech ioProx Support
2014-03-18 20:52:48 +00:00
roel@libnfc.org
981bd4292e
integrated MIFARE ultralight features, contributed by 'midnitesnake'
2013-10-11 08:43:23 +00:00
jonor@live.it
4f269f63da
Added more informations at command hw version. Now we can get some informations of microcontroller.
...
Maybe is useful when someone got a bigger AT91
Example:
#db# Prox/RFID mark3 RFID instrument
#db# bootrom: svn 756-unclean 2013-09-14 15:04:07
#db# os: svn 796-unclean 2013-10-04 18:50:44
#db# FPGA image built on 2013/ 9/26 at 9:17:32
uC: AT91SAM7S256 Rev B
Embedded Processor: ARM7TDMI
Nonvolatile Program Memory Size: 256K bytes
Second Nonvolatile Program Memory Size: None
Internal SRAM Size: 64K bytes
Architecture Identifier: AT91SAM7Sxx Series
Nonvolatile Program Memory Type: Embedded Flash Memory
2013-10-04 18:54:10 +00:00
martin.holst@gmail.com
7cf3ef203c
Patch by jonor for raw ISO 1444B commands. See http://www.proxmark.org/forum/viewtopic.php?id=1729 for more info
2013-09-01 18:41:05 +00:00
micki.held@gmx.de
1c611bbd26
2013-07-08 17:56:05 +00:00
martin.holst@gmail.com
e772353f72
Major changes to hf mf mifare
2013-06-26 21:13:02 +00:00
roel@libnfc.org
28afbd2bee
added initial test to emulate memory of mf ul tag
2013-03-28 14:02:00 +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
9440213d6b
fixed 64-bit cmd/arg for windows
2012-12-09 13:00:19 +00:00
roel@libnfc.org
6e82300dda
removed all old usb calls
2012-12-05 16:14:10 +00:00
roel@libnfc.org
902cb3c00b
major USB update
2012-12-04 23:39:18 +00:00
roel@libnfc.org
d19929cbe8
MAJOR update, added hitag2 reader, emulation and eavesdropping, lots of new code, including FPGA tweaks, part 2
2012-09-18 13:53:17 +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
Merlokbr@gmail.com
5cd9ec01e0
hf 14a snoop optimized and added parameters. hf 14a sniff - not work.
2012-07-07 15:29:51 +00:00
Merlokbr@gmail.com
b62a5a8444
small improvements, added new command hf mf sniff
(there will be cool sniffer). But now... here is optimized hf 14a snoop. As I see it works the same as th old version.
2012-07-06 16:19:05 +00:00
Merlokbr@gmail.com
545a1f385c
another "magic card" backdoor - command "read block". Added several commands to manipulate card data.
2012-07-05 14:05:01 +00:00
Merlokbr@gmail.com
0675f200e6
Added work with "magic Chinese" card (card from: ouyangweidaxian@live.cn) with wipe support). Change UID and wipe only.
2012-07-05 07:31:56 +00:00
cex123@gmail.com
2414f97889
Added Indala cloning. Fixed HID cloning bug
2012-07-02 08:37:50 +00:00
roel@libnfc.org
81cd0474cb
fixed a lot of simulation issues
2012-06-29 10:24:05 +00:00
dekoninggans@gmail.com
1e26214152
Extended iClass support with Card and Reader emulation!
2012-06-28 13:38:40 +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
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
cex123@gmail.com
ec09b62d88
2011-10-15 15:15:49 +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
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
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
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
3612a8a8e2
legic write/simulate [Anon]
2010-05-06 11:24:01 +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
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
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
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
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
roel@libnfc.org
32cfae439e
mifare firmware update
2009-12-30 00:11:50 +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
bushing
1dea88f976
fix some ARM build fail
2009-12-22 12:48:33 +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
a7247d858b
Add basic LEGIC RF communication in tag simulation mode
2009-10-12 11:47:39 +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
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