marshmellow42
f04ef47311
hf mfu info bug fixes
2015-05-11 14:49:37 -04:00
iceman1001
fce738fc90
CHG: minor textual changes, consistency...
2015-05-11 20:38:13 +02:00
iceman1001
f288cb607f
ADD: added a List parameter to tnp3clone.lua script.
2015-05-11 19:38:53 +02:00
iceman1001
0ad970fb02
ADD: another default key: VIGIK1
2015-05-11 19:37:44 +02:00
iceman1001
ebd7412d7d
BUG: Read the wrong page(2) as Capability container, should be 3.
...
BUG: NTAG 215 identification was wrong (!=) should been (==)
2015-05-11 15:54:02 +02:00
marshmellow42
f805ac7a2b
minor adjustments to mfu info
2015-05-08 13:01:27 -04:00
marshmellow42
c585a5cf0b
further MFU info updates (mainly icemans)
2015-05-06 22:15:41 -04:00
iceman1001
802319a37e
ADD: added the new magic detection, where we send a partial ISO14443A_CMD_WRITEBLOCK (0xA0) command to page 0. if the tag answer 0xA ACK (its magic) or if it answers 0x00 NACK its not.
...
The normal behavior for a tag is to send NACK.
2015-05-06 23:50:31 +02:00
iceman1001
334cc089c9
CHG: clearing a char array before using.
2015-05-06 22:41:40 +02:00
iceman1001
aebe77905b
CHG: extracted the UL_C & UL magic tests.
...
ADD: a raw write command also there.
CHG: "hf mfu info" got some more love, looks better too.
UL_EV1 / NTAG, only try known passwords if AUTHLIM is set to 0.
2015-05-06 22:40:46 +02:00
marshmellow42
372a82570b
MFU adj to allow 0 len returns on raw cmds
2015-05-06 10:17:39 -04:00
marshmellow42
45673b9457
MFU adjustment to allow 0 len returns from raw cmds
2015-05-06 10:16:31 -04:00
marshmellow42
abab60ae21
MFU info adjustments
2015-05-06 09:27:03 -04:00
iceman1001
74c7ff4770
CHG: @marshmellows changes to anntations.
2015-05-06 14:20:24 +02:00
iceman1001
2b03dea768
ADD: UL-EV1 signature printing.
...
CHG: @marshmellows changes.
2015-05-06 14:19:23 +02:00
iceman1001
69a2953679
FIX: nasty bug when memcpy structs..
...
ADD: @piwi's topaz commands
2015-05-06 09:30:48 +02:00
marshmellow42
75377d29d6
MFU - Icemans further improvements
...
add UL-C device side read card with authentication
add MF_UL-Annotations
add ntag, and more ul descriptions in hf mfu info
2015-05-06 00:55:29 -04:00
iceman1001
a903be4361
CHG: "HF MFU INFO" extracted more printstatements
2015-05-05 23:26:05 +02:00
iceman1001
b9a3c8642e
ADD: "HF MFU INFO" Reading and printing of UL-EV1 configuration pages.
2015-05-05 23:14:55 +02:00
iceman1001
8297860e25
CHG: making sure no buffer overflows will occure in ul_send_cmd_raw by adding responseLength parameter to all calls.
...
CHG: added UL-C configurations details to be printed
2015-05-05 22:15:02 +02:00
iceman1001
996fda30ee
BUG: missing %s in printing version tagtype. Thanks @Marshmellow!
...
BUG: buffer overflow when reading the Capability Container. Thanks @Marshmellow!
2015-05-05 13:25:54 +02:00
iceman1001
09c2a802a1
ADD: @holimans changes.
2015-05-05 00:31:02 +02:00
iceman1001
f07e76c687
CHG: minor spelling
2015-05-05 00:27:34 +02:00
iceman1001
e1c88b0965
ADD: @marshmellows changes
2015-05-05 00:26:17 +02:00
iceman1001
2c74558d71
CHG: enhanced the "hf mfu info" a lot. It can detect UL/UL-C/UL-EV1/NTAG213/NTAG215/NTAG216
...
and at present it can detect if a UL-C tag is magic (uid changeable)
FOR UL it writes the first configuration pages 0-3.
For UL_C it tests some default 3des keys, and lock / confg bytes at pages 42-43,44-47
For UL_EV1 / NTAG it collects the GETVERSION command and tries to read 3 counters., it also tries one default password of 0xFF,0xFF,0xFF,0xFF for the EV1 /NTAG authentication 0x1B.
FOR UL_C_MAGIC, it tries to see if the gatherd nonces for authentication 0x1A is the same, which indicates on my tags that they are magic.
There is the @marshmellow changes to "hf mfu dump" command.
This commit needs testing, and is to be considered experimental.
2015-05-05 00:25:10 +02:00
marshmellow42
63e1d35a07
Merge remote-tracking branch 'upstream/master'
2015-05-03 23:31:58 -04:00
marshmellow42
f9848fd647
MFU dump UL-C with key
...
adding UL-C auth and keys to dump cmd
swapped endian for input of hf mfu crdbl to match output of hf mfu info
cmd and tag info app
2015-05-03 23:17:11 -04:00
Martin Holst Swende
4b36037948
Fixes to issue #100
2015-05-03 22:09:52 +02:00
marshmellow42
b3125340f3
Icemans UL-C Auth dev side fix plus a few other ...
...
... small UL fixes
2015-05-03 15:41:11 -04:00
iceman1001
1c1c5f4cae
CHG: "hf mfu crdbl" help text, got at correct length 3des key.
...
CHG: Added @marshmellows fixes for "hf mfu info"
CHG: moved some debug printandlog statements around.
2015-05-01 15:33:54 +02:00
marshmellow42
7eec1204e7
fix bug in mfu cauth
2015-04-30 10:34:20 -04:00
marshmellow42
92690507ab
Iceman's updates to MFU info and dump
2015-04-30 09:28:43 -04:00
iceman1001
1ec21089b2
CHG: the work in progress of making "HF MFU INFO" / "HF MFU DUMP" goes on.
...
ook @marshmellows changes and remade them a bit. TagTypeUL_t behaves like a flag-enum.
"HF MFU DUMP" now autodetects tagtype, and the deviceside should report back proper length.
2015-04-30 10:15:52 +02:00
marshmellow42
f168b2633b
MF Ultralight - Iceman's updates + mine
...
Beginning of Ultralight additions.
detection of Ultralight Types added
dump command now auto detects type
can authenticate Ultralight C
2015-04-29 18:27:31 -04:00
iceman1001
a8be77afd1
CHG: re-factored the "HF MFU CAUTH" command to be simpler.
...
ADD: "HF MFU INFO", added detection of MAGIC UL-C tags and a simple loop test 5 default 3des keys.
2015-04-29 20:24:37 +02:00
iceman1001
5e336f53d9
REM: Removed the GetVendorStr, and used the getTagInfo() instead.
2015-04-28 23:32:45 +02:00
iceman1001
5d554ea67f
ADD: HF MFU SETUID, this commands helps changing the UID on a magic UL, UL-C tag.
...
It reads block2, since only one byte is going to change. Then it proceds to write block 0,1,2 with recalc BCC1, BCC2 bytes.
CHG: HF MFU INFO, got some love in the form of detection of UL/UL-C/UL-EV1. Took same idea from HF 14A READER.
2015-04-28 23:31:22 +02:00
marshmellow42
bdfb62b405
Iceman's script aes fix #93
...
Thanks Iceman (note I did not have a tag to double test this one. :)
2015-04-28 15:53:07 -04:00
marshmellow42
4745afb647
Iceman's Issue #96 fix
2015-04-28 15:35:23 -04:00
iceman1001
68bf87e0c5
CHG: added some sanity checks for the Ultralight-EV1 annotations, to make less false positives in the tracelog
2015-04-28 20:59:20 +02:00
iceman1001
466bc4599c
CHG: fixed a better detection for Ultralight, Ultralight-C, Ultralight-EV1 tags.
...
--see https://github.com/Proxmark/proxmark3/issues/96
-- still todo, finding a good way of detecting Magic Ultralight-C tags.
-- thanks @marshmellow for pointing out proper UL-C tags responses is different.
2015-04-28 20:58:18 +02:00
iceman1001
fab0b37968
CHG: removed linebreak in string.
2015-04-26 18:05:45 +02:00
iceman1001
984f957105
ADD: some more default keys.
2015-04-26 18:05:06 +02:00
iceman1001
c309eca94a
CHG: added some linebreaks for the help output in LF.
2015-04-26 18:03:57 +02:00
iceman1001
11b1e2e506
ADD: "HF 14A READ", got ULTRALIGHT C / EV1 annotation
2015-04-26 18:03:21 +02:00
iceman1001
fb2d24882e
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/cmddata.c
client/cmddata.h
client/cmdhfmf.c
client/cmdlf.c
client/cmdlfem4x.h
client/cmdlft55xx.c
client/lualibs/default_toys.lua
client/scripts/tnp3clone.lua
client/scripts/tnp3dump.lua
client/scripts/tnp3sim.lua
2015-04-24 19:04:01 +02:00
iceman1001
395f6a814f
ADD: changes to the Ultralight diviersification algo.
2015-04-24 18:38:24 +02:00
iceman1001
1b3c567df2
ADD: charatect name, level, sequence number,
...
CHG: minor code clean up.
2015-04-24 18:37:40 +02:00
iceman1001
0beb94e67b
CHG: some minor code cleanup.
2015-04-24 18:36:11 +02:00
iceman1001
bb84c38196
ADD: found another sub-type,
2015-04-24 18:35:09 +02:00
iceman1001
e8b07838ab
ADD: more toy-tokens, among others some missing swapforce.
2015-04-24 18:34:24 +02:00
iceman1001
64ad618e9c
ADD: some missing enums:
...
ISO14A_SET_TIMEOUT = 0x40,
ISO14A_NO_SELECT = 0x80,
ISO14A_TOPAZMODE = 0x100
2015-04-24 18:33:31 +02:00
iceman1001
abcb166ffe
ADD: a minor modification to "HF 14A READ" to enable the correct identification between ULTRALIGHT / ULTRALIGHT-C / ULTRALIGHT EV1 tags.
2015-04-24 18:19:51 +02:00
Martin Holst Swende
a3abb02897
Merge branch 'master' of github.com:Proxmark/proxmark3
2015-04-23 09:51:04 +02:00
Martin Holst Swende
0e6c7336b0
Fixed issue with dumping iclass tags > 2KB in size
2015-04-23 09:50:44 +02:00
marshmellow42
8e0cf02308
minor change to lf em4x menu & iceman script...
...
...updates
2015-04-10 00:06:59 -04:00
iceman1001
9c09e006d6
CHG: removed unused code.
...
FIX: moved some checks to make the script run a tad bit faster.
2015-04-09 20:38:38 +02:00
iceman1001
26b8f38b63
CHG: changed some help texts.
2015-04-09 20:36:12 +02:00
iceman1001
68e6434527
FIX: some minor corrections to identify more tokens.
2015-04-09 20:35:04 +02:00
iceman1001
d87779d6d1
FIX: fixed a minor bug introduced when changing from OpenSSL -> PolarSSL.
...
ADD: changed code to handle both encrypt and decrypt AES 128.
2015-04-09 20:34:34 +02:00
marshmellow42
664f658650
nexwatch fix .h file + icemans mf csetblk w arg
...
forgot to include the new nexwatch command in the header...
added icemans hf mf csetblk w parameter fix
2015-04-08 15:08:05 -04:00
marshmellow42
25d3e5cc83
Merge remote-tracking branch 'upstream/master'
2015-04-08 14:19:19 -04:00
marshmellow42
411105e036
added nexwatch demod & iceman lua
...
added nexwatch demod (also added to lf search)
added iceman's lua script adjustments
2015-04-08 14:19:03 -04:00
marshmellow42
322f7eb111
fix to lf t5 detect/read cmds
...
i think this functions fairly well...
still some issues with demod positioning for various reasons.
ASK/Biph/FSK work pretty well
the PSK Demod still needs a little attention to help it better demod
various carriers...
2015-04-08 11:18:29 -04:00
marshmellow42
9632ecbe3d
update t5 detection test()
...
missed this file in last commit... sorry.
2015-04-08 10:12:24 -04:00
Martin Holst Swende
83602affe5
Fixed buffer initialization errors, as reported in http://www.proxmark.org/forum/viewtopic.php?pid=15337#p15337
2015-04-08 13:31:04 +02:00
marshmellow42
fef74fdce4
lf ask consolidation
...
backend:
askman and askraw demods merged into askdemod (args adjusted
accordingly)
re-arranged lfdemod.h in alphabetical order and by category
front end:
data detectclock a (ask) now also reports the selected best start
position for demod
data manrawdecode takes an invert arg now
2015-04-08 01:07:39 -04:00
iceman1001
105ce39607
FIX: two parentheses were missing.
...
FIX: setting the default key to Oxff bug. (http://www.proxmark.org/forum/viewtopic.php?pid15325#p15325 )
FIX: proper initialisation of variables ;)
2015-04-07 18:05:35 +02:00
iceman1001
cff17e78f5
FIX: a wrong comment inside default_toys.lua
...
FIX: a wrong linking to default_toys.lua in tnp3 scripts.
2015-04-07 18:02:29 +02:00
marshmellow42
49bbc60af3
lf cleaning++
...
data askedgedetect - removed unneeded code
lf em em4x50read bug fix / error checking
graph-save/restore auto repaint after restore.
2015-04-07 00:53:06 -04:00
marshmellow42
cc15a1187b
lf cleanup - fixes
...
more lf em em4x50read fixes
adjust heavy clipping ask clock detection
clean up t55xx minor items
2015-04-06 23:17:30 -04:00
iceman1001
ba3fd680fb
FIX: fixed a bug in "hf mf csetblock" where it didn't used the "w" wipe parameter before.
...
CHG: minor textual changes.
2015-04-06 18:52:20 +02:00
iceman1001
7949523515
CHG: default_toys.lua is now able to correct identify over 200 different types.
2015-04-06 18:49:44 +02:00
iceman1001
c3fe354b19
CHG: fix the default_toys.lua file to handle more aspects of information for a given tag.
...
CHG: corrected a bug in tnp3clone.lua that made the script fail to "wipe" a magic tag.
CHG: minor textual change in ndef_dump.lua
2015-04-06 18:47:53 +02:00
marshmellow42
1f918317e2
add maxErr to data manrawdecode
2015-04-05 21:59:36 -04:00
marshmellow42
224ce36eb1
lf t5xx - icemans update
2015-04-05 16:37:41 -04:00
iceman1001
aa77d2b125
FIX: the test scripts hade a problem when sending the new configuration block.
2015-04-05 17:02:13 +02:00
iceman1001
5ac81d0f58
CHG: change the snprint call in GetModelStrFromCID.
...
CHG: tighten up the maxium allowed errors in Biphase (from 1 to zero allowed errors)
2015-04-05 14:28:29 +02:00
iceman1001
6c81ae5574
CHG: the default_toys.lua has the index bytes in mix endiansness. I tried to clean it up and verify them.
...
CHG: The tnp3clone.lua is now faster, and uses the "wipe" parameter to clean the tag before writing all data.
2015-04-05 14:27:12 +02:00
marshmellow42
2767fc0291
lf cleaning
...
remove unneeded code/functions
fix lfdemod askmandemod bug with maxErr=0
silence output for getting samples in lf search
2015-04-05 00:58:57 -04:00
marshmellow42
643fb10b2d
Merge remote-tracking branch 'upstream/master'
2015-04-04 21:29:16 -04:00
marshmellow42
6e98444637
lfdemod reduce duplicate code
...
remove check for best start position in demods and adjust the clock
detect to always return best start position to the demods
also small bug fix in lf em em4x50read
2015-04-02 23:55:12 -04:00
marshmellow42
23f0a7d862
lfem4x cleanup/add/fix
...
changed spacing to tabs for cmdlfem4x.c
finished the partially built lf em em4x50read function
added save/restore GraphBuffer function in graph.c
adjusted some tolerances in lfdemod.c
added a maxLen argument to the askmandemod
2015-04-02 12:48:52 -04:00
iceman1001
b3a8c87d5c
CHG: minor text changes.
...
CHG: cmd+2, to skip first inparameter in string.
2015-04-02 12:08:57 +02:00
iceman1001
7b47fa9b3d
CHG: Script now also test to read block 0 via the chinese magic command if the normal read fails.
2015-04-02 12:07:51 +02:00
iceman1001
49dc1d0a9e
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/Makefile
armsrc/lfops.c
client/cmdlft55xx.c
common/ldscript.common
common/lfdemod.c
2015-04-01 18:02:10 +02:00
iceman1001
218103efd3
ADD: added some changes from Marshmellow
...
CHG: some minor changes to decode output for EM..
2015-04-01 17:57:07 +02:00
iceman1001
815544537c
CHG: code cleanup , added the year control to t55xx trace command.
2015-04-01 17:55:44 +02:00
iceman1001
f2019c773d
CHG: minor comments.
2015-04-01 17:53:33 +02:00
Martin Holst Swende
9795e535c9
Compiler correctly identified a buffer overflow, fixed that and made the code use snprintf instead of unsafe sprintf
2015-04-01 09:24:29 +02:00
Martin Holst Swende
d5d6f22718
Merge pull request #91 from marshmellow42/master
...
lfdemod.c refactoring (+ bug fixes)
2015-03-31 22:11:19 +02:00
marshmellow42
a4669d6ef3
small fix in t5 trace data
2015-03-31 11:30:16 -04:00
iceman1001
02d352fea7
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/iclass.c
armsrc/lfops.c
client/cmdlf.c
common/lfdemod.c
include/usb_cmd.h
2015-03-30 21:11:37 +02:00
iceman1001
ec09716a65
CHG: removed some commented code.
2015-03-30 16:32:04 +02:00
iceman1001
ba765c9edc
CHG: minor correction to the em410xsim help text.
2015-03-30 16:31:13 +02:00
iceman1001
aa60d1560e
NEW: HF MFU SETPWD - set password to a Ultralight C tag.
...
NEW: HF MFU SETUID - set UID to a magic UL / UL-C tag. *not implemented*
CHG: minor alignment for "Hf list" output.
CHG: removed unneeded function parameters to the ultralight commands
CHG: the const MAX_MIFARE_FRAME_SIZE is changed to MAX_FRAME_SIZE in the ultralight commands since the UL-Ev1 can have bigger frames than 18bytes.
CHG: adding DES support for the Ultralight-c read commands on deviceside.
2015-03-30 16:24:03 +02:00
iceman1001
4076250660
CHG: minor fixes to some tnp luascripts
...
ADD: a script to make a barebone clone for tnp3 on a chinese magic s50 generation 1 tag.
2015-03-30 16:15:53 +02:00
Martin Holst Swende
caaf9618ae
Minor mod to 'hf iclass read', it now also reads and prints the configuration of the tag found
2015-03-29 21:49:58 +02:00
marshmellow42
f8f894a50f
rawdemod param cleanup
...
plus lfdemod.h cleanup
2015-03-27 23:47:31 -04:00
marshmellow42
2eec55c8a4
lfdemods streamline & bug fixes
...
removed duplicate code countPSK_FC - adjusted countFC to work.
bug fixes & streamlined code in:
lf hid fskdemod
lf em em410xdemod
cleaned up lfdemod.c some
2015-03-27 00:02:30 -04:00
marshmellow42
e0165dcf3a
Fixed indents to Tabs from Spaces
...
Spacing changes ONLY - no code changes
2015-03-25 14:24:36 -04:00
marshmellow42
c7d169ec02
clean up em410x output
2015-03-24 22:11:32 -04:00
marshmellow42
90677ad99b
EM410x bug fix
2015-03-24 20:26:14 -04:00
iceman1001
0ec548dc21
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/lfops.c
client/cmddata.c
client/cmdlf.c
client/cmdlft55xx.c
client/cmdlft55xx.h
client/scripts/test_t55x7_bi.lua
2015-03-24 11:45:31 +01:00
marshmellow42
9680b11d9e
remove debugging print calls
2015-03-23 20:25:54 -04:00
marshmellow42
1fbf895616
lf updates
...
applies icemans full ata55x7 read/write settings
adds checksum to ioprox (thanks to iceman)
adds silent mode for lf read and getSamples
fix lf em em410xwatch and lf em410xspoof
improve data rawdemod ar - for biphase demods
improve detectclock a for strong antennas
2015-03-23 16:29:50 -04:00
iceman1001
754a35e72b
ADD: added the ioprox checksum test to IOdemodFSK
...
MENTIONED HERE: http://www.proxmark.org/forum/viewtopic.php?id=364&p=6
ADD: changed the layout of the HID descramble patterns a bit, and rearranged some hex/dec outputs.
2015-03-23 17:11:45 +01:00
marshmellow42
13d77ef964
lf t5 read plus lf demod adjustments
...
lf t5xx commands updated from ICEMAN
lf em410x commands updated
lf search bug fix for 2 args
test scripts from iceman
lf demod:
better ask clock detection with Strong fully clipped waves
better ask raw demod with strong fully clipped waves
fsk demod add back in skipped bits during demod
nrz demod add back in skipped bits during demod
2015-03-22 15:28:48 -04:00
iceman1001
9552d5919b
ADD: Added em410x de-scramble patterns: Paxton, Sebury, Pattern1.
2015-03-20 11:48:47 +01:00
iceman1001
6255c8b107
FIX: printEM410x - DEZ 10 was missing highest byte.
...
ADD: printEM410x - Now prints DEZ 3.5B
ADD: printEM410x - Now prints DEZ 3.5C
2015-03-19 22:50:23 +01:00
iceman1001
d21e0f1ce0
ADD: Implemented DEZ-20/ZK for EM410x decoding. Thanks to Asper for docs.
2015-03-19 22:20:35 +01:00
iceman1001
f1170fa79e
ADD: "HF MFU CRDBL", Started to add the password for reading blocks. Wasn't used before :(
2015-03-18 20:34:17 +01:00
iceman1001
251d07dbfb
ADD: cmdlf autocorrelations, also gives a hint to how many bytes the possible correlation is.
...
CHG: "LF SEARCH 1 U" didn't work since the strcmp was too short. Increased length of check.
FIX: @marshmellows fix for faulty em410xdecoding of length less than 64.
2015-03-18 20:32:53 +01:00
iceman1001
1c6490cddc
FIX: test_t55x7_psk.lua now correctly handles bitrate/modulation/clockrate combinations for PSK1.
...
Uncomment lines in main to test PSK2, PSK3.
2015-03-18 20:29:18 +01:00
iceman1001
ca65d3af86
ADD: new tests for the T55XX commands.
...
CHG: minor output messages in cmdlft55xx.c
2015-03-18 17:32:43 +01:00
iceman1001
78e875807f
FIX: narrowed down the detect modulation even further.
...
FIX: minor adjustment to t55xx inside of lfops.c when waiting for the antenna to settle.
FIX: added the possiblity to use graphbuffer fpr LF T55XX DETECT/TRACE/INFO .
MISSING:
the detect, trace, info, doesn't use a password for those tags with enabled password-mode.
2015-03-16 22:45:06 +01:00
iceman1001
05446d5bc3
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/lfops.c
client/cmddata.c
common/crc.c
common/crc.h
common/lfdemod.c
include/crc.h
include/crc.h.old
2015-03-16 13:13:18 +01:00
iceman1001
595b623bf4
CHG: removed an extra space.
2015-03-16 11:40:44 +01:00
iceman1001
8713b64fdf
CHG: @Marshmellow came up with some nifty nice ideas for the t55xx modulation detection, and some minor corrections regarding the enum,
...
CHG: @Marshmellow added PSK1, PSK2, PSK3. Almost complete now. Waiting for Biphase.
ADD: @Marshmellows lf- psk demod changes,
CHG: In "lf t55xx info" the manufacturerer name is now identified and printed.
CHG: In "lf t55xx info" the modell name is now identified and printed, however it can only identify two models presently.
2015-03-16 11:39:31 +01:00
marshmellow42
b41534d142
adjust ask/biphase handling - more complete
...
also added XL EM410x formats
2015-03-15 22:03:50 -04:00
iceman1001
545158b398
FIX: lf t55xx config now handles offsets.
...
FIX: lf t55xx trace now handles offsets.
FIX: lf t55xx info now handles offsets.
2015-03-15 21:36:38 +01:00
iceman1001
db69363840
ADD: started to add a offset possibility for the LF T55XX.
...
Ie.
lf t55xx read 0
lf t55xx special
lf t55xx config o 2
lf t55xx read 0
ADD: added @marshmellows latest changes to psk
2015-03-14 08:43:48 +01:00
marshmellow42
7a8a982bde
adjust pskdemod
...
add skipped bits before first phase back in
PSKDemod now returns 1 for success or 0 for fail like other demods
2015-03-13 20:49:34 -04:00
iceman1001
2c5ed70651
CHG: minor output change, when printing found multiple modulations
...
CHG: PSKDemod should be called like this according @Marshmellow
2015-03-13 21:24:37 +01:00
iceman1001
8a13121435
CHG: now with enums :)
2015-03-13 21:02:04 +01:00
iceman1001
710208245b
ADD: printConfiguration method for a nice printout of the selected configuration.
2015-03-13 19:12:11 +01:00
marshmellow42
e74fc2ecba
give credit where credit is due
...
thanks iceman for the crc :)
2015-03-13 14:00:11 -04:00
iceman1001
8e726f6c37
CHG: Removed an unneccesary parameter for "hf mf sim"
2015-03-13 18:50:30 +01:00
iceman1001
d8c927bcec
FIX: removed a debug statement
...
FIX: initialisation of some variables is done correct.
2015-03-13 18:49:43 +01:00
iceman1001
7b40affb6f
FIX: lf t55xx commands seem to work like they should. Detect now detects between FSK/ASK/NZ/PSK
2015-03-13 17:36:40 +01:00
marshmellow42
9f7bbd24c9
data autocorr additions
2015-03-13 12:23:26 -04:00
marshmellow42
5279085ae7
Merge remote-tracking branch 'upstream/master'
2015-03-13 11:20:00 -04:00
marshmellow42
d9d41e0f3f
minor g-prox-ii demod fix
...
lf search was occasionally outputting false results.
2015-03-13 11:18:55 -04:00
marshmellow42
73d04bb417
data psk demod minor fixes, pyramid demod add CS
...
also adjusted autocorrelate and added a printout for lf search u
2015-03-13 11:09:12 -04:00
iceman1001
33add18764
CHG: rename of methods to follow naming convention
...
CHG: LF T55XX CONFIG now defaults to ASK, non-inverse
2015-03-13 10:05:37 +01:00
iceman1001
108262a145
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-03-13 09:22:12 +01:00
iceman1001
4d60f1562f
FIX: Marshmellow hinted that I should use another fskclock method, which obeys the verbose parameter.
2015-03-13 09:00:04 +01:00
iceman1001
c387fd49a7
CHG: removed a loop after suggestions that it was unnecessary.
2015-03-13 08:59:07 +01:00
pwpiwi
9185099ed8
Merge pull request #75 from pwpiwi/qtmakefile
...
(issue #47 ) use Qt5 includes and libraries, if present
2015-03-13 07:24:56 +01:00
iceman1001
3e4811c8b7
FIX: adding a test to see if we managed to get the correct demodulation from an unknown t55x7 tag.
...
By checking if the configuration data (page 0, block 0) has some settings that must be the same. think reserved 7bits, This is a trail and error approach.
But together with setting a manual configuration to read a tag and this automatic verification it will help out alot I think.
2015-03-12 23:04:02 +01:00
iceman1001
118bfa1b1f
ADD: LF T55XX CONFIG, is almost there, Usage: lf t55xx config [d <demodulation>] [i 1]
...
Options:
h This help
d <FSK|ASK|PSK|NZ|BI> Set demodulation FSK / ASK / PSK / NZ / Biphase
i [1] Inverse data signal, defaults to normal
Examples:
lf t55xx config d FSK - FSK demodulation
lf t55xx config d FSK i 1 - FSK demodulation, inverse data
2015-03-12 19:44:07 +01:00
iceman1001
83a42ef965
FIX: move and rename the CRC8Maxim method into crc.c
2015-03-12 14:12:14 +01:00
iceman1001
3d83b58b50
ADD: added a reference to a generic CRC-8 checksum algo in common/crc.c
2015-03-12 10:10:22 +01:00
iceman1001
5ff3c4017b
add: a experimental lualib, unstable.
...
fix: Introduced a wrong variable name due to "cut & paste" before, now fixed.
2015-03-12 09:50:22 +01:00
iceman1001
04a6113fb5
FIX: correct some lookups in tnp3dump.lua, tnp3sim.lua
...
ADD: added optional parameter (-p) to tnp3dump.lua
2015-03-12 09:46:28 +01:00
iceman1001
963fa1c2b8
FIX: minor correction of the command description for HF 14A RAW.
2015-03-11 22:43:49 +01:00
iceman1001
96f39a47a9
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-03-11 22:21:01 +01:00
iceman1001
3ee8c808c4
ADD: added a CRC64_ECMA implementation
2015-03-11 22:06:23 +01:00
pwpiwi
04bc1c660b
fix: hf 14a raw was broken
...
(see http://www.proxmark.org/forum/viewtopic.php?id=2351 )
2015-03-11 20:19:30 +01:00
pwpiwi
8c04722db6
(issue #47 ) use Qt5 includes and libraries, if present
2015-03-10 19:00:39 +01:00
iceman1001
12d708fec1
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/cmddata.c
client/cmddata.h
2015-03-10 09:18:35 +01:00
Martin Holst Swende
58e93ff593
Merge pull request #74 from marshmellow42/master
...
new and fixed lf sim commands, lf demod refactoring, data gproxIIdemod
2015-03-10 00:25:51 +01:00
iceman1001
652c39c63b
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-03-09 22:03:24 +01:00
marshmellow42
1302428367
finish data printdemodbuffer command
2015-03-09 16:56:00 -04:00
pwpiwi
16a95d76ac
fix: (issue #73 ) hf mf cload didn't work. Add more annotations for Magic Cards operation.
2015-03-09 21:36:27 +01:00
marshmellow42
5658e82e1e
sim buffer max settings tests
2015-03-09 15:58:06 -04:00
marshmellow42
ada339a10f
biphase bug fixes
2015-03-09 15:27:20 -04:00
marshmellow42
d66d484347
fixed rawdemod help options
2015-03-08 18:07:01 -04:00
marshmellow42
712ebfa6df
1 bug fix + code trimming
2015-03-07 23:31:23 -05:00
marshmellow42
df51693f95
Merge remote-tracking branch 'upstream/master'
2015-03-06 12:30:16 -05:00
marshmellow42
78f5b1a77c
lf sim fixes/creations correct now
...
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
2015-03-06 12:28:54 -05:00
marshmellow42
e09f21fa7b
Revert "lf sim fixes/creations"
...
This reverts commit 293de1bad7
.
2015-03-06 12:26:33 -05:00
marshmellow42
293de1bad7
lf sim fixes/creations
...
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
2015-03-06 12:25:36 -05:00
iceman1001
3ac59c7fed
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/crapto1.c
armsrc/iclass.c
client/nonce2key/crapto1.c
2015-03-06 09:02:15 +01:00
ikarus
9cefee6f42
Fixed issue #36 & improved file consistency.
2015-03-04 11:00:39 +01:00
marshmellow42
39676885b4
Merge remote-tracking branch 'upstream/master'
2015-03-03 20:44:37 -05:00
Martin Holst Swende
27eabcdccb
Added brackets around crc field in protocol listings
2015-03-02 21:05:44 +01:00
marshmellow42
40b9bb85e6
oops... should this file should not have been there
2015-03-02 14:44:05 -05:00
marshmellow42
8d960002c8
lf cmds fix, add, show
...
show command to UI:
data printdemodbuffer - allow printing of demod buffer
Add:
data askgproxiidemod - demod a gproxii tag
Fix:
adjust lf simxxx commands further for testing
2015-03-02 14:42:55 -05:00
marshmellow42
ec9882b18c
PSKDemod Bug Fix
2015-02-22 21:11:25 -05:00
marshmellow42
3f41e73c7f
PSK demod adjustment
...
add carrier length test to weed out false positive demods
2015-02-22 20:09:58 -05:00
marshmellow42
3bc66a96fe
added PSK2 to lf simpsk
...
testing still ongoing.
2015-02-21 22:54:52 -05:00
marshmellow42
872e3d4d6f
NEW lf simpsk
2015-02-21 21:36:02 -05:00
marshmellow42
b4a2fcf676
Split output from nrz raw demod function
...
missed this one last time
2015-02-21 18:37:15 -05:00
marshmellow42
4ac906d1c2
split output from rawdemod functions
...
now allows for non-verbose calling:
ASKmanDemod
ASKrawDemod
FSKrawDemod
PSKDemod
2015-02-21 00:27:48 -05:00
marshmellow42
40148ab609
Merge remote-tracking branch 'upstream/master'
2015-02-19 21:38:17 -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
iceman1001
f4a57e861d
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/iclass.c
client/loclass/cipher.c
client/loclass/fileutils.h
2015-02-19 11:32:11 +01:00
Martin Holst Swende
0387cd3393
Merge pull request #68 from iceman1001/feature
...
ADD: identifications.
2015-02-19 10:51:10 +01:00
Martin Holst Swende
181e6db6a9
Merge pull request #67 from marshmellow42/master
...
Small help and command description updates
2015-02-19 10:50:51 +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
Martin Holst Swende
b67f7ec359
Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode
2015-02-18 20:02:44 +01:00
Martin Holst Swende
9a9bcea82b
Iclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness-paper
2015-02-17 23:17:43 +01:00
Martin Holst Swende
41524d8a39
Implemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclass tag dumps, but requires the decryption file to be present on the filesystem
2015-02-17 22:07:40 +01:00
iceman1001
0853ffa29c
ADD: added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's
2015-02-16 19:06:24 +01:00
iceman1001
33315928fb
CHG: added some more token-tags.
2015-02-16 19:05:59 +01:00
iceman1001
3a72fdf5b0
CHG: minor modification to "hf mf csetblk" The usuage of UID array is not needed.
2015-02-16 19:01:52 +01:00
iceman1001
5b3811fc0e
ADD: added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's
2015-02-16 19:01:09 +01:00
iceman1001
bd8baee9df
CHG: added some more token-tags.
2015-02-16 19:00:17 +01:00
iceman1001
d716ca2fc1
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/iclass.c
2015-02-16 18:59:44 +01:00
marshmellow42
8db0534ed1
Merge remote-tracking branch 'upstream/master'
2015-02-14 21:16:27 -05:00
marshmellow42
cc2ea5ed82
Clean up Helps and command descriptions
2015-02-14 21:15:13 -05:00
Martin Holst Swende
a4749080d9
Removed un-implemented 'hf iclass write', it's confusing to have there since there's no actual support for this on the device side
2015-02-14 21:18:39 +01:00
Martin Holst Swende
534445139c
Reformatted
2015-02-14 21:17:08 +01:00
Martin Holst Swende
7781a65656
Started work on 'hf iclass eload' - only client side so far, not yet supported in the device
2015-02-14 21:15:53 +01:00
Martin Holst Swende
428d622160
Fixed bug with iclass dump which prevented saving to file
2015-02-14 20:42:23 +01:00
iceman1001
6af88242eb
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/util.c
2015-02-14 12:30:08 +01:00
iceman1001
68008fb517
add: timeouts for "lf read"
...
chg: change command consistency "lf t55xx rd" -> "lf t55xx read"
chg: buffer size used for armside is quite big. maybe to big. takes too long to read.
2015-02-14 12:29:02 +01:00
marshmellow42
abd16c456a
fix help on data rawdemod commands
2015-02-13 21:17:15 -05:00
Martin Holst Swende
2e2fc9fa6b
Merge branch 'master' of github.com:Proxmark/proxmark3
2015-02-13 19:59:50 +01:00
Martin Holst Swende
699bb9dc27
Removed some dev- printouts
2015-02-13 19:59:28 +01:00
iceman1001
b359cee677
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-02-13 10:16:39 +01:00
iceman1001
4e7af352b4
chg: step two for t55xx commnads
2015-02-13 10:16:21 +01:00
Martin Holst Swende
17c60b1248
Merge pull request #63 from marshmellow42/master
...
lf data combine rawdemods & depreciate cmds
2015-02-13 10:11:40 +01:00
Martin Holst Swende
37735250ca
Merge pull request #66 from iceman1001/feature
...
ADD: identification of EM4233
2015-02-13 10:11:09 +01:00
iceman1001
31b3689f0b
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/epa.c
2015-02-12 09:54:21 +01:00
Martin Holst Swende
8b9393d3bd
fixed issue #65
2015-02-12 08:21:58 +01:00
pwpiwi
19a700a8b5
hf 14a: if the tag supports it, set default timeout according to ATS
...
hf epa: remove explicit but arbitrary timeout settings
Bugfix: don't timeout when frame transmission has already started
2015-02-11 22:20:22 +01:00
iceman1001
070e36d421
ADD: identification of EM4233
2015-02-11 17:14:26 +01:00
iceman1001
0310364d23
chg: the inital modification of t55xx commands to use Marshmellows new demod functions.
...
fix: merged readblock & readblockPWD command.
New syntax: "lf t55xx rd <block> <password>" -- OPTIONAL password
fix. merged writeblock & writeblockPWD command.
New syntax: "lf t55xx wr <block> <data> <password>" -- OPTIONAL password
2015-02-11 17:13:30 +01:00
iceman1001
00a863f9ad
ADD: identification of EM4233
2015-02-11 17:08:16 +01:00
iceman1001
4ecde0e1ff
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/iclass.c
2015-02-10 21:53:16 +01:00
Martin Holst Swende
61972abbdd
Merge branch 'master' into GenericTracing
...
Conflicts:
armsrc/iso14443a.c
2015-02-10 21:25:14 +01:00
iceman1001
1e3a799d47
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-02-10 09:01:31 +01:00
iceman1001
2b61c24212
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
armsrc/lfops.c
2015-02-10 08:58:14 +01:00
Jesse Hallio
3bba7deac0
Add settable ATQA and SAK to hf mf csetuid command.
2015-02-10 04:31:53 +02:00
marshmellow42
7e72f90a7f
Merge remote-tracking branch 'upstream/master'
2015-02-09 16:47:24 -05:00
pwpiwi
0d0d049967
hw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning graph only when LF antenna is connected.
2015-02-09 22:36:53 +01:00
marshmellow42
19ff0210fa
lf data combine rawdemods & depreciate cmds
...
new:
data rawdemod
replaces:
data askmandemod
data askrawdemod
data fskrawdemod
data nrzrawdemod
data psk1rawdemod
data psk2rawdemod
also commented out of the CommandTable but did not remove the commands:
data askdemod
data bitstream
data fskdemod
data mandemod
data threshold
2015-02-09 16:25:12 -05:00
marshmellow42
f3bf15e484
lf/data combined detectclock functions to one
...
cleaned up detect clock functions - now uses one main function that
takes a char argument to select which modulation to detect the clock for
REMOVED commands: pskdetectclock, nrzdetectclock, fskfcdetect.
renamed DetectClock function to DetectAskClock to be more descriptive.
2015-02-09 11:11:04 -05:00
marshmellow42
b4fb11ba92
fix inconsistent spacing within functions
...
did not convert spaces to tabs but made the functions consistent with
what it used so it can be auto converted.
(sorry for the annoying space/tab usage in the past.)
we can convert all to tabs later.
2015-02-08 00:48:00 -05:00
marshmellow42
be2cf126bf
Merge remote-tracking branch 'upstream/master'
2015-02-06 14:45:46 -05:00
marshmellow42
6de4350803
data askraw patches, data askedgedetect demod,
...
data askraw patches - added amp option (for stubborn waves)
NEW data askedgedetect demod for manual demod,
adjusted detectclock (ask clock) in case of cleaned (edgedetect) waves
finish maxErr args
finish psk detect
2015-02-06 14:36:25 -05: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
marshmellow42
e770c64824
lf psk/nrz split, add maxErr argument
...
changed psk to use wave lengths instead of peaks
split out NRZ from psk demod
added maxErr argument to raw demods (except fsk)
2015-02-05 17:01:18 -05:00
Martin Holst Swende
146c201cbe
Merge pull request #55 from jessegit/master
...
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext
2015-02-05 19:43:46 +01:00
Martin Holst Swende
b37235637f
Merge pull request #57 from iceman1001/feature
...
FIX: LF TI WRITE inparameters didn't get copied by sscanf.
2015-02-05 19:43:26 +01:00
iceman1001
5c2b11eb3c
FIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64" and uses the 012"llx" instead.
2015-02-05 15:46:23 +01:00
iceman1001
e57fe796f5
FIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64" and uses the 012"llx" instead.
2015-02-05 15:43:50 +01:00
iceman1001
a6cfa75035
add: lots of new toytypes in default_toys.lua
...
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua
2015-02-04 11:49:21 +01:00
iceman1001
385f398740
prepare to update the LF T55XX commands
2015-02-04 11:48:36 +01:00
iceman1001
a8d4906ba5
add: lots of new toytypes in default_toys.lua
...
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua
2015-02-04 11:40:49 +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
1f78a4d305
Merge pull request #54 from Proxmark/lf_recorder
...
LF: Ability to do longer traces/snoops
2015-02-02 19:54:07 +01:00
Martin Holst Swende
0644d5e3a3
Merged with master
2015-01-31 18:21:38 +01:00
Martin Holst Swende
c856ceae8a
Fixed undecimation command
2015-01-31 12:42:40 +01:00
Martin Holst Swende
698b649e0e
Added undec to un-decimate data on the client side, so we can use all those sweet demodders even if the data has been decimated on the ARM side
2015-01-31 00:05:04 +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
iceman1001
c4e3b1b6a2
Change in progress, the adjustments to use Marshmellow's new demod for T55XX commands.
2015-01-30 15:45:56 +01:00
iceman1001
e58c712c9e
ADD: a switch to detect if Qt4 or Qt5 is used.
2015-01-30 15:23:01 +01:00
iceman1001
908536d161
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/cmddata.c
2015-01-30 15:22:01 +01:00
Iceman
0c5998c051
Update cmddata.c
...
as suggested, a bitwise bounds check in cmddata.
2015-01-30 15:17:07 +01:00
iceman1001
21e06301b9
Call to GetClock had wrong number of inparameters
...
Added missing functions to header file
2015-01-30 09:26:03 +01:00
iceman1001
f4a694f998
ohps, forgot to multiply it up again.
2015-01-30 09:23:49 +01:00
iceman1001
33c7e2f3bc
wrong letter in variable name
...
Conflicts:
client/cmddata.c
2015-01-29 22:35:19 +01:00
iceman1001
7ea7465bbb
wrong letter in variable name
2015-01-29 22:22:29 +01:00
iceman1001
b6bf652821
Minor bounds checks for setDemodBuf and printDemodBuff
2015-01-29 21:44:24 +01:00
iceman1001
64d1b4efc9
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/Makefile
armsrc/appmain.c
armsrc/apps.h
armsrc/epa.c
armsrc/iclass.c
armsrc/iso14443a.c
armsrc/iso14443a.h
armsrc/iso15693.c
armsrc/lfops.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
armsrc/string.h
armsrc/util.h
bootrom/bootrom.c
client/Makefile
client/cmddata.c
client/cmddata.h
client/cmdhf.c
client/cmdhf14a.c
client/cmdhf14b.c
client/cmdhf15.c
client/cmdhficlass.c
client/cmdhfmf.c
client/cmdhfmfu.c
client/cmdlf.c
client/cmdlfem4x.c
client/cmdlfhid.c
client/cmdlfhitag.c
client/cmdlfio.c
client/cmdmain.c
client/data.h
client/flash.c
client/graph.c
client/graph.h
client/loclass/elite_crack.c
client/loclass/fileutils.c
client/lualibs/commands.lua
client/lualibs/html_dumplib.lua
client/lualibs/mf_default_keys.lua
client/lualibs/utils.lua
client/mifarehost.c
client/nonce2key/crapto1.c
client/proxmark3.c
client/scripting.c
client/scripts/tnp3dump.lua
client/scripts/tnp3sim.lua
client/scripts/tracetest.lua
common/Makefile.common
common/cmd.c
common/cmd.h
common/lfdemod.c
common/lfdemod.h
common/usb_cdc.c
common/usb_cdc.h
include/usb_cmd.h
2015-01-29 21:39:33 +01:00
Martin Holst Swende
92623113b4
Minor documentation on 'hf list'
2015-01-29 20:01:30 +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
Martin Holst Swende
936e0729f9
Merge pull request #49 from marshmellow42/master
...
LF Demod Bug Fix & new traces
2015-01-27 22:14:39 +01:00
Martin Holst Swende
383608a63a
Minor fixes to iso14443a annotations
2015-01-27 21:55:08 +01:00
marshmellow42
a1d17964a2
lf demod bug fix & refactor
...
fixed bug in lfops.c in hid fskdemod
refactored data fskXXXDemods for specific tags to use more common code.
2015-01-27 14:51:12 -05:00
Martin Holst Swende
08e8317c21
More annotations to iso14443b protocol listings
2015-01-27 16:34:45 +01:00
marshmellow42
8c65b650e8
clean up some comments
2015-01-26 17:49:30 -05:00
marshmellow42
04d2721b3c
lf psk demods
...
clarify existing as psk1
added psk2 demod
2015-01-26 17:23:19 -05:00
marshmellow42
9c0f13d5dd
Merge remote-tracking branch 'upstream/master'
2015-01-26 17:07:49 -05:00
Martin Holst Swende
dca558bf9e
Removed last trace of crypto from makefile
2015-01-26 20:56:33 +01:00
Martin Holst Swende
e629181f5a
Fixed issue where -1 size_t was returned
2015-01-22 21:04:16 +01:00
Martin Holst Swende
afceaf4018
Removed openssl from the mfu-stuff
2015-01-22 21:02:21 +01:00
marshmellow42
03e6bb4aed
lf FSK demod tools/fixes
...
added full ability to detect FSK clocks
applied autodetect of fsk clock to data fskrawdemod
this finished data fskfcdetect (now detects field clocks and bit clock)
2015-01-22 14:24:03 -05:00
Martin Holst Swende
388c92bde5
Generic tracing pt.4: Deprecated old 'hf 14b list' command
2015-01-22 00:19:20 +01:00
Martin Holst Swende
c54d1394c6
Fixed compiler error
2015-01-22 00:10:09 +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
iceman1001
df3e429d71
minor fix for a help in "hf 14a snoop"
2015-01-21 21:24:37 +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
a1557c4c2f
Minor fixes: Array inits, some array bounds checks.
...
ADD: some extra help text for lf snoop
ADD: HasGraphData - function in graph.c
ADD: DetectHighLowInGraph - function in graph.c
2015-01-20 22:14:56 +01:00
iceman1001
e469159145
FIX: another file_path found in loadTraceCard and saveTraceCard, is now corrected to follow FILE_PATH_SIZE variable.
...
FIX: some filehandles that didn't get closed.
2015-01-20 21:58:53 +01:00
iceman1001
80b1b53fa3
SUGGESTED FIX:
...
Issue: https://github.com/Proxmark/proxmark3/issues/35
Forum: http://www.proxmark.org/forum/viewtopic.php?pid=7883#p7883
Where "hf mf csetuid" empties the rest of the block0 bytes.
This fix loads the old block0 and replaces the uid+sak+ataq bytes only.
2015-01-20 21:55:19 +01:00
iceman1001
fe5b3a4424
FIX: The 14b write command (CmdHF14BWrite) now turns off antenna after call.
2015-01-20 21:50:49 +01:00
iceman1001
e3c235654f
Minor fixes to some help-texts.
2015-01-20 21:48:39 +01:00
iceman1001
81740aa519
STEP 3 - the actual new files for Ultralight.
...
ADD: script remagic.lua -- a script to make a "dead" Mifare s50 generation 1 alive again.
ADD: tracetest.lua - This script will load several traces files in ../traces/ folder and do
"data load"
"lf search"
ADD: test_t55x7_psk.lua - iterates thru a lot of calls to check the new psk demods.
all new scripts implements the "-h" for help text.
2015-01-20 21:29:55 +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
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
marshmellow42
53d85a8fa1
Merge remote-tracking branch 'upstream/master'
2015-01-18 18:19:26 -05:00
marshmellow42
1e090a61a1
lf demod additions
...
data fskfcdetect (field clock and bit clock detect for FSK)
data fskdemodawid -AWID demod/decode
data fskdemodpyramid - AWID demod/decode
2015-01-18 18:13:32 -05:00
Martin Holst Swende
b689b842b6
Bugfix 'hf list 14b' and 'hf list raw'
2015-01-16 22:48:30 +01:00
Martin Holst Swende
41fdd0f061
First stab at adding 'hf list 14b' and 'hf list raw'
2015-01-16 22:41:19 +01:00
Martin Holst Swende
55c7e3520f
Merge branch 'master' of github.com:Proxmark/proxmark3
2015-01-16 15:49:11 +01:00
Martin Holst Swende
49726b4088
Improved 'hf list iclass' a bit, better understanding of the protocol and when to apply CRC checks
2015-01-15 23:00:39 +01:00
Martin Holst Swende
5c72368e2d
Merge pull request #44 from marshmellow42/master
...
small lf demod bug fixes and threshold adjustments
2015-01-15 21:53:18 +01:00
Martin Holst Swende
d60418a05f
Synchronized loclass library, imported the legal warning
2015-01-15 16:30:05 +01:00
marshmellow42
84871873a4
Small lf bug fixes and threshold adjustments
...
adjusted lf demod thresholds based on additional testing
fixed bug in hid bit length calc in cmddata.c
fixed bugs in lf search
2015-01-13 17:21:36 -05:00
marshmellow42
ae6ead3dc8
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
client/cmdlf.c
2015-01-13 16:02:23 -05:00
Martin Holst Swende
896473399b
Actually add the FILES also, doh
2015-01-12 22:16:46 +01:00
Martin Holst Swende
1f6417a9b2
Removed dependency on openssl, added AES implementation from polarssl instead
2015-01-12 21:47:36 +01:00
Martin Holst Swende
68033ed776
Fixed error when no match is found for uidmapping
2015-01-11 21:49:13 +01:00
iceman1001
f004ba08d4
ADD: test_t55x7_psk.lua, a script which writes to block 0 (configation) of a T55x7 tag and tries do verify the psk demods. 12 different test configuration blocks is used.
2015-01-10 19:48:29 +01:00
iceman1001
86dab5168e
FIX: arguments took too much.
...
FIX: lf search didn't load from graphbuffer..
2015-01-10 15:59:05 +01:00
iceman1001
0a43c39617
ADD: scripts/tracetest.lua is a simple script that tries to load from traces folder files starting with EM* and MOD* and runs the following on them one-by-one. "Data load" ; "LF Search"
2015-01-10 15:50:10 +01:00
marshmellow42
ac3ba7ee69
lf search use new psk, small demod adjustments
...
adjust thresholds for ask, fsk, io, psk based on more sample testing
adjust indala decode to set clock to 32 if no input (autodetect not
always correct)
2015-01-09 16:46:17 -05:00
Martin Holst Swende
473124be92
removed double include
2015-01-09 21:51:34 +01:00
Martin Holst Swende
f44a01235c
Merge branch 'master' of https://github.com/iceman1001/ForPm3
2015-01-09 21:50:36 +01:00
iceman1001
cb8c358f4d
FIX: antenna was not turn off after "hf 14b write" command. The method is using "hf 14b raw" underneath, which meant an parameter "-p" had to be removed.
2015-01-09 21:45:49 +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
iceman1001
03d7b60f2b
ADD: default_toys.lua a script which identify tnp3xx tags
2015-01-08 17:36:01 +01:00
marshmellow42
c12512e99a
minor code cleanup
2015-01-07 23:02:00 -05:00
marshmellow42
d6d20c5435
cmddata.c changes by others - reapply
...
i overwrote some changes in cmdsamples. i fixed that
i also removed some comments in graph.c
2015-01-07 19:06:29 -05:00
marshmellow42
3179383f85
put cmdlf.c back (only changes spaces to tabs)
...
to make my pull request easier to weed through
i did not make any changes to cmdlf just de-spaced it - so i put it back
for now.
2015-01-07 18:45:47 -05:00
iceman1001
8e863ab641
FIX: forgot to add the function in the header file.
2015-01-08 00:20:22 +01:00
iceman1001
c3bfb9c76b
ADD: a CmdEM410xWatchnSpoof in cmdlfem4x.c , looks for a tag, then replays it.
...
minor code clean up.
2015-01-08 00:17:40 +01:00
iceman1001
3de045905f
ADD: a CmdEM410xWatchnSpoof in cmdlfem4x.c , looks for a tag, then replays it.
...
minor code clean up.
2015-01-08 00:16:33 +01:00
marshmellow42
3aa4014baa
Fix Tune Samples (broken in commit 12/31 by me)
2015-01-07 18:14:28 -05: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
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
1d660bb993
Added Pm3-master changes from Holiman.
...
REM: removed some old test code to cmdhf15 read.
2015-01-07 23:52:33 +01:00
iceman1001
79bf1ad2cc
ADD: Jonor's timeout patch for "Hf 14a raw".
...
minor code clean up
2015-01-07 23:23:17 +01:00
iceman1001
b5be31f996
FIX: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault.
...
ADD: crc32.c functionality
2015-01-07 22:56:20 +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
14edfd09c3
CHG: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault.
...
Minor code clean up.
Added from Pm3-master which will make this fork one step closer to Pm3-master.
2015-01-07 22:51:34 +01:00
iceman1001
b915fda392
FIX: a solution for the issue "hf mf esave - always saves 4K"
...
FIX: a solution for the issue "hf eload, esave, cload, save - filepath variable too short"
CHG: minor code clean up.
ADD: AES / CRC16 for lua. (and tnp3xx scripts.)
ADD: tnp3dump.lua script to dump tnp3xx tags.
ADD: tnp3sim.lua script to let PM3 imitate an tnp3xx tag. Needs to be tested live
2015-01-07 22:00:29 +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
Martin Holst Swende
4df54240c1
Added some more protocol support to the list annotation. Based on http://www.proxmark.org/forum/viewtopic.php?pid=13541#p13541
2015-01-07 21:14:32 +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
79544b28ad
CHG: minor code clean up
...
ADD: added some helper-functions in util.c
2015-01-07 20:52:03 +01:00
iceman1001
3af373f352
CHG: Added support for tnp3xx in lua scripts.
...
ADD: a save file function in lua.
2015-01-07 20:45:43 +01:00
iceman1001
c0e6c18bf5
FIX: more minor issues with block Numbers.
...
KNOWN BUG: Right now, it kind of defaults to Block 0 when a getparam8 failes. (like writing "hf mfu rdbl k", ie a letter instead of number). This bug is the same all over the pm3 source-code.
2015-01-07 19:01:00 +01:00
iceman1001
5f2cb31bca
CHG: spelling errors, added help texts in cmdhfmfu.c
...
CHG: refactored the "hf mfu rdbl/wrbl/crdbl/wrbl" commands.
CHG: added a cauth test to "hf mfu info" command to see if the tag is a Ultralight-C tag or not.
2015-01-07 18:50:51 +01:00
iceman1001
225ccb910e
ADD: new defines: iso14443_CMD_AUTH_KEYA, iso14443_CMD_AUTH_KEYB, iso14443_CMD_AUTH_RESPONSE, iso14443_CMD_AUTH_STEP1, iso14443_CMD_AUTH_STEP2, CHINESE_BACKDOOR_INIT, CHINESE_BACKDOOR_STEP2,
...
REM: removed old comments in bootrom.c
CHG: mifare ultralight & desfire commands inside arm has been cleaned up. Next step is to refactor it into armsrc/mifaredesfire.c
2015-01-07 17:42:57 +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
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
99a714185e
CHG: Refactored the HF MFU udump/ucdump commands into one method.
2015-01-06 21:08:20 +01:00
iceman1001
e3ab50cafb
CHG: rename the HF MFU * commands.
...
ADD: added a HF MFU INFO commmand, where you can see some tag info. Used to be in the readcard command.
FIX: minor code clean up for ultralight & desfire commands in armsrc/mifarecmd.c, armsrc/mifaredesfire.c, armsrc/mifareutil.c
CHG: Lowered the default MF_DBGLEVEL, it set to MF_DBG_ERROR.
CHG: lowered a testing value for timeout in cmdhf14a.c
2015-01-06 17:43:31 +01:00
iceman1001
dd683ece72
FIX: a compilation error for a static method in CmdHF14A.h
2015-01-06 15:36:33 +01:00
iceman1001
10403a6a30
ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list.
...
ADD: added a manufacturer list for hf 14a reader, only viable when UID is double or triple size. Thanks to Asper for the list.
ADD: Some changes from Holimans commits.
CHG: some more code clean up.
2015-01-06 11:17:02 +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
iceman1001
0452ec6c90
FIX: downloaded a fresh clone from my fork, and took away the build-errors.
2015-01-05 15:12:48 +01:00
Martin Holst Swende
6f101995b6
Added loclass-functionality into the pm3,the functionality provided by loclass can now be invoked directly from the pm3. Also fixed some issues with how prnlog called PrintAndLog, and added some testdata for the loclass self-tests
2015-01-05 09:16:06 +01:00
iceman1001
d3a22c7dfa
ADD: Holimans new changes in master.
2015-01-05 02:01:24 +01:00
iceman1001
f0cf62cd73
FIX: fixed a little bug I introduced from last commit in fskdemod
...
CHG: tab fixes in cmdlf.c and minor code clean up
CHG: minor variable name change, printstatement in cmddata.c
2015-01-04 23:43:07 +01:00
iceman1001
8d0a3e87d7
FIX: a shot at fixing the "_" underscore problem in fileutils.c. This one uses _ifdefine. I hope it works. Linux people can let me know if it works.
...
FIX: changed the DetectASKClock in lfdemod.c to correct detect all clocks in the array.
CHG: I like code with more spaces inside of it and tried change some stuff according to our codestyle in HACKING.txt
ADD: some zero checks and overflows, god knows where it was.
The T55XX commands will be rewritten to use Marshmellows lfdemod.c instead.
CHG: Made the graph window smaller.
CHG: lf read now does a "data samples" also. (less writing commands)
CHG: data samples now defaults to samples size of 20000
2015-01-04 22:49:54 +01:00
Martin Holst Swende
337818f7ab
Minor dox
2015-01-04 21:26:10 +01:00
Martin Holst Swende
4c3de57ad2
Reworked how 'hf 14a list' and 'hf iclass list' works, to use the same method. Now. use 'hf list 14a' and 'hf list iclass' instead. Plus, the output is now annotated (although the annotation-engine could use a bit more love from someone more familiar with the available commands
2015-01-04 21:22:54 +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
iceman1001
b1329a0264
chg: updated the README.txt
...
chg: updated the commands.lua so it is in sync with usb_cnd.c definitions.
2015-01-02 00:09:59 +01:00
iceman1001
0a966150a0
Updated the README.txt
...
CHG: added marshmellows last changes with rtrim, and minor fixes.
DEL: code cleanup in usb_cdc.c
2015-01-01 14:07:42 +01:00
marshmellow42
ac914e56db
minor adjustment to askmandemod for lf search
...
returns false if it finds data but not an EM410x format.
2014-12-31 14:55:58 -05:00
marshmellow42
9ec1416ad2
added data rtrim command
...
enter location to trim all samples after
2014-12-31 14:43:49 -05:00
iceman1001
c579a5871e
CHG: modified cmdlf.c - CmdLFfind with a parameter to accept traces loaded with "data load". ie: "lf search 1" == take data from previously loaded.
2014-12-31 12:01:00 +01:00
iceman1001
6ff6ade2f5
ADD: midnitesnakes desfire, ultralight changes from Unstable branch.
...
ADD: Marshmellows fixes for the LF (demods) commands, (LF SEACH)
ADD: Holimans changes with hash1_brute
FIXES: minor fixes with some calls to "free" and redundant debug statement and code cleanup. removal of commented code.
2014-12-31 11:35:43 +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
d5a72d2fee
LF demod/cmd code cleanup + new lf search
...
cleaned up and error proof code. plus added new command lf search
when online it will lf read - data samples 20000 - and test for EM410x,
HID, IO Prox, and indala cards. when offline it will test current
graphbuffer.
2014-12-30 16:08:33 -05:00
marshmellow42
6bfa18eab4
Merge pull request #1 from Proxmark/master
...
Test
2014-12-29 16:14:23 -05:00
marshmellow42
2df8c07907
minor setting adjustments/cleanup
...
clean up code
2014-12-29 15:58:59 -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
iceman1001
9c7c222c03
FIX: minor fixes to the new feature in "hf 14a reader". Not turning off the field and the consequent changes to the define names. (CMD_MIFARE_EML_CGETBLO -> CMD_MIFARE_CGETBLO)
2014-12-26 22:38:23 +01:00
iceman1001
d52e4e8819
ADD: HF 14A READER is now able to see if a presented card responses to the chinese magic backdoor commands.
...
FIX: simple namechange of some defines where it hinted it was related to "eml" when it wasn't.
2014-12-26 21:32:58 +01:00
iceman1001
1b492a97af
ADD: marshmellows new lf command and DetectClock. (works great!)
...
FIX: a suggested patch for "hf mf csetuid" (https://github.com/Proxmark/proxmark3/issues/35 )
FIX: fixed a bug in iso14443a_select_card where the len variable wasnt set, this made desfire/magic cards not work.
2014-12-26 20:02:59 +01:00
marshmellow42
9e6dd4eb69
rename askrawdemod to askmandemod
2014-12-24 13:01:09 -05:00
marshmellow42
0e74c023bd
Created new detectclock function + EM decode addons
...
new detectclock is somewhat more reliable for ASK modulated tags. added
this detect to askrawdemod if no clock in passed as an argument. also
added more EM ID formats to output
2014-12-24 11:48:41 -05:00
marshmellow42
cd48c19c31
minor askrawdemod adjustment if errors in demoding are found
...
if it can't find a demod position with no errors it will find the one
with fewest errors and mark errors with 77.
2014-12-23 15:16:53 -05:00
marshmellow42
2fc2150ea8
Add auto check for EM410x format to askrawdemod cmd
...
added EM410x format check and print to the data askrawdemod command. if
it finds valid em410x format & parities it will print the EM ID and
Unique ID and a few others.
2014-12-23 12:00:13 -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
ea7d657f75
minor fix - got too comment happy removing test code
...
should not have commented this code out
2014-12-22 22:50:13 -05:00
marshmellow42
e888ed8e62
added new data askrawdemod command
...
added new data askrawdemod command returned data fskdemod and separated
out new fskrawdemod commands
2014-12-22 17:46:28 -05:00
iceman1001
3bc3598e88
added the changes from PM3 master.
...
added some code for the AWID26
2014-12-22 15:14:05 +01:00
pwpiwi
545f203826
adapted hf iclass list to new trace format
2014-12-20 21:32:44 +01:00
marshmellow42
ae2f73c12d
put ask demod and mandemod
...
put ask demod and mandemod back until i have time to test it
2014-12-19 12:39:41 -05: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
iceman1001
f5ed4d12de
ADD: started with adding a LF AWID26 write function. not done yet.
...
ADD: latest pwpiwi & holiman changes.
2014-12-19 13:46:02 +01: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
pwpiwi
f10bf20c6c
Format hf 14a list output for bigger frame sizes
2014-12-18 19:39:16 +01:00
Martin Holst Swende
8e9768399c
minor change
2014-12-18 14:46:38 +01:00
Martin Holst Swende
0eea34a2a3
Fixed error in hash1 (from loclass), now it possibly calculates the KSel correctly for actually dumping data
2014-12-18 14:41:17 +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
iceman1001
d3499d369d
minor fixes regaring the newly released patches from the pm3 community
...
plus removed old comments in cmdmain.c
2014-12-17 22:26:16 +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
iceman1001
a501c82b19
Applied Holiman's fixes for iclass.c and CSNs
...
Applied PwPiwi's new parity fix.
Applied Marshmellw's fixes for FSKdemod (HID, IO)
FIX: a potential bigbuffer fault given pwpiwi's change inside lfops.c CmdIOdemodFSK & CmdHIDdemodFSK
FIX: change some "int" parameters to uint's.
FIX: changed the lfops.c - DoAcquisition125k_internal to respect pwpiwi's definitions of FREE_BUFFER_OFFSET
HEADS up: The ultralight functions hasn't been verified since pwpiwi's changes.
2014-12-17 20:33:21 +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
b160432340
Merge branch 'master' of github.com:Proxmark/proxmark3
2014-12-14 18:07:38 +01:00
Martin Holst Swende
eabba3df7e
Fix (iclass)
2014-12-14 18:07:12 +01:00
András Veres-Szentkirályi
0ff9a93966
Typofix: occurrences
...
It's spelled with two rs.
2014-12-10 16:42:31 +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
iceman1001
02306bac2d
ADD: Enio's intuative function for the command: "hw tune", where you plot the tuning-data :)
...
ADD: added optional parameter to "hw tune" to show graf direct. Sample usage: "hw tune p"
2014-11-30 19:16:28 +01:00
iceman1001
06b58a94f0
BUG: don't try to fix things that ain't broken.. or not. My try for a fix ended up making the PrintAndLog function stop working. Just by calling a fclose.. fixed.
2014-11-27 22:16:17 +01:00
iceman1001
95e635947b
ADD: the option to simulate tnp3xxx inthe command "hf mf sim"
...
ADD: found some new default keys
ADD: changed alot of memorys buffers to use constant values. like usbbuffer sizes, tracelogs, etc etc
ADD: all changes Peter filmoore has in his pull request.
2014-11-26 13:52:39 +01:00
iceman1001
463ca973e7
FIX: hf mf eload - now supports specifying 0,1,2,4 in card memory for the file to be loaded.
...
FIX: hf mf esave - now supports specifying 0,1,2,4 in card memory for the file to be saved.
ADD: data.h - added FILE_PATH_SIZE constant
ADD: hf legic load - a command help and checks for FILE_PATH_SIZE
ADD: hf legis save - now checks for FILE_PATH_SIZE
ADD: lf hitag - now checks for FILE_PATH_SIZE
ADD: util.c - AddLogLine now checks for FILE_PATH_SIZE
ADD: data load / save - now checks for FILE_PATH_SIZE
FIX: ui.c - added a case of closing a filehandle
FIX: hf mf cload / csave now checks for FILE_PATH_SIZE
FIX: armsrc/mifarecmd.c - adjusted the buffersize in MifareEMemget from 48 to USB_CMD_DATA_SIZE
2014-11-16 11:22:06 +01:00
iceman1001
961658bba9
FIX: rewrote the help text, cleaned up the code
2014-11-14 13:32:11 +01:00
iceman1001
bd5d0f07e9
REN: renamed tnp3.lua to tnp3dump.lua since that name is more explainatory
...
ADD: added tnp3sim.lua a script which loads a dump and sends it to the pm3 device memory.
2014-11-14 13:24:45 +01:00
iceman1001
b22f7a6bc6
FIX: Minor correction of variablename. don't even ask.
2014-11-13 22:23:30 +01:00
iceman1001
85578fcd4e
FIX: since the "hf mf ecfill" command supports 0,1,2,4 in card sizes, I consequently changed "hf mf ekeyprn"
2014-11-13 22:21:39 +01:00
iceman1001
a0bf7ba787
FIX: The hf mf ekeyprn defaults to print all 40 sectorblocks of keys. (ie 4K card). Now its optional 1K / 4K and defaults to 1K.
2014-11-13 22:13:46 +01:00
iceman1001
5c065fa089
FIX: Corrected the bug mention http://www.proxmark.org/forum/viewtopic.php?id=1612 filepath too short in "hf mf eload / esave / cload / csave" commands. Length was 14, is now 250. Should be enough for awhile.
2014-11-13 22:02:36 +01:00
iceman1001
f91f0ebb35
CHG - some lua functions in utils.lua
2014-11-13 20:14:14 +01:00
iceman1001
47cbb2d418
ADD: tnp3.lua can now validate the checkums in the dump
...
ADD: added CRC16 CCITT functionality to LUA
FIX: tnp3.lua is now correctly decryping data while dumping
2014-11-12 23:18:46 +01:00
iceman1001
f595de25e9
ADD: html_dumplib.lua, added the functionality to save text-files.
...
ADD: tnp3.lua, now will save the dumped data to BIN and EML
FIX: tnp3.lua, added some clearcommando buffer to help the pm3 not to be blocked
2014-11-10 21:46:21 +01:00
iceman1001
cd5767d43d
FIX: I think the dumping of data is correct now in tnp3.lua. MD5 string vs bytearrays in lua are tricky
...
ADD: utils.lua some functions to convert between ascii, bytes and strings.
2014-11-09 19:29:47 +01:00
iceman1001
22f1c57786
Updated tnp3.lua
...
added some possibilities to abort the "hf mf nested" command
added a rudimentary items identification for tnp3xxx
2014-11-09 17:22:04 +01:00
iceman1001
9b989c45b9
FIX: minor parseing bug when loading dumpkeys.bin file.
...
ADD: added some useful helperfunctions to utils.lua
2014-11-05 19:16:54 +01:00
iceman1001
1a5ff2c2a7
FIX: fixed the layout of data in tnp3.lua
2014-11-03 22:29:43 +01:00
iceman1001
8aa79dee20
FIX: added some tnp3xxx identification i formatMifare.lua
...
FIX: tnp3.lua is more or less finished. Needs testing.
2014-11-03 21:59:31 +01:00
iceman1001
c70cef9734
fixing scripts/tnp3.lua
2014-11-03 15:25:54 +01:00
iceman1001
c15d2bdc9b
ADD: added identification for Mifare TNP3xxx tags.
...
ADD: MD5-lua functionality
ADD: AES 128 decrypt lua functionality
ADD: test luc script for reading TNP3xxx tags
CHG: testing some changes for "hf 14b sim" / "lf em4x 410xsim"
2014-11-03 13:49:19 +01:00
Martin Holst Swende
ca4714cd23
More coverity fixes
2014-10-30 21:49:18 +01:00
iceman1001
0222acfcf3
ADD: Implemented a "hf 14b write" function using the CmdHF14BCmdRaw method. The function can write to SRI512 and SRIX4K tags only. Be extremly cautious when writing to Block 0xFF
2014-10-30 15:28:45 +01:00
iceman1001
5ea2c88515
FIX: maybe I should actually send the uid bytes with the command request....
2014-10-30 14:29:31 +01:00
iceman1001
3649b640e6
CHG: added possiblity to send <UID> into the "HF 15 SIM"
2014-10-30 14:11:37 +01:00
iceman1001
a61b4976bd
FIXED: Merged all Holimans code-review issues which should fix a lot of memoryleaks.
2014-10-30 00:09:01 +01:00
Martin Holst Swende
97d582a692
More coverity findings
2014-10-27 22:33:37 +01:00
Martin Holst Swende
90e278d3da
Fixed several issues found using a coverity-scan
2014-10-27 21:46:04 +01:00
iceman1001
7c756d6892
FIX: Another try to see if the "lf em4x 410xsim" becomes better, added the clock in the calls since the auto detection of the clock seems to be wrong. I get 67, instead of 64...
...
FIX: changes the transfersize from sim -> pm3, was 48, now USB_CMD_DATA_SIZE (512) Much faster!
2014-10-27 21:42:41 +01:00
iceman1001
2ae8a312e0
Inital test for the "lf em4x 410xsim / lf em4x 410xwatch" which I try to verify that the sim works.
...
Something about speed, the clock detection is not so good. should be 64, usually 67..
2014-10-27 19:46:21 +01:00
iceman1001
1010aacca0
Minor corrections in fskdemod i lfops.c , see Holimans branch.
...
BUG: fixed a variablename, that didn't get changed.
2014-10-27 09:56:18 +01:00
iceman1001
c6be64da09
Some more nasty bugs fixed in the lf t55xx manchester_decode method.
...
ADD: a little function to see if GraphBuffer is not used.
2014-10-26 23:16:25 +01:00
iceman1001
db297e69e1
BUG: fixed a bug with the initialization of IV in cmdhfmfu.c CmdHF14AMfucAuth
2014-10-26 21:30:29 +01:00
iceman1001
149aeadaa6
Minor bug fixes with help from Holiman.
...
FIX: sprint_hex, sprint_bin has better length detection.
FIX: ui.c has removed all c99 array declarations, with malloc
FIX: hfmfmfu.c wrong length in one array caused crashes in CmdHF14AMfURdCard
FIX: cmdlft55xx.c CmdDump has now a correct pwd string.
2014-10-26 21:25:06 +01:00
Martin Holst Swende
f97d4e2378
First try att merging with head
2014-10-24 20:46:02 +02:00
iceman1001
081151eabb
FIX: data mandemod read the wrong part of BigBuffer (no correct offset)
2014-10-24 15:34:50 +02:00
iceman1001
c2d25819d8
BUG: the lf read now uses "getbigbuffer" which the offset from where the data starts in "data samples nnnnn" needed to be set.
...
ADD: ioprox nxp identifikations
2014-10-24 00:04:56 +02:00
iceman1001
72e930ef32
FIXED: lf t55xx fsk now demods but only to binary.
...
ADD: holimans lf io / hid fskdemod changes.
2014-10-23 18:36:44 +02:00
iceman1001
fbceacc5b8
add: "lf t55xx info" option to use data from Graphbuffer.
...
add: "lf t55xx trace" option to use data from Graphbuffer.
2014-10-16 22:25:38 +02:00
iceman1001
7bd30f12ac
Small fixes,
...
Fix: removed a call to free, which I think made linux people unhappy during "lf t55xx rd 0"...
Add: "lf t55xx fsk" now kind of outputs binary from "FSK2a R/40 R/50"..
2014-10-16 15:05:27 +02:00
iceman1001
7737657747
Fixed: the dampening field detection is enhanced. If half a frame (clock rate) of values is within 40% of the mean value then it is a dampening field.
2014-10-07 21:34:02 +02:00
iceman1001
f6c18637ca
chg: LF t55xx trace
...
new: LF t55xx info
2014-10-06 19:42:50 +02:00
iceman1001
75465377b9
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
armsrc/iclass.c
client/Makefile
client/cmdhficlass.c
client/loclass/cipher.c
client/loclass/fileutils.c
client/loclass/ikeys.h
include/usb_cmd.h
2014-09-19 10:50:34 +02:00
Martin Holst Swende
e6ee6c4cd1
Merge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research
2014-09-19 09:45:38 +02:00
iceman1001
3d93d4f940
Add: simple Application enum.
...
Fix: Minor overflows found by Holiman.
2014-09-18 14:15:48 +02:00
iceman1001
313ee67ea2
Fixed: "hf mfdes info"
2014-09-18 12:38:31 +02:00
iceman1001
b44e523300
LF t55xx and LF em4x commands now should manchester decode data. However t55xx can have other settings and different encodings.
2014-09-16 13:56:06 +02:00
iceman1001
35147d51e3
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-09-14 17:36:00 +02:00
pwpiwi
c626c56ef5
hf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition
2014-09-12 07:45:04 +02:00
iceman1001
76c7e6c363
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/cmdhfmf.c
2014-09-11 23:29:14 +02:00
iceman1001
f38a152863
First check in.
2014-09-11 23:23:46 +02:00
iceman1001
4a79e52c0b
Added piwis patch,
...
first version of finding out the card size. Experimental.
2014-09-11 22:33:43 +02:00
pwpiwi
79db03ef63
hf mf dump error handling, revive hf mf chk d option, provide known keys dictionary file
...
- hf mf dump: abort on unrecoverable errors. Don't create file dumpdata.bin in this case.
- hf mf chk: re-enabled and fixed option d (dump keys to dumpkeys.bin).
if there are unknown keys, write 0xffffffffffff instead to the file.
- provide a default key dictionary file for hf mf chk (default_keys.dic). Contents taken from
mf_default_keys.lua
2014-09-11 20:58:34 +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
Martin Holst Swende
fdefed663f
Some more lua-scripts and library fixes from iceman, including more default keys
2014-08-29 09:11:36 +02:00
Martin Holst Swende
5b1311fba2
Various scripts from iceman
2014-08-29 09:09:23 +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
9a573554e0
minor bugfix and enhancement to hf 14a reader
...
- "SAK incorrectly claims ... " message was displayed incorrectly
- now decodes FSCI, SFGI, FWI and displays FSC, SFGT, FWT resp.
2014-07-15 08:35:27 +02:00
pwpiwi
1604d0a290
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-07-01 07:09:21 +02:00
Martin Holst Swende
9e28ee9f14
Only documentation and minor changes
2014-06-30 11:23:14 +02:00
pwpiwi
19d6d91fd5
hf 14a reader enhancement
...
In order to be able to distinguish between Mifare Classic and Mifare Plus
in Security Level 1 (SL1, Mifare Classic Compatibility Mode), hf 14a reader
now always tries RATS - even if SAK claims not to support ISO14443-4.
2014-06-30 08:21:50 +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
Midnitesnake
74a3880283
Changes inorder for iclass dump to work correctly
2014-06-29 09:25:31 +01: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
42f57e0294
Merged with master
2014-06-27 13:16:31 +02:00
Martin Holst Swende
77abe781af
fix for better csns
2014-06-27 12:52:28 +02:00
pwpiwi
72b1090acf
Bugfixes:
...
- Byteorder was wrong when displaying ATQA in hf 14a read
- 7 Byte UIDs were truncated to 4 Bytes when displaying in hf 14a cuids
2014-06-26 07:57:49 +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
9f6e9d1575
More work on iclass simulation attack
2014-06-16 21:27:12 +02:00
Martin Holst Swende
d51b2eda8f
Added enios dirthreshold command, patch from http://www.proxmark.org/forum/viewtopic.php?pid=11577#p11577
2014-06-11 08:42:37 +02:00
penturalabs
fe53c0311c
improved calc_iclass_mac to work independant of size
2014-05-02 23:30:03 +01:00
Andrew Davies
a66fca86b9
Updated proxmark research with Holiman's loclass framework
2014-05-02 11:11:54 +01: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
penturalabs
c3963755b7
Implement replay command.
2014-04-15 11:47:01 +01: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
Philippe Teuwen
19e2a10de5
Markdown help: use fixed column width
2014-03-27 16:49:37 +01:00
Philippe Teuwen
46782176fc
Restore original inline help behavior as we've now separate fcts for -h/-m
2014-03-26 23:51:22 +01:00
Philippe Teuwen
dec8e8bd9f
Provide option -m for markdown help dump, -h for text dump
2014-03-26 23:50:34 +01:00
Philippe Teuwen
6f5dd6010e
Fix description in help dump
2014-03-26 22:44:25 +01:00
Philippe Teuwen
b5727175c0
Fix offline column in help dump
2014-03-26 22:40:41 +01:00
Martin Holst Swende
57c695563f
Fixes to implement generation of markdown auto-generated documentation
2014-03-26 22:39:37 +01:00
Philippe Teuwen
ae7aa73dd5
Add option -h to dump complete set of supported commands
...
Usage: ./proxmark3 -h
Display both offline & online commands, online commands are flagged.
git-svn-id: https://proxmark3.googlecode.com/svn/trunk@850 ef4ab9da-24cd-11de-8aaa-f3a34680c41f
2014-03-26 22:33:11 +01:00
holiman
f5a1a9ce47
Merge pull request #8 from pwpiwi/master
...
add .gitignore and merge svn r852
2014-03-25 21:49:05 +01: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
W8M2Hg9lLmWqXSGC
88c637e6cd
Merge pull request #7 from PenturaLabs/master
...
Re-submitting Midnitesnake's Mifare Ultralight Patch
2014-03-25 07:07:48 +11:00
W8M2Hg9lLmWqXSGC
347dea669a
Merge pull request #5 from PenturaLabs/master
...
Kantech ioProx Support - Fix
2014-03-21 20:35:14 +11:00
PenturaLabs
94faa59465
Update cmdlfio.h
2014-03-21 07:51:51 +00:00
penturalabs
c86220246e
Sorry, included missing files from last pull request
2014-03-21 07:45:18 +00:00
W8M2Hg9lLmWqXSGC
cf608ac8f3
Merge pull request #2 from PenturaLabs/master
...
Added Kantech ioProx Support
2014-03-19 08:47:28 +11:00
penturalabs
a1f3bb120f
Added Kantech ioProx Support
2014-03-18 20:52:48 +00:00
PenturaLabs
1801456ede
Re-submitting Midnitesnake's Mifare Ultralight Patch
2014-03-18 14:02:32 +00:00
midnitesnake
cb967ea976
Added Unique Code to EM41x
2014-03-18 07:42:54 +00:00
midnitesnake
080ff30a9e
Added Unique Code to EM41x
2014-03-18 07:41:02 +00:00
martin.holst@gmail.com
0c12504a5a
Patch submitted by 'FireFart', for some issues with 'hf mf chk'. See http://www.proxmark.org/forum/viewtopic.php?id=1888 for more info
2014-02-27 18:10:12 +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
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
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
martin.holst@gmail.com
6cacefa48d
Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html
2013-11-07 11:33:48 +00:00
martin.holst@gmail.com
4c367827b5
Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html
2013-11-07 11:32:13 +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
martin.holst@gmail.com
da9d456e9f
Minor fix, sometimes when data is sent without the pm3 is connected, it causes a spin-loop condition to occur which blocks the processor. fixed
2013-11-06 18:32:11 +00:00
martin.holst@gmail.com
b11542a7f6
Minor fix in html skeleton
2013-10-31 18:24:03 +00:00
martin.holst@gmail.com
e26df8425a
Some more tinkering with a generic 13.56MHz reader, still not finished
2013-10-31 10:35:03 +00:00
martin.holst@gmail.com
5198f2e23c
First steps towards creating a generic HF reader/identifier. A coop with Asper.
2013-10-30 21:10:47 +00:00
martin.holst@gmail.com
62a95012e9
Changed html template, in order to make it more generic and be usable on other types of data than mifare, now supports different highlighters. Implemented are NDEF and Mifare
2013-10-30 18:21:42 +00:00
dn337t@gmail.com
a00411152f
use CLOCKS_PER_SEC instead of platform-specific hardcoded value
2013-10-22 12:14:32 +00:00
martin.holst@gmail.com
412afdb87b
Fixed linebreak error
2013-10-20 19:05:52 +00:00
martin.holst@gmail.com
b3123cf603
Added functionality to dump data into .eml-file
2013-10-20 18:51:21 +00:00
martin.holst@gmail.com
db132ea0e8
Script to convert emulator file (ASCII dump of data) into HTML
2013-10-20 18:48:04 +00:00
martin.holst@gmail.com
c44241fdea
Fixed minor errors
2013-10-20 18:47:15 +00:00
izsh@fail0verflow.com
06b82e6a6d
cmdhf14b.c: fixing a crash in the crc computation when missing data (e.g. with 'hf 14b raw -c -p')
2013-10-20 11:46:51 +00:00
izsh@fail0verflow.com
3f7c993d78
fix compilation issues with gcc 4.6: anonymous unions are not c99
2013-10-20 11:40:00 +00:00
martin.holst@gmail.com
6742c089b1
Changes to how dumping is performed, now utilises a library. This is in preparation for a more generic dumping of different types of cards. Also added functionality to html-dump .eml-files
2013-10-19 20:18:50 +00:00
martin.holst@gmail.com
ba33066cef
Minor change
2013-10-18 11:35:06 +00:00
martin.holst@gmail.com
1686e4d1db
Added script to dump ndef-compliant tags. Written in collaboration with @asper
2013-10-18 11:14:23 +00:00
martin.holst@gmail.com
3c9ed0e180
Put manufacturer country within brackets
2013-10-18 07:36:20 +00:00
martin.holst@gmail.com
65e344df3e
Some refactoring, also placed wait14443a here
2013-10-17 19:21:04 +00:00
martin.holst@gmail.com
5eab31c336
Manufacturer-info, to be used in upcoming script
2013-10-17 19:20:10 +00:00
martin.holst@gmail.com
57d384004d
Changes to html-dump generateion, credits to en4rab http://www.proxmark.org/forum/viewtopic.php?pid=8576
2013-10-17 18:28:21 +00:00
roel@libnfc.org
981bd4292e
integrated MIFARE ultralight features, contributed by 'midnitesnake'
2013-10-11 08:43:23 +00:00
roel@libnfc.org
05f23c593c
with the declaration of 'uint8_t destination[8]', 'destination' is already a pointer, don't try to get the address of it by using '&destination', then you will get a pointer to a pointer.
2013-10-11 08:37:08 +00:00
martin.holst@gmail.com
51defdd4a2
Fixed issue where the 'nested'-part of autopwn only used 16 sectors, not bothering with the rest
2013-10-09 19:37:55 +00:00
martin.holst@gmail.com
b969713989
Fixed error with mifare_autopwn where keys were reversed, see http://www.proxmark.org/forum/viewtopic.php?pid=8494#p8494
2013-10-09 19:08:17 +00:00
roel@libnfc.org
b1231445c7
removed unused compiler directives, cleaned up some code
2013-10-09 09:59:14 +00:00
martin.holst@gmail.com
0dae56d81e
Committed mifare_autopwn.lua. For more infromation, see http://martin.swende.se/blog/Proxmark_Scripting_1.html and http://martin.swende.se/blog/Proxmark_Scripting_2.html
2013-10-08 18:50:54 +00:00
martin.holst@gmail.com
ed77aabe00
Patch from 'buzzy' to add automatic flushing of output, see http://www.proxmark.org/forum/viewtopic.php?id=1740 for more details.
2013-10-08 18:30:01 +00:00
martin.holst@gmail.com
2dcdf1a683
Added nonce2key-API to lua
2013-10-07 10:11:15 +00:00
martin.holst@gmail.com
7d2313912c
Fixed what may have been one cause of seg-faults in nonce2key... not sure, it still happens at times
2013-10-07 10:10:34 +00:00
martin.holst@gmail.com
e481bc3299
Removed double print-out
2013-10-07 10:02:25 +00:00
fnargwibble@gmail.com
e654346b79
i'm a retard. no idea why i did it that way! get rid of compile warnings, and print string properly. duh.
2013-10-05 16:55:53 +00:00
fnargwibble@gmail.com
e12b82d362
show device name during flashing and change advice on hanging
2013-10-05 16:44:48 +00:00
martin.holst@gmail.com
0a85b72549
Reworked how to call 'standard' stuff from within lua scripts, so now it's much simpler both in lines of code and usage. A script can now call core.console('hf mf nested 1 0 a ffffffffffff') in order to execute anything via the old command line parser
2013-10-04 19:29:46 +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
6a2c1d8e14
Minor issue, usability
2013-10-04 18:47:38 +00:00
roel@libnfc.org
78e7cf984c
fixed some more compiler warnings
2013-10-03 14:52:21 +00:00
roel@libnfc.org
f66021cf48
fixed compiler warnings
2013-10-03 14:36:42 +00:00
martin.holst@gmail.com
2fca3ad92d
Some documentation improvement
2013-10-03 13:58:14 +00:00
martin.holst@gmail.com
c9e2f7807e
Added a utility script to convert a 'dumpdata.bin'-file into the 'eml'-format that the emulator uses. Did not find any built-in way to do this, perhaps such functionality already exists.. ?
2013-10-03 13:56:11 +00:00
martin.holst@gmail.com
acfdf9528b
Fixed error in htmldumper
2013-10-03 13:26:17 +00:00
martin.holst@gmail.com
61caacda2b
Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone .. part 2
2013-10-03 12:34:28 +00:00
martin.holst@gmail.com
d78792f515
Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone
2013-10-03 12:33:58 +00:00
martin.holst@gmail.com
05ed5c496a
Made script-based default key check a bit more intelligent, so it works not only on 4k cards. Also added option to save data to a dump-file
2013-10-01 19:58:42 +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
686f0a1794
Moved script libraries into lualibs/folder, and added a patch to include the folder in the LUA_PATH (a.k.a package.path). See http://proxmark.org/forum/viewtopic.php?id=1750 for more details
2013-09-28 20:07:28 +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
roel@libnfc.org
7bb9d33e2c
fixed warnings on Mac OS 10.8, xcode 5
2013-09-25 10:40:16 +00:00
martin.holst@gmail.com
450d2e3a96
Minor changes, usage examples and selftests
2013-09-21 20:46:32 +00:00
martin.holst@gmail.com
70c8077c99
Changed the name of writeraw into 14araw
2013-09-21 20:40:32 +00:00
martin.holst@gmail.com
b61f426c2d
Fixed the write raw 14a, now finally functional... at least let's hope so
2013-09-21 20:37:22 +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
24d48e60fc
Fix two errors in writeraw (14a)-script that were found by jonor
2013-09-20 07:32:37 +00:00
martin.holst@gmail.com
42daa759c1
Only superficial changes, to get rid of compiler warnings
2013-09-19 19:53:09 +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
30a5d35529
Implemented parameter passing into script, added a minimal getop-parser, added an example script which takes parameters
2013-09-19 19:21:12 +00:00
martin.holst@gmail.com
b13fa4448f
merged trunk changes into branch
2013-09-16 19:08:19 +00:00
martin.holst@gmail.com
a403a55959
In the middle of some work to get arguments into scripts. Also fixed so you don't have to specify .lua on 'script run foobar'
2013-09-16 19:04:29 +00:00
martin.holst@gmail.com
869cabf7dd
Patch by jonor for hf list 14b, wait of ack was missing. See http://www.proxmark.org/forum/viewtopic.php?pid=8260#p8260
2013-09-16 18:38:47 +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
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
babfcaa0f3
Patch by jonor, fixes so uart_receive does not block when data is continuosly received. See http://www.proxmark.org/forum/viewtopic.php?id=1735
2013-09-01 18:46:55 +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
martin.holst@gmail.com
a763eb2126
Added a comment
2013-09-01 18:40:08 +00:00
martin.holst@gmail.com
3e69b21148
Minor changes to writeraw.lua, still not working as it should
2013-08-27 06:50:00 +00:00
martin.holst@gmail.com
4961e292aa
More patches from en4rab to the hexsamples, plus patches to legicsave and legicdecode (also by en4rab).
2013-07-12 20:03:31 +00:00
micki.held@gmx.de
1d59cd8d7a
Revoked unintended commit of cmdmain.c to scripting branch in r754.
2013-07-10 05:10:58 +00:00
micki.held@gmx.de
1c611bbd26
2013-07-08 17:56:05 +00:00
micki.held@gmx.de
a361cddfb9
2013-07-08 17:56:05 +00:00
martin.holst@gmail.com
4df3eb3f73
Attempt to use raw writing capabilities via scripting engine. Not functional yet
2013-07-04 12:56:00 +00:00
martin.holst@gmail.com
e772353f72
Major changes to hf mf mifare
2013-06-26 21:13:02 +00:00
martin.holst@gmail.com
c6e2bfcda1
Removed some crap-scripts for testing
2013-06-26 20:49:04 +00:00
martin.holst@gmail.com
ca363c2348
Fixed so correct sizes are used across different architectures in the binlib
2013-06-26 12:33:31 +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
ea833d39ff
Improved error handling
2013-06-26 09:18:31 +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
529488e87d
typo
2013-06-07 19:51:15 +00:00
martin.holst@gmail.com
9f7a854d7b
Fixed a minor error with the keys
2013-06-07 18:58:06 +00:00
martin.holst@gmail.com
a2d82b467a
Added library to read card info, made use of it from within mfkeys.lua script
2013-06-07 13:23:32 +00:00
martin.holst@gmail.com
fd368d18f1
Changes in cmd handling
2013-06-07 09:30:32 +00:00
martin.holst@gmail.com
21452811e6
implementation of command library in lua
2013-06-07 09:27:58 +00:00
martin.holst@gmail.com
16b04cb291
mf check keys in lua-space
2013-06-07 09:26:56 +00:00
martin.holst@gmail.com
c00f0dbfda
Fixed 'volatile' error in this branch also
2013-06-07 09:25:59 +00:00
martin.holst@gmail.com
44fffc5451
Work on the scripting library
2013-06-07 09:24:25 +00:00
martin.holst@gmail.com
1bad971361
Fixed so storeCommand/getCommand are multithread-safe (at least dual-thread). Hopefully. http://www.proxmark.org/forum/viewtopic.php?pid=7400#p7400
2013-06-06 18:30:00 +00:00
martin.holst@gmail.com
c338502409
Applied patch from http://www.proxmark.org/forum/viewtopic.php?id=1637 , where a compiler optimization resulted in hangs
2013-06-05 08:53:20 +00:00
martin.holst@gmail.com
ab7a8ea164
Fixed error pointed out here: https://code.google.com/p/proxmark3/issues/detail?id=46 , when null is passed to waitforresponse
2013-06-03 11:04:35 +00:00
martin.holst@gmail.com
a808a224f5
Found that USBcommands from the device are silently overwritten if the host does not quickly enough read them, which causes problems in several places. Implemented a circular buffer which stores up to 50 commands (still tiny, memorywise) and prints out a message if the buffer wraps around (overwrites).
2013-05-31 19:25:13 +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
3510cdff4b
Started an experiment with lua mifare hack
2013-05-24 21:43:02 +00:00
martin.holst@gmail.com
96e7a3a50b
Minor fixes, added some functionality to send data, but still some way to go
2013-05-24 21:39:08 +00:00
martin.holst@gmail.com
5b760b6cac
'core' library glue
2013-05-24 21:06:57 +00:00
martin.holst@gmail.com
1ef665776d
Added a PoC script which implements a commandline
2013-05-24 21:06:20 +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
5a92cb525e
Fixed so standard libraries can be used, added an example script, and fixed so all hf.mf-ops can be called
2013-05-22 13:04:01 +00:00
martin.holst@gmail.com
806dc07542
First implementation of user scripts - very experimental - YMMV
2013-05-21 18:37:43 +00:00
martin.holst@gmail.com
489e174541
Fixed problem with em4100, see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235
2013-05-16 18:13:54 +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
5b59cfb7b1
Added some information about flashing (linux)
2013-05-11 12:43:44 +00:00
martin.holst@gmail.com
5f91a683b7
Added some documentation regarding ports on linux
2013-05-11 12:33:04 +00:00
roel@libnfc.org
90d74dc206
next update from en4rab on data samples
2013-04-26 20:33:05 +00:00
roel@libnfc.org
a2847518d2
en4rab fixed the 'data samples' command
2013-04-23 19:55:43 +00:00
roel@libnfc.org
6c6d1ac1a6
fixed signed/unsigned problem
2013-03-26 20:42:18 +00:00
roel@libnfc.org
4890730a5f
fixed crash, when proxmark was claimed by other process
2013-03-26 16:01:52 +00:00
roel@libnfc.org
62ee4fedd5
Finally figured out a way to claim a serial port interface under unix
2013-03-22 16:42:26 +00:00
roel@libnfc.org
4a049b7847
avoid rolling dots over the screen when proxmark is not available (yet)
2013-03-21 16:06:09 +00:00
roel@libnfc.org
d8193fa5ac
flasher updated again, should work more solid now
2013-03-21 12:44:21 +00:00
roel@libnfc.org
2d7fc168a2
fixed missing header file
2013-03-21 11:38:48 +00:00
roel@libnfc.org
13dbdd6bb1
(dirty) fix for linux to clean up the /dev/ttyACM* quicker
2013-03-21 10:59:56 +00:00
roel@libnfc.org
0a24369c48
trying to tweak uart code, for better flashing
2013-03-19 16:19:20 +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
19d9a7b0ce
fixed compiling under ubuntu with devkitARM_r41
2013-03-13 13:46:40 +00:00
cex123@gmail.com
38b20f7550
Fixed LF HID cloning command
2013-03-13 07:13: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
d16d20b1fb
fixed CMD_HID_SIM_TAG
2013-03-10 11:37:59 +00:00
roel@libnfc.org
c1e745e465
optimized
2013-03-04 15:15:30 +00:00
thijsbreman@gmail.com
a7b4bf1eb4
polling per second in OpenProxmark
2013-03-04 13:07:15 +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
9d8f56e35d
fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part4
2013-02-28 22:49:34 +00:00
roel@libnfc.org
a0bbdb76ca
fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part3
2013-02-28 22:46:49 +00:00
roel@libnfc.org
1a07fd510d
fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part2
2013-02-28 22:33:31 +00:00
roel@libnfc.org
125a98a110
fixed stupid 64-bit formatting for x86/amd64 and unix/windows
2013-02-28 22:22:24 +00:00
roel@libnfc.org
cb64309e4b
compiling on windows again
2013-02-28 21:36:09 +00:00
roel@libnfc.org
54a942b05d
merged all patches into CDC repository
2013-02-28 17:04:23 +00:00
roel@libnfc.org
50d6e4abc1
douniwan5788:
2013-02-28 16:04:21 +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
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
7dd1908b24
fixed 'hf mf' command and some others
2012-12-07 22:37:22 +00:00
roel@libnfc.org
fe7bfa7856
Windows7 working now! ugly fix for inaccurate Windows timer, quickfix for receiving multiple frames
2012-12-07 12:51:19 +00:00
roel@libnfc.org
f0ba634221
receiving/sending moved to one thread
2012-12-07 12:22:05 +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
1282b0e691
minor output change
2012-12-07 09:51:22 +00:00
roel@libnfc.org
af65f5f71d
fixed read uart for windows
2012-12-07 07:21:00 +00:00
roel@libnfc.org
d0b14ad5e7
fixed missing header
2012-12-06 22:17:27 +00:00
roel@libnfc.org
ecab772ed0
added missing files, part2
2012-12-04 23:43:19 +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
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
thijsbreman@gmail.com
2d495a814d
Added output to file for 'lf hitag list' command
2012-10-03 12:30:20 +00:00
roel@libnfc.org
8de6b69d1e
added 'hitag2.ht2' binary example image for emulation
2012-09-18 13:56:23 +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
69f8a37be0
Allow user to specify a delay
...
The user may specify a delay between PACE nonce requests. Using no delay between subsequent issues of the USB command may lead to errors in the USB communication.
Until test results show that the delay can be fixed or left out completely the user has to test what value is safe to use.
This fixes errors "Read only 40 instead of requested 64 bytes!" (if the correct delay is used, e.g. 3 seconds for 16 byte nonces).
2012-08-28 22:45:34 +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
db22dfe6ff
-Added .history to the svn:ignore property
...
-Added "hf 14a cuids" command to collect multiple ISO14443-A UIDs from one card in a batch
-The command takes one parameter (the number of UIDs to collect)
-This can be useful to analyze the RNGs of cards that generate random UIDs (e.g. MRTDs)
2012-08-14 14:56:09 +00:00
dn337t@gmail.com
e50d95165c
removed dead check of uint8_t > 255
2012-08-13 19:52:22 +00:00
dn337t@gmail.com
561f7c11ef
added dissector for ISO 14443-A ATS response
2012-07-25 16:19:56 +00:00
dn337t@gmail.com
14006804dd
added util.h include to avoid implicit function declaration
2012-07-20 09:06:55 +00:00
dn337t@gmail.com
eede7162bc
commented set but unread variable wantSaveToEml
2012-07-20 09:04:23 +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
8b6a93df91
hf mf sniff
added CRC_14443_A check
2012-07-17 11:41:56 +00:00
Merlokbr@gmail.com
c948cbde8c
small fix
2012-07-17 11:29:34 +00:00
Merlokbr@gmail.com
e0c635d19c
hf mf sniff
- working with emulator files
2012-07-17 11:28:12 +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
t0m4.null@gmail.com
ec56429002
Fixed writing em410x 40bits UID on T5555/T55x7 tags on 32bits systems
2012-07-10 17:52:17 +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
ac14bee321
Fixed auto nt bug
2012-07-06 13:44:37 +00:00
Merlokbr@gmail.com
8784cd1aee
fixed setting block0 for "magic card". now it works)
2012-07-06 10:00:44 +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
f774db9598
added magic card write block
2012-07-05 08:09:41 +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
dn337t@gmail.com
70049c47db
refactored client/pm3_*.py to use with statements, contants and iterators
2012-06-22 12:02:19 +00:00
dn337t@gmail.com
0aceafbf2e
added simple test suite for client/pm3_*.py
2012-06-22 11:51:59 +00:00
dn337t@gmail.com
11d2326425
made clients/pm3_*.py importable as Python modules
2012-06-22 11:09:36 +00:00
adrian@atrox.at
0546b4aaf7
added more cards to iso15693 uid database, and some minor cleanups
2012-06-20 17:15:21 +00:00
dn337t@gmail.com
cee48e2b44
initialize graph cursors to avoid crashing (issue 21)
2012-06-07 14:00:41 +00:00
dn337t@gmail.com
836138032c
use char instead of uint8_t to avoid warnings/casting
2012-06-07 09:24:49 +00:00
douniwan5788
99a71a0d01
replaced the getline which does't support by minGW on windows
2012-05-31 09:46:02 +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
7853775ee2
added CmdHF15CmdReadmulti using Adrian's second patch from issue 20
2012-05-29 12:31:29 +00:00
dn337t@gmail.com
65a23af22b
textual changes: error messages and comments by Andrian + attribution
2012-05-29 12:22:08 +00:00
dn337t@gmail.com
05151b6fe8
added head comments on CmdHF15Cmd{Read,Write} using Adrian's second patch from issue 20
2012-05-29 12:17:24 +00:00
dn337t@gmail.com
eba61a5647
clarification in 'hf 15 cmd write' message using Adrian's second patch from issue 20
2012-05-29 12:12:00 +00:00
dn337t@gmail.com
fdb67f1c8d
implemented output of received octets in 'hf 15 cmd raw'
2012-05-18 12:26:50 +00:00
dn337t@gmail.com
6d7234cd43
added 'hf 15 cmd sysinfo' using Adrian's second patch from issue 20
2012-05-18 09:20:27 +00:00
dn337t@gmail.com
c43897de27
typofix in prepareHF15Cmd comment based on Adrian's second patch from issue 20
2012-05-18 09:10:44 +00:00
dn337t@gmail.com
382223b9a9
fixed offset in 'hf 15 cmd read' to avoid losing the first octet/byte
2012-05-18 09:07:39 +00:00
dn337t@gmail.com
e8da774090
boolean fix in 'hf 15 cmd read' using Adrian's second patch from issue 20
2012-05-18 09:05:00 +00:00
dn337t@gmail.com
e4da8ed0bb
typofixes in ISO15693 getUID head comment
2012-05-18 08:59:22 +00:00
dn337t@gmail.com
c71e7235da
extended ISO 15693 UID map using Adrian's second patch from issue 20
2012-05-17 14:35:19 +00:00
dn337t@gmail.com
b4a9d8419f
implemented ISO 15693 error message decoding and fixed error code offset
2012-05-17 13:25:50 +00:00
dn337t@gmail.com
31b6e9af2b
Removed unused variables, added implicitly used headers
2012-05-14 14:48:23 +00:00
marcin.mielczarczyk
2d4eae7617
Support for EM410x card mode in T5555/T55x7 tags.
2012-03-07 13:44:53 +00:00
W8M2Hg9lLmWqXSGC
713e7ffbc7
Added / modified SAK descriptions.
2012-02-05 09:30:08 +00:00
fnargwibble@gmail.com
ff2e9c1c81
Navigate one sample at a time in plot window and display grid size/status
2012-01-26 17:45:21 +00:00
fnargwibble@gmail.com
18856d8894
Navigate a page at a time in plot window
2012-01-23 17:57:42 +00:00
fnargwibble@gmail.com
3bc2349df1
Oops. Fix grid lock when zoomed in or out.
2012-01-21 14:32:39 +00:00
fnargwibble@gmail.com
7ddb990032
Add plot window keystroke help
...
Add grid display/lock commands to plot window
2012-01-21 13:32:54 +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
caioxmag
6c064e161c
small updates to hf mf restore1k
2011-09-19 12:58:58 +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
caioxmag
9d71094388
updates to function hf mf retore1k
2011-09-06 09:16:32 +00:00
roel@libnfc.org
e6b8c965bb
fix command-line issue generating core dump on OSX
2011-09-05 13:04:11 +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
caioxmag
3d77fdfab5
Dump1k now writes keys to dumpdata.bin even when they are masked with zeroes in a read command
2011-09-02 08:33:45 +00:00
zveriu@gmail.com
1f947c4b09
- Added very basic scripting support to PM3 client-side (proxmark3 application)
...
- Created several scripts to aid in EML/MFD file conversion
- Created script which generates PM3-scripts for emulation based on MFD/EML input files
2011-09-01 09:03:20 +00:00
caioxmag
2115626711
Fixes to Mifare nested function...
2011-09-01 08:13:18 +00:00
caioxmag
5ff9150e3b
Corrected some errors from r487, WHICH I FORGOT TO COMMENT.
...
Log for r487 should have been:
"added hf mf dump1k and hf mf restore1k functions"
"modified hf mf nested function to add option to create dumpkeys.bin file from its output"
2011-08-31 07:09:50 +00:00
caioxmag
26fdb4ab49
2011-08-30 09:52:18 +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
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
873014de8a
linux patch by Wil
...
http://www.proxmark.org/forum/profile.php?id=1639
2011-06-07 14:30:07 +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
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
7e758047e4
iso14a cleanup and implement RATS [Hagen Fritsch]
2010-06-26 08:24:21 +00:00
adam@algroup.co.uk
6c45a008f5
bring snooper into line with new command format
2010-06-26 08:22:42 +00:00
adam@algroup.co.uk
602ac4d7c5
multiple proxmark device support [Mohamed Elsabagh]
2010-05-14 11:04:28 +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
adam@algroup.co.uk
346ad5fbbb
Fix linux GUI crash [Hagen Fritsch]
2010-04-20 08:22:05 +00:00
ksjoberg
15cdabd474
Fix issue 14: mandemod and lf em4x em410xread crashes the proxmark3 client app
...
This fix is quick-and-dirty since it only reduces the amount of stackspace allocated by changing the data type of the array to uint8_t instead of the 32 bit integers. The reduced number of bits is OK since only (at most) 2 of the available bits are used in each element.
At least array bit utilization is improved from 6.66% to 25% :)
Large structures such as these should probably be malloc()ed.
2010-04-06 13:41:37 +00:00
adam@algroup.co.uk
23e5d20eed
strip trailing space in a more strictly correct place
2010-03-08 14:20:05 +00:00
adam@algroup.co.uk
9cb00f305c
move trailing space stripping to client/proxmark3.c (per discussion on r426)
2010-03-08 09:16:28 +00:00
adam@algroup.co.uk
fcdfc43e1f
strip trailing space(s) (may have been added by readline)
2010-03-07 15:25:48 +00:00
adam@algroup.co.uk
c6f1fb9dbd
revert command offsets now leading spaces have been stripped (thanks iZsh!)
2010-03-06 08:01:08 +00:00
izsh@fail0verflow.com
035303ac5f
client/cmdparser.c: Remove the leading spaces before calling the subparser. client/cmdlfhid.c: Modify accordingly.
2010-03-06 00:30:24 +00:00
adam@algroup.co.uk
f443ff3ebc
fix id offset in hid simulate
2010-03-05 23:39:07 +00:00
marcansoft
66d6ba7057
Get rid of flasher memory leak
...
Too bad the proxmark usb code still has a bajillion :(
2010-02-26 15:13:58 +00:00
marcansoft
0ae6234a5b
Remove remnant junk and TODO -> FIXME
2010-02-26 14:08:54 +00:00
marcansoft
8fe1a992c7
New flasher, much more paranoid and much more correct.
...
Knows how to merge segments to solve the "data overwrites last text
block" issue.
Removed "partition" stuff. Now it just flashes any elf file you pass,
though there's still a -b option required to explicitly enable flashing
the bootloader.
2010-02-26 14:03:43 +00:00
marcansoft
85f2819c8a
Add extra elf.h constants
2010-02-26 14:02:08 +00:00
marcansoft
4e3e51b612
Add beginnings of hopeful endian-independence
2010-02-26 14:01:51 +00:00
izsh@fail0verflow.com
212ef3a04d
Apply copyright patch from Michael Gernoth
2010-02-25 21:57:35 +00:00
izsh@fail0verflow.com
243dc69001
Fix memset warning
2010-02-24 20:47:32 +00:00
izsh@fail0verflow.com
9e13f87517
Fix a couple of warnings
2010-02-24 20:34:13 +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
9cc7c4b4d1
client/COMPILING: move to /COMPILING and add instructions to be able to compile the firmware as well.
2010-02-23 22:10:35 +00:00
izsh@fail0verflow.com
13bb3b4b11
client/COMPILING: Simplify dev. environment initial setup for Windows (WORK STILL IN PROGRESS)
2010-02-23 20:55:35 +00:00
izsh@fail0verflow.com
913d23c661
client/cmdlfem4x.c: Fix a warning about probable uninitialized variable with gcc 4.4
2010-02-23 20:52:50 +00:00
d18c7db
7b93d91671
Updated missing lib in ProxSpace
2010-02-22 03:54:44 +00:00
d18c7db
72de52ee7b
Updates for new MinGW ProxSpace environment
2010-02-22 01:56:15 +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
d18c7db
428ee1df57
Updated COMPILING
2010-02-21 07:45:59 +00:00
d18c7db
b97a3d994b
Windows specific instructions regarding the compile environment.
2010-02-21 06:54:43 +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
cbb03be993
Oops forgot a file
2010-02-20 00:38:24 +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
3ec3a4724e
Removed hackish usb.h file, re-added Info.plist
2010-02-19 23:24:49 +00:00
d18c7db
baf39b0f16
Not a source code file
2010-02-18 08:32:41 +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
adam@algroup.co.uk
fffad860fc
fix output inversion in mandemod
2010-02-15 21:15:52 +00:00
adam@algroup.co.uk
dbf444a179
missing parameter in 'threshold' command help
2010-02-08 22:02:18 +00:00
adam@algroup.co.uk
33984c6a82
fix 'data load' filename pointer
2010-02-08 17:37:02 +00:00
izsh@fail0verflow.com
8381984556
Cosmetic changes, replace mismatched indentation
2010-02-08 11:58:40 +00:00
adam@algroup.co.uk
5d5311a223
command parser shortcuts e.g. 'd p' will call 'data plot' (from rumpeltux)
2010-02-08 09:23:39 +00:00
adam@algroup.co.uk
590f8ff949
get rid of implicit declaration warnings
2010-02-07 00:31:32 +00:00
izsh@fail0verflow.com
5a956258d3
alphabet ;)
2010-02-06 18:24:22 +00:00
adam@algroup.co.uk
26aa7d73ad
damn that alphabet!
2010-02-06 18:11:49 +00:00
adam@algroup.co.uk
8d183c53b6
merge 'lfsamples' and 'hfsamples' into 'samples'
2010-02-06 18:06:31 +00:00
adam@algroup.co.uk
ab2fd3d68b
streamline CmdEM410xWatch
2010-02-06 18:05:05 +00:00
adam@algroup.co.uk
a2b1414f43
Andreas fix for LEGIC MIM1024
2010-02-06 09:43:33 +00:00
adam@algroup.co.uk
83a9b236fe
fix warning: implicit declaration of function ‘exit’
2010-02-06 09:33:17 +00:00
adam@algroup.co.uk
313322658c
FIXME: will crash if sample buffer does not contain valid legic data (fixed by Sourcerer)
2010-02-05 20:08:02 +00:00
izsh.f0f
41dab15305
Alphabetical order ;) And cosmetic changes (remove duplicated includes)
2010-02-05 17:16:14 +00:00
adam@algroup.co.uk
669c1b80c5
add LEGIC decoder (submitted by Sourcerer, untested by me)
2010-02-05 13:56:33 +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
adam@algroup.co.uk
c59c3405ec
wun day i'll lern my alfabet
2010-02-05 08:29:09 +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
izsh.f0f
040a7baad0
client/cmdparser.c: Cosmetic changes.
...
client/cmdlf.c: Add missing include for "WaitForResponse".
2010-02-05 01:06:53 +00:00
adam@algroup.co.uk
37239a7c4b
differentiate commands and sub-menus in help
2010-02-05 00:17:38 +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
adam@algroup.co.uk
c37d2e7078
make parser slightly more user friendly (default to 'help')
2010-02-04 22:51:02 +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
bushing
cef938d883
fix a stack overflow in the flasher routine (my bad)
2010-01-27 09:25:37 +00:00
daniel.boteanu
044a375b95
Added offset feature to hexsamples command
2010-01-14 23:11:31 +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
1eb7596aad
Added hitune command for continuously measuring HF antenna tuning
2010-01-09 14:59:42 +00:00
bushing
8b576d2d31
first attempt at grouping commands into categories based on what I think they do
...
I could really use some help here, since I don't actually understand what every
command does :(
2010-01-07 04:39:12 +00:00
bushing
107ec6e4b5
fix broken formatting in command table
2010-01-07 04:09:27 +00:00
bushing
3210b50ec6
enable indalademod and vchipdemod in offline mode
2010-01-07 04:06:42 +00:00
izsh.f0f
b961ef035a
client/elf.h: Add missing Elf32_Phdr struct to compile under Mac OS X. client/flash.h: Add missing header ifndef.
2010-01-05 12:32:44 +00:00
bushing
2cab856f9f
removed support for s19 files in the flasher and replaced it
...
with elf parsing. can we stop specifying the "partition" yet?
2010-01-05 00:02:12 +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
fa03a110e9
mifare client update
2009-12-30 00:11:23 +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
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
henryk@ploetzli.ch
55a69489cd
Properly exit usb thread (e.g. on Ctrl-D)
2009-12-22 20:32:40 +00:00
bushing
59936251ff
remove some straggling files and fix paths in cockpit batch files
2009-12-22 13:05:32 +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
f11f5c2738
fix target name for Windows compile
2009-12-22 12:47:10 +00:00
bushing
9b25560889
lean up event model so that this will work under OS X (and hopefully Linux)
...
still need to refactor some stuff -- lots of code duplication here that
we can get rid of
2009-12-22 12:46:04 +00:00
bushing
aa81a8d3f1
rename ReceiveCommandP -> ReceiveCommandPoll for consistency
2009-12-22 12:44:38 +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
a146075d74
remove most of the references to translate.h
2009-12-22 12:35:36 +00:00
bushing
3a8464f067
change usb_cmd struct to be more sane
...
wean ourselves off translate.h
2009-12-22 12:34:24 +00:00
bushing
cd00aa3043
merge linux and windows clients into one directory... will consolidate makefiles shortly
2009-12-22 12:11:15 +00:00