marshmellow42
9c0f13d5dd
Merge remote-tracking branch 'upstream/master'
2015-01-26 17:07:49 -05:00
Martin Holst Swende
aeadbdb216
Generic tracing: Some fixes in iso14443b snooping, to how DMA access is performed, sizes and buffers.
2015-01-26 22:10:05 +01:00
Martin Holst Swende
7c676e7269
Some documentation
2015-01-26 21:15:28 +01:00
Martin Holst Swende
7242efa07c
bugfix
2015-01-22 23:04:59 +01:00
Martin Holst Swende
cb366e9dbd
Added a lf acquisition-mode which can do decimation and quantization, in order to be able to record longer transactions
2015-01-22 23:01:29 +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
marshmellow42
ec75f5c10a
lf Bug Fixes and lf demod additions
...
added data fskparadoxdemod
added data setdebugmode (for demods)
added data shiftgraphzero (to help clean weak reads)
fixed a few bugs with the data detectaskclock
added data fskfcdetect to detect FSK clocks
adjusted most of my demods to put raw tag binary to demod buffer for
future sim and clone commands (psk still needs work)
2015-01-20 17:28:51 -05: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
iceman1001
5149e37e66
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
2015-01-20 09:32:53 +01:00
Martin Holst Swende
355c8b4a7d
Generic trace pt2: made iso14443b use standard trace format
2015-01-18 20:23:58 +01:00
Martin Holst Swende
80fe723570
Generic trace pt1: Moved arm-side trace functionality into util-package
2015-01-18 20:21:53 +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
Martin Holst Swende
758f1fd1f3
Fixed issue #43 on github
2015-01-15 16:07:58 +01:00
Martin Holst Swende
6b038d192a
Minor dox
2015-01-15 15:45:54 +01:00
Martin Holst Swende
1eb874ee3f
Merge branch 'master' of github.com:Proxmark/proxmark3
2015-01-15 15:45:15 +01:00
Martin Holst Swende
7b941c8d7f
Fixed memory corruption after reader-attack in armsrc, fixed annoying LED
2015-01-15 15:27:44 +01:00
Martin Holst Swende
645c960f61
Implemented new FPGA mode for iclass tag simulation. Reduces arm-side size of transfer/memory by a factor of 8. Makes for easier arm-side encoding of messages, for when we start needing to do that on the fly instead of using precalculated messages
2015-01-15 15:16:34 +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
55eaed8f2a
Documentation to apps.h, documentation/renaming to iclass
2015-01-12 22:08:57 +01:00
Martin Holst Swende
f44a01235c
Merge branch 'master' of https://github.com/iceman1001/ForPm3
2015-01-09 21:50:36 +01:00
iceman1001
952a8bb59b
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/lfops.c
client/cmddata.c
client/graph.c
2015-01-08 22:23:45 +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
marshmellow42
ba1a299ce6
code cleanup. re-added psk commands.
...
also fixed a bug in detect clock functions.
sync with master prep for pull request
2015-01-07 18:14:27 -05:00
marshmellow42
c07b79fcbf
sync with master lf files to resolve conflicts
2015-01-07 18:13:27 -05:00
marshmellow42
4118b74dc8
added data psk* cmds for pskdemod
...
fixed a couple small bugs in other lf functions as well including
detectaskclock, stopped changes from being made to graphbuffer.
2015-01-07 18:13:26 -05: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
024b97c507
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/cmdhf.c
2015-01-07 22:55:26 +01:00
iceman1001
d91a31f935
CHG: minor code clean up.
...
ADD: tunesamples in cmddata.c pullrequest #33 , was removed by Marshmellows other commits. I returned it.
2015-01-07 21:29:38 +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
4888b28195
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-01-07 11:09:05 +01:00
Martin Holst Swende
cb29e00a12
Save iclass dumps to file, like mifare-dump functionality works
2015-01-07 09:57:18 +01:00
iceman1001
9484ff3d6e
ADD: tnp3xxx identification in luascripts.
...
CHG: minor code clean up.
2015-01-06 21:20:41 +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
Martin Holst Swende
39d3ce5dd6
Moved iclass crc to be based on a lookup table
2015-01-04 22:10:25 +01:00
Martin Holst Swende
c8dd9b092e
Some work on iclass dump and iclass list, now the dumping is a lot more stable. I think the comms should be measured and tuned a bit more, right now it kind of works thanks to retry-functionality, but the retries are probably not needed if we are a bit more careful about timing, so we don't send commands too fast for the tag to handle
2015-01-04 14:53:26 +01:00
Martin Holst Swende
2e9d4b3ff4
Some work on iclass, started on some better support in 'hf iclass list' and also fixes to 'hf iclass reader' so it exits better when the button is pressed
2015-01-03 15:11:48 +01:00
Martin Holst Swende
854b9a233f
Removed unused variable
2015-01-03 14:29:07 +01:00
Martin Holst Swende
ae8e8a4372
Corrected indentation to tabs only
2015-01-03 14:21:07 +01:00
Martin Holst Swende
6ca4c6463e
Removed wrong size-count, sizeof(bigbuf) would always return 40000 in lfops
2015-01-03 14:17:59 +01:00
marshmellow42
f822a063b3
lf demod code cleanup - added fskraw arguments
...
merged code and added arguments to data fskrawdemod to allow other fsk
mode demodulations (FSK2a = RF/10 & RF/8) another might be (RF/8 & RF/5)
2014-12-31 02:27:30 -05: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
marshmellow42
7db5f1ca25
slight adjustment to include
...
removed extra unneeded path
2014-12-28 21:29:33 -05: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
pwpiwi
52bfb95543
bugfixes in iso14443a.c and hf 14a reader
...
- introduced with the big frame and parity support (commit 6a1f2d82
): tag responses with len%8 == 0 were dropped - thanks iceman for testing and finding
- after unsuccessful hf 14a reader the field stayed on. Thanks to iceman for proposing the fix.
2014-12-23 11:21:42 +01:00
marshmellow42
b3b706693b
Final touches on IO prox and HID prox demod
...
makes both more robust and handles various error situations.
2014-12-19 12:14:27 -05:00
pwpiwi
db4de4d82f
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-12-18 19:42:49 +01:00
pwpiwi
57642f63fa
bugfixes hf epa cnonces
...
- extended length (more than 1 byte) not handled correctly
- nonces not printed on Windows due to type mismatch
2014-12-18 19:40:35 +01:00
Martin Holst Swende
7496d8d822
Merge pull request #32 from marshmellow42/master
...
Fixes and additions to lf io fskdemod and addon parameter to lf hid fskdemod
2014-12-18 08:56:26 +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
6116c79618
Reverted to original malicious CSNs from paper, it appears legit readers does not accept if they dont end with F7,FF,12,E0
2014-12-14 21:37:56 +01:00
Martin Holst Swende
eabba3df7e
Fix (iclass)
2014-12-14 18:07:12 +01:00
marshmellow42
4860172789
LF HID & IO prox demod translation addons
...
lf hid fskdemod - add bit format length, facility code and card numbers
for different formats
2014-12-13 20:23:59 -05: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
ca4714cd23
More coverity fixes
2014-10-30 21:49:18 +01:00
Martin Holst Swende
2ed270a854
Coverity-fixes in armsrc
2014-10-28 21:44:17 +01:00
Martin Holst Swende
9cc8a1e588
Some more docs, also made lf hid fskdemod a bit more stable. Should be no more false readings now
2014-10-25 22:42:27 +02:00
Martin Holst Swende
b225678574
Some minor changes and some documentation
2014-10-24 21:12:31 +02:00
Martin Holst Swende
1a5a0d7590
Fixed compilation issues, but functionality not tested
2014-10-24 20:53:43 +02:00
Martin Holst Swende
f97d4e2378
First try att merging with head
2014-10-24 20:46:02 +02:00
Martin Holst Swende
e6ee6c4cd1
Merge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research
2014-09-19 09:45:38 +02:00
pwpiwi
baeaf57950
fix/add support for 4K (and other non 1K) card sizes in hf mf commands
...
- hf mf rdsc (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (fix): Access Condition 011 not handled correctly (tried to access with key A)
- hf mf restore (add): added (optional) card size parameter and support for non 1K cards
- hf mf nested (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf nested (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf chk (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf eget (fix): displayed three instead of one block
- hf mf eload (add): load 4K .eml files (but accepts 1K .eml files for backwards compatibility)
- hf mf esave (add): always save the whole emulator memory (4K) instead of 1K only
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
2014-09-10 19:04:50 +02:00
pwpiwi
bfb6a143ea
bugfix hf mf sim
...
- an additional erronous byte was sent after SAK
2014-08-05 18:40:19 +02:00
pwpiwi
b03c0f2d86
bugfixes hf mf sim
...
- output of debug messages caused communication failures due to timing issues.
hf mf dbg 4 now required to see these debug messages.
- changed help text for hf mf dbg
- fixed minor bugs in help texts for hf mf sim and hf mf ecset
- display "key A" or "key B" instead of "key=0" or "key=1 in hf mf sim
2014-07-30 21:23:02 +02:00
pwpiwi
991f13f27d
minor bugfixes to hf mf sniff and hf 14a snoop
...
- tracing was not always enabled when starting hf mf sniff or hf 14a snoop
- ATQA was displayed in wrong byte order in hf mf sniff
- 4 Byte UIDs were displayed as 7 Byte UIDs (padded with 0x000000) in hf mf sniff
- same for logfile names.
- assignment (=) had been used instead of == in comparisons (shouldn't have been relevant though)
2014-07-15 08:39:56 +02:00
pwpiwi
c7324bef28
Bugfix hf 14a raw:
...
number of bits sent was wrong when option -c was used without option -b
2014-07-01 08:28:28 +02:00
Martin Holst Swende
9b82de75f4
more work towards iclass elite dumping.. not quite finished yet though :(
2014-06-30 00:20:40 +02: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
dbf732ee41
Minor
2014-06-29 13:48:13 +02:00
Martin Holst Swende
26c0d833ac
Some minor changes [iclass-related]
2014-06-28 22:57:48 +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
6db28145ea
Merge remote-tracking branch 'origin/master' into iclass-fixes
2014-06-28 12:47:40 +02:00
iZsh
3b2fee43ea
New LF edge detection algorithm + lowpass filter
...
This is a new LF edge detection algorithm for the FPGA.
- It uses a low-pass IIR filter to clean the signal
(see https://fail0verflow.com/blog/2014/proxmark3-fpga-iir-filter.html )
- The algorithm is able to detect consecutive peaks in the same
direction
- It uses an envelope follower to dynamically adjust the peak thresholds
- The main threshold used in the envelope follower can be set from the ARM side
fpga/lf_edge_detect.v,
fpga/lp20khz_1MSa_iir_filter.v,
fpga/min_max_tracker.v: New file.
fpga/lo_edge_detect.v, fpga/fpga_lf.v: Modify accordingly.
armsrc/apps.h (FPGA_CMD_SET_USER_BYTE1,
FPGA_CMD_SET_EDGE_DETECT_THRESHOLD): New FPGA command.
fpga/fpga_lf.v: Modify accordingly/Add a 8bit user register.
fpga/fpga_lf.bit: Update accordingly.
fpga/tests: New directory for testbenches
fpga/tests/Makefile: New file. It compiles the testbenches
and runs all the tests by default (comparing with the golden output)
fpga/tests/tb_lp20khz_1MSa_iir_filter.v,
fpga/tests/tb_min_max_tracker.v,
fpga/tests/tb_lf_edge_detect.v: New testbenches
fpga/tests/plot_edgedetect.py: New script to plot the results from
the edge detection tests.
fpga/tests/tb_data: New directory for data and golden outputs
2014-06-27 14:27:03 +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
62638f87db
armsrc/fpgaloader.c: forgot the copyright notice
2014-06-20 12:29:58 +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
9f6e9d1575
More work on iclass simulation attack
2014-06-16 21:27:12 +02:00
Martin Holst Swende
fa541aca96
Minor changes, it may actually work now, need to test with a credentialed reader
2014-06-07 22:16:57 +02:00
Martin Holst Swende
94ad01bfba
Merged with head
2014-06-07 22:04:27 +02:00
Martin Holst Swende
81012e670b
debug in progress
2014-06-07 22:00:31 +02:00
Martin Holst Swende
e3dc1e4cf5
Minor changes in iclass.c
2014-06-07 21:49:56 +02:00
Martin Holst Swende
83fd67ba0b
Added mode for 424k modulation (iso 15693)
2014-06-07 21:40:47 +02:00
Martin Holst Swende
fdcd43eb15
Fixed (?) http://www.proxmark.org/forum/viewtopic.php?id=1967 , two bytes are discarded when adding crc and sending raw iso14443a commands
2014-04-26 16:15:16 +02:00
Martin Holst Swende
f83cc12613
More work on iclass
2014-04-24 15:48:00 +02:00
Martin Holst Swende
17cba2693d
Implemented client side changes for iclass hack, attempted to fix issues with trace. The trace functionality from iso14443 has been rewritten, unfortunately iclass used that also, which made iclass 'list' stop functioning, both for simulation and snooping
2014-04-24 14:13:33 +02: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
ikarus
9c6837165b
Updated nameing (svn -> git) & fixed whitespaces.
2014-04-02 21:46:25 +02:00
Martin Holst Swende
07976a256d
Refactoring low frequency operations, now 'lf hid fskdemod' is more stable. Also did changes to handling ioprox tags, this is yet untested, so until it's been tested it should be kept off 'stable' branch
2014-03-31 17:57:14 +02:00
Martin Holst Swende
69d88ec463
Major refactoring of lfops, removed a lot of duplicate code
2014-03-30 15:59:54 +02:00
pwpiwi
d714d3effc
Improvements/Fixes to 14443 sniffing/snooping
...
- fixed a circular buffer rollover bug in iso14443a.c
- fixed 7 Byte UID handling in hf mf sniff
- fixed "cannot append" error in hf mf sniff d
- fixed hint on mfkey32 in hf mf sim x
- fixed hf mf sniff sometimes showing rogue data from previous calloc
- improve snooping/sniffing by syncing modulation detector window with reader signal (hi_iso14443a.v)
- code cleanup of hi_iso14443a.v
2014-03-25 21:38:24 +01:00
penturalabs
a1f3bb120f
Added Kantech ioProx Support
2014-03-18 20:52:48 +00:00
micki.held@gmx.de
d7aa3739a9
More robust iso14443a sniffing/simulation functions by
...
- iso14443a.c: less strict Miller/Manchester decoders
- FPGA hi_iso14443a.v: syncing on external readers' clock when simulating and sniffing.
2014-02-23 15:46:19 +00:00
micki.held@gmx.de
7bc95e2e43
- fixed iso1443a ManchesterDecoder in order to fix broken Snoop/Sniff
...
- enhanced tracing: hf 14a list now shows meaningful timing information. With new option f it also shows the frame delay times (fdt)
- small fix for hf 14b list - it used to run into the trace trailer
- hf 14a sim now obeys iso14443 timing (fdt of 1172 or 1234 resp.)
Note: you need to flash FPGA as well.
More details in http://www.proxmark.org/forum/viewtopic.php?pid=9721#p9721
2014-02-19 20:35:04 +00:00
martin.holst@gmail.com
3be2a5ae0b
reverted a non-intended commit with crappy debug printouts
2014-02-05 18:53:55 +00:00
martin.holst@gmail.com
273b57a7b0
Fixed error with ar/nr-collection
2014-02-05 08:07:27 +00:00
martin.holst@gmail.com
f87941bd22
Minor typo
2014-01-31 21:24:18 +00:00
martin.holst@gmail.com
d2f487af9c
Various improvements on the Mifare1kSimulation. Fixed issue with tracebuffer not being cleared, fixed issue with 'static' errors, added modes for doing reader-only attack, added interactive mode, added possibility to set UID from cmdline, either 7-byte or 4-byte. See http://www.proxmark.org/forum/viewtopic.php?id=1529 and http://www.proxmark.org/forum/viewtopic.php?id=1649&p=3 for some more background and discussion
2014-01-31 21:17:34 +00:00
martin.holst@gmail.com
af1caf6e4a
Fixed (?) issue with mifare simulation auth failed. See http://www.proxmark.org/forum/viewtopic.php?pid=9192#p9192
2014-01-22 08:49:28 +00:00
micki.held@gmx.de
e691fc45bc
- improved reader sensitivity for 14443a cards (FPGA change!)
...
- implemented ISO 14443A anticollision loop
See http://www.proxmark.org/forum/viewtopic.php?id=1797 further details
2013-11-19 18:52:40 +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
roel@libnfc.org
ce02f6f992
fixed iso14443a-4 similation, got rid of many ugly memory allocation issues
2013-10-03 14:22:43 +00:00
jonor@live.it
0318894e52
Correct issue of blew circular buffer in hf 14b snoop with gcc 4.7.4 the issue is solved
2013-09-30 19:08:29 +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
5f6d6c9003
Raw 14a in commandline, patch by jonor, see http://proxmark.org/forum/viewtopic.php?id=1751 for more info
2013-09-28 19:28:55 +00:00
henryk@ploetzli.ch
bf7163bdb3
* Add an option to lf read command to use an arbitrary divisor, enabling reading at frequencies other than 125 and 134 kHz.
2013-09-27 13:48:20 +00:00
micki.held@gmx.de
9492e0b098
Major rework of hf mf nested:
...
- PM: used GetCountMifare in MifareNested() for improved timing accuracy and to deliver better quality nonces
- PM: MifareNested now delivers exactly two different nonces to avoid time consuming multiple lfsr_recovery32() on client side
- Client: replaced quicksort by bucketsort in crapto1.c which is faster
- Client: use multithreading (two parallel calls to lfsr_recovery32())
- Client: fixed a small bug in mfnested() (always showed trgkey=0)
- Client: introduced a mutex for PrintAndLog() to avoid interlaced printing
Minor rework of hf mf chk:
- Avoid time consuming off/on cycles. Send a "halt" instead.
2013-09-15 09:33:17 +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
dn337t@gmail.com
79c3611cf3
fixed Mifare nested by activating commented SpinDelay()s
2013-05-30 14:48:27 +00:00
apresence@gmail.com
e67b06b706
Support for cloning to T55x7 at different clock rates & 134KHz
...
* Modified commands (lf em4x):
em410xwatch ['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)
em410xwrite <UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate
* Better option checking for em410xwrite & fix for uninitialized vars
* Increased samples from 2000 to 4000 in em410xwatch (2000 is OK for clock=64, but too few for clock=32)
2013-05-12 08:11:00 +00:00
martin.holst@gmail.com
9836a77f97
Fixed a third issue where a buffer was filled with 0x44, affecting chinese cards-commands.(csetblk)
2013-05-11 12:23:31 +00:00
martin.holst@gmail.com
354d3a33fd
Fixed another issue where a buffer was filled with 0x44, affecting chinese cards-commands. see http://www.proxmark.org/forum/viewtopic.php?id=1467&p=6
2013-05-11 12:22:11 +00:00
martin.holst@gmail.com
ea73261dc6
Fixed buffer corruption in iso1443a_select_card, affecting several operations, e.g. hf mf mifare and probably a few more
2013-05-11 12:13:17 +00:00
roel@libnfc.org
ed258538da
retrieve uid correctly, patched by 'gregy'
2013-05-03 06:58:24 +00:00
dn337t@gmail.com
0beed8fc67
fixed hf mf rdbl response data (broken since r634)
2013-04-24 10:59:47 +00:00
dn337t@gmail.com
3803d5295d
fixed possibly uninitialized variables
2013-04-24 10:58:12 +00:00
roel@libnfc.org
ce55f5a291
moved RAMFUNC definition
2013-04-08 09:18:39 +00:00
roel@libnfc.org
dfc3c5053c
removed another redundant function to compose reader short frame
2013-04-03 11:18:01 +00:00
roel@libnfc.org
195af47289
removed redundant function to compose reader short frame
2013-04-03 08:45:04 +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
5191b3d10b
fixed sending of RATS during iso-14443-4 select
2013-03-27 12:23:59 +00:00
roel@libnfc.org
43751d2a65
removed failed hitag2 authentication attempts from the list
2013-03-18 15:32:19 +00:00
roel@libnfc.org
47e18126ec
added hitag bit count output in log
2013-03-11 15:07:23 +00:00
roel@libnfc.org
17331e14ee
tweaked sim command, added mfkey32
2013-03-07 12:22:12 +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
79a73ab2d1
fixed USB GPIO bug reported by gregy, and fixed 'hf 14a reader' command
2013-02-27 13:23:38 +00:00
roel@libnfc.org
ab6bf11f3f
minor fix when reading blocks
2012-12-17 13:21:53 +00:00
roel@libnfc.org
fc8c5cdd12
fixed hitag2 dump if one or more blocks are locked
2012-12-10 15:12:32 +00:00
roel@libnfc.org
ab4da50d99
added automatically saving the hitag2 memory content to file
2012-12-09 21:25:29 +00:00
roel@libnfc.org
9440213d6b
fixed 64-bit cmd/arg for windows
2012-12-09 13:00:19 +00:00
roel@libnfc.org
81ee3409f9
added so-called 'driver' for windows
2012-12-05 20:45:42 +00:00
roel@libnfc.org
6e82300dda
removed all old usb calls
2012-12-05 16:14:10 +00:00
roel@libnfc.org
5bcc76c427
added missing files
2012-12-04 23:41:54 +00:00
roel@libnfc.org
902cb3c00b
major USB update
2012-12-04 23:39:18 +00:00
Merlokbr@gmail.com
5a9506ac45
10 ms was too fast(. 50 is ok
2012-11-08 10:05:10 +00:00
Merlokbr@gmail.com
bfaecce6eb
there was bug in hf mf mifare
. and speed up this command.
2012-11-08 09:48:02 +00:00
thijsbreman@gmail.com
219a334de5
added: readed blocks (password mode) into tag.sectors[]. 'lf hitag sim' simulates the readed blocks.
2012-10-18 10:01:13 +00:00
roel@libnfc.org
bde10a5057
added hitag2 reading in crypto mode functionality
2012-10-16 15:18:13 +00:00
roel@libnfc.org
ed7bd3a380
Added Hitag2 reading tag memory in password mode
2012-09-19 10:23:19 +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
e5ad43c07e
Power down the field before sending the USB ACK
...
This fixes the bug that the USB communication breaks when collecting PACE nonces with no delay. The delay functionality has not been removed (it doesn't hurt to keep it), but using a delay of 0 is now possible without a high risk of getting too many errors.
2012-09-01 23:54:38 +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
frederikmoellers@aol.de
b0127e65f1
-Fixed a bug in iso14_apdu
...
-According to ISO14443-4, the block number (bit 0) in the PCB needs to be flipped every once in a while. Not doing so leads to the card not responding to commands anymore. The flipping is done according to the standard now.
-Declare iso14_apdu in iso14443a.h to enable usage from other .c files
-iso14_apdu now returns 0 if ReaderReceive returned 0 (to distinguish between the case that ReaderReceive returns -1 and the case that it returns 0)
-Added a new function to change the timeout (to enable changing it from other .c files without the need for a global variable)
2012-08-24 21:00:03 +00:00
Merlokbr@gmail.com
71d90e54cd
hf mf sniff
transfered parity from arm to decoding procedure
2012-07-17 15:19:15 +00:00
Merlokbr@gmail.com
55acbb2a39
improved command hf mf sniff. Now it cant decode nested authentication and cant write emulator files
2012-07-16 14:49:51 +00:00
Merlokbr@gmail.com
39864b0bd4
"hf mf sniff" low level logics works.
2012-07-11 15:52:33 +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
douniwan5788
423efaccad
fixed the mifare bug
2012-07-06 07:06:43 +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
208a0166b9
magic Chinese card fully supported. Added commands:csetuid-set card uid and wipe it, csetblk-set 16 byte block, cload-load dump from emulator memory or emulator file
2012-07-05 10:59:15 +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
7862f4ad5b
fixed output
2012-06-29 12:25:31 +00:00
roel@libnfc.org
9fc6a16779
removed output that slowed down the process, this is to avoid missing frames
2012-06-29 12:21:17 +00:00
roel@libnfc.org
254b70a4af
cleaned up some code
2012-06-29 12:09:24 +00:00
roel@libnfc.org
4ab4336a97
added better tracing capabilities, fixed some reader issues
2012-06-29 10:47:07 +00:00
roel@libnfc.org
81cd0474cb
fixed a lot of simulation issues
2012-06-29 10:24:05 +00:00
dekoninggans@gmail.com
912a3e94e4
iClass support is tweaked so it works with HID readers... waiting for further improvement
2012-06-28 15:41:28 +00:00
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