marshmellow42
872e3d4d6f
NEW lf simpsk
2015-02-21 21:36:02 -05:00
marshmellow42
abd6112fc4
Revert "Revert "lf simask, lf simfsk and bug fixes""
...
This reverts commit e396001c47
.
2015-02-19 21:35:34 -05:00
marshmellow42
e396001c47
Revert "lf simask, lf simfsk and bug fixes"
...
This reverts commit fb0c84c3df
.
2015-02-19 21:22:05 -05:00
marshmellow42
fb0c84c3df
lf simask, lf simfsk and bug fixes
2015-02-19 21:21:11 -05:00
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