Philippe Teuwen
3d6d58aae5
internal help fcts -> static
2019-04-10 13:06:05 +02:00
Philippe Teuwen
cc0454d5d2
tag unused Cmd [-Wunused-parameter]
2019-04-10 12:23:40 +02:00
iceman1001
35bc4a975e
rename SNOOP -> SNIFF
2019-03-12 13:15:39 +01:00
Philippe Teuwen
346af6e3d1
make style
2019-03-11 23:12:31 +01:00
iceman1001
fd642e8f51
adjustemnts
2019-03-11 15:08:34 +01:00
iceman1001
ff22f0ca7a
rename:
...
'lf snoop' -> 'lf sniff'
'hf snoop' -> 'hf sniff'
As of now its gonna be called sniffing everywhere in the repo.
chg: 'lf search' textual
chg: 'hf search' textual
2019-03-11 14:55:02 +01:00
Philippe Teuwen
961d929f4d
changing {} style to match majority of previous style
2019-03-10 11:20:22 +01:00
Philippe Teuwen
0373696662
make style
2019-03-10 00:00:59 +01:00
Philippe Teuwen
0d9223a547
client: fix mix of spaces & tabs
2019-03-09 23:35:06 +01:00
iceman1001
cc81b5bed9
fix: tolower
2019-03-09 12:31:29 +01:00
Philippe Teuwen
60f292b18e
remove spurious spaces & tabs at end of lines
2019-03-09 08:59:13 +01:00
merlokk
47d954c79f
move emv commands to root
2018-12-03 18:16:25 +02:00
merlokk
4fed815b88
added core files.
...
need to add:
1. jansson (maybe needs jansson-devel)
2. arm and client side of exchangeapdu14a
2018-11-08 17:29:58 +02:00
merlokk
61ea3109c9
start merge
2018-10-24 18:18:05 +03:00
iceman1001
886f7fbdad
chg: 'hf search' textual
...
chg: 'lf search' textual
2018-04-27 17:38:41 +02:00
iceman1001
271cb3e1cc
chg: \r didn't work well with printandlogex
...
chg: spaces
chg: cleaning
2018-04-27 12:15:26 +02:00
iceman1001
71ce6e07ee
CHG: moved trace commands into its own category (from hf)
...
'trace list'
there will also the load / save of trace buffer come.
For backwardfunctionality the old commands still works.
2018-03-18 18:00:41 +01:00
Brian Pow
7e125b9bfb
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:39:54 +08:00
iceman1001
a1dd7c2020
chg: 'hf list mf' - adapted the output from 16bytes rows to 18 in order to make output more easily to compare
2018-02-15 11:47:34 +01:00
iceman1001
326079fbb6
chg: timing text
2018-02-14 23:53:32 +01:00
iceman1001
b8ddb3b384
chg: 'hf list mf' - 10b uid
2018-02-14 23:48:45 +01:00
iceman1001
ad99b4f394
add: 'hf list mf' - old 'hf mf sniff' decoding of data has now been incorporated annotations instead. (@merlokk)
...
---most likely broke something.. :) needs proper testing.
2018-02-14 23:03:39 +01:00
iceman1001
8c5ab9cf18
textual
2018-02-14 16:18:04 +01:00
Brian Pow
b1d414c680
CHG: replace 'samples:' with 'Examples:', unify some usage text
2018-02-09 22:56:16 +08:00
iceman1001
52d69ed4ee
CHG: refactor CRC16 algos. This is a big change, most likely some parts broke, hard to test it all.
2018-02-01 15:19:47 +01:00
iceman1001
eb8e7a1679
intendention
2018-01-30 03:29:59 +01:00
iceman1001
732fe340cb
fix: 'hf search' - 14a detection was wrong. thanks @doegox for point it out.
2017-12-08 22:27:55 +01:00
iceman1001
9959d5c1e7
chg: emv commands should now compile. no testing done.
2017-11-25 08:18:30 +01:00
iceman1001
647411d10d
chg: pointing to new emv cmds. (@merlokk)
2017-11-25 08:06:43 +01:00
iceman1001
2f3dbbcaa3
rename: ul_switch_off_field -> DropField (inside cmdhf14a.c)
...
chg: Fix memory bounds error (@wsmoses)
c3511781a1
2017-11-11 23:23:01 +01:00
iceman1001
4b63f940f1
CHG: FeliCa implemenation by @satsuoni
2017-10-20 20:27:44 +02:00
iceman1001
8136decadd
ADD: hooking up the new felica commands
2017-10-10 14:59:58 +02:00
iceman1001
c567aecb2e
CHG: 'hf list' - now gets a timeout instead of stalling if device doesnt answer..
2017-09-26 17:16:24 +02:00
iceman1001
85b1c6bdfb
add: 'hf 15 list' is now possible, since I like to be able to call both "hf list 15" and "hf 15 list"...
...
chg: 'hf list 15' better annotations, the flags doens't define the command anymore
chg: device side, iso15, experimenting with different settings.
The tag still doesn't answer to 0x002B not 0x202B---uid--- commands.
2017-09-04 22:48:35 +02:00
iceman1001
508fa76915
ADD: 'hf list 15' - added annotation for ISO15693
2017-09-04 18:38:57 +02:00
iceman1001
fda4a25f51
and some more adjustments..
2017-08-26 12:59:10 +02:00
iceman1001
f28da2da6e
monster merge...
...
all those changes marshmellow did.. and more...
2017-07-30 09:17:48 +02:00
iceman1001
e8015142cd
fix: TRUE/FALSE -> bools
...
fix: 'iclass' filepath 255, to use FILE_PATH_SIZE
fix: unified params test
2017-07-14 20:54:11 +02:00
iceman1001
8bc17414fd
new coverity scan complains..
...
fix 'lf hitag' bit comparisions wrong
fix 'standalone mode' logically dead code
2017-07-07 15:45:40 +02:00
iceman1001
d56ee2b1db
chg: trying to generalize the EMV build
2017-02-13 11:05:42 +01:00
iceman1001
2e8d938bef
ADD: 'hf emv' - from @peterfillmore emv fork. A bit cleaned up and moved around. Should compile
2017-02-05 21:56:47 +01:00
iceman1001
f9b5377fd0
CHG: reordered the "hf search" internal checks. The iclass check takes 4.5sec to time-out...Incredible slow to identify.
2016-10-08 19:14:09 +02:00
iceman1001
c2ab5e8c4e
FIX: "hf list legic" annotation now correct prints byte and value for "legic write" command
2016-10-07 20:23:57 +02:00
iceman1001
633d068682
CHG: command name changes..
...
old "hf legic info" is now "hf legic reader"
old "hf legic read" is now "hf legic rdmem"
old "hf legic decode" is now "hf legic info"
ADD: new command "hf legic dump", which will autodetect tagtype and dump all mem to a binary file.
2016-10-05 21:42:13 +02:00
iceman1001
5660920679
FIX: the "hf list legic" on MIM1024 wrapped around readingbyte 255 due to a too small varible size. Causing the upperbits to drop silently
2016-10-02 12:29:18 +02:00
iceman1001
61f97ca7ad
CHG: annotation now only print relevant help text given selected protocoll.
2016-09-29 21:37:19 +02:00
iceman1001
d7e24e7c5f
CHG: 'hf list legic' doesn't print the parity now.
...
CHG: 'hf legic read' the device side timings is starting to look much better. HUGE Thanks to @will-rbnt for endless checks and logic analyser feedback. Without his effort this would not work. What does work? We can now use ANY IV in legic. The PM3 Master version is flawed, will only work with IV=0x55.
---still broke--- my crc implementation.. I know I'm about to look into it.
2016-09-28 21:37:08 +02:00
iceman1001
3e750be37c
ADD: started to add a legic detection to "HF SEARCH"
2016-09-26 20:01:23 +02:00
iceman1001
7c91c8bf24
CHG: and now that I do actually check on bitlenght, I can get a better annotation yet again. Looking at it raises a question, acknowledge is 0x19 or 0x39, they just don't match up with tagtype identification of 0x0D, 0x1D, 0x39. I'll need to look at a 1024 tags response in a trace with a valid reader.
2016-09-26 12:58:11 +02:00
iceman1001
faabfafe30
CHG: using bitsend to determind the legic annotation in "hf list legic" makes false positives much less.
2016-09-26 12:26:37 +02:00
iceman1001
ad5bc8cc8c
In my attempts to make the LEGIC code better, its not working now. Timings if off.
...
CHG: switching to US clock.
CHG: better trace annotation for legic
CHG: Legic prng can now give a x bits in once.
2016-09-09 11:56:20 +02:00
iceman1001
1b12afbd9f
CHG: better annotation for 'legic'
2016-09-07 12:36:46 +02:00
iceman1001
e619ddc071
FIX: Better legic annotation, show which byte was targeted during read and write commands.
2016-09-03 12:20:12 +02:00
iceman1001
c71c5ee156
ADD: started to add tracelog in legic
...
ADD: remake of legic codebase.
ADD: started with a annotation for LEGIC in 'hf list'
2016-09-02 16:25:54 +02:00
iceman1001
7e08450dcc
add: annotage Mifare Desfire. from 3102c1bae3 (diff-93cfa90a992ea759349344d0de98029e)
...
Thanks @johannesStoye
2016-08-14 16:29:39 +02:00
Alexis Green
5147ec6959
CHG: LEGIC - allow offline mode due to existing offline command
2016-08-02 13:51:58 -07:00
iceman1001
7bcddfabde
FIX: mental note to self, don't forget to adjust messages to new logic
2016-04-27 20:03:54 +02:00
iceman1001
a644fef0bb
FIX: Mental note to self, bitnumber 4 is used, not the value 4 which would be bitnumber 3... when deciding if request is REQB or WUPB
2016-04-27 19:54:29 +02:00
iceman1001
c98ab35140
textual change.
2016-04-26 21:30:04 +02:00
iceman1001
b9e66427b7
Forgot some breaks, and a faulty comparision of a set bit.
2016-03-23 14:03:41 +01:00
iceman1001
774560e39e
CHG: no parity tests for ISO_7816_4 annotation
2016-03-21 22:07:55 +01:00
iceman1001
e3f9c50d81
ADD: changed the annotation for 14b, it now shows WUPB/REQB and number of slots we used.
2016-03-20 19:24:14 +01:00
iceman1001
1f3d5401a6
FIX: adding a silent mode for Topaz detection.
...
FIX: adding a silent mode for 14B detection.
2016-03-06 13:21:42 +01:00
iceman1001
3607b5a96a
ADD: Added the autodetection of Topaz to "HF SEARCH"
...
FIX: Fixed a minor bug in "HF SEARCH" where it always found a "14b" tag, making the command never test for other formats afterward the 14b test.
The 14b detection is not good still, conflicting return values is main reason for this bug
2016-03-06 12:40:04 +01:00
iceman1001
38e4191705
CHG; a fix for "HF TUNE", I always were annoyed with the hf tune where it printed one value per row endlessly. So this fixes that, it uses "\r" to print on the same row. Works on MINGW/WINDOWS. Havn'nt tested it on Linux yet. But it looks good now.
2016-03-06 10:35:25 +01:00
iceman1001
4c36581b96
CHG: clearCommandBuffer(); before calling cmdparser.
2016-02-14 15:24:11 +01:00
iceman1001
afa86e5c03
ADD: help text for 'hf snoop' / 'hf search' / 'hf list'
...
CHG: minor code changes.
CHG: makefile , moved hi_sniffer.v from LF into HF row. @piwi suggestion for PR https://github.com/Proxmark/proxmark3/pull/141
2015-11-01 19:49:08 +01:00
iceman1001
1d0ccbe04b
ADD: added the "hf snoop" patch original from @Enio, rearranged by @Etmatrix.
...
ADD: added the "t55x7" refactoring by @marshmellow42
2015-10-27 21:47:21 +01:00
iceman1001
0de8e3874d
A lot of changes...
...
.. ntag simulation stuff from @marshmellows branch "ntag/sim"
.. hf mf mifare fixes from @pwpivi.
.. hw status command
.. speedtest function from @pwpivi
.. Viking Functionalities, (not a proper DEMOD, but a start)
.. GetCountUS better precision from @pwpivi
.. bin2hex, hex2bin from @holiman
...
starting with getting the T55x7 CONFIGURATION_BLOCK for different clone situations. Ripped from Adam Lauries RFidler, nothing working or finished..
...
Started working with the T55x7 read command with password actually performs a write block... See Issue #136 https://github.com/Proxmark/proxmark3/issues/136 Not solved yet.
...
Started add SHA256.. not working yet..
2015-10-04 18:01:33 +02:00
iceman1001
f445df401e
ADD: started with adding a "LS" command that lists the commands without the help text printed. To give easy clean list.
2015-07-22 11:19:15 +02:00
iceman1001
5b59bf20c7
FIX: "hf list 7816", the s-blocks is now also printed.
...
FIX: iso14443b.c got some minor adjustments in the demod and codeas14443btag. Seems it works better for me.
I still have the problem with powerup of a 14b tag. I need to run the "14b raw -c -p 05 00 08" a couple of times before I get an answer.
2015-07-19 23:24:19 +02:00
iceman1001
db25599d7f
ADD: @holiman's clearCommandBuffer in cmdlft55xx.c
...
ADD: @VERTCraig's AVID commands.
TEST: testing some changes to iso14443 demod.
2015-07-18 20:43:14 +02:00
iceman1001
c5f8c67ab4
ADD: ISO7816-4 annotation in "hf list".
...
Only basic 7816 command apdu supported. USAGE::"hf list 7816"
2015-07-17 21:56:00 +02:00
iceman1001
9783989b40
ADD: pwpiwi 's FPGA compress
2015-06-25 12:22:34 +02:00
iceman1001
22e2470051
ADD: @marshmellow42 fudan detection in hf mfu
...
ADD: @marshmellow42 14b reader changes.
ADD: @pwpiwi 14b fixes
2015-06-21 11:07:05 +02:00
iceman1001
bcf61bd34a
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
README.txt
armsrc/appmain.c
armsrc/apps.h
armsrc/des.c
armsrc/iclass.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
client/cmddata.c
client/cmdhf.c
client/cmdhf14a.c
client/cmdhficlass.c
client/cmdhfmfu.c
client/cmdhfmfu.h
client/cmdscript.c
client/lualibs/commands.lua
client/lualibs/html_dumplib.lua
client/scripting.c
client/util.c
common/protocols.h
include/usb_cmd.h
2015-05-23 08:16:40 +02:00
iceman1001
63146229bd
ADD: preparation for @marshmellow42 "hf search"
...
FIX: the "hf list" had not correct spaces between the lines, in my version. Fix now.
2015-05-13 09:10:47 +02:00
marshmellow42
a2e2bb8a15
hf mfu info - ICEMANS updates
...
plus slight change to UL_EV1 auth annotation.
2015-05-12 18:16:55 -04:00
marshmellow42
6ce0e5386a
HF Search - refactoring cmds to work with it
2015-05-12 16:45:48 -04:00
iceman1001
e9a85114c5
ADD: Print the key for ULEV1/NTAG authentication if sent in cmdhf.c "HF LIST 14A"
2015-05-12 20:27:45 +02:00
iceman1001
b6901e17c8
FIX: increased the limit to 0xE6 for MIFARE_ULEV1_FASTREAD
...
ADD: @marshmellows inital "hf search" command...
2015-05-12 18:57:47 +02:00
marshmellow42
8ceb6b03e5
hf search - prelim - re-use hf mfu GetTagType...
...
in hf 14a reader to identify UL(+)
still a work in progress.
2015-05-12 00:19:44 -04:00
marshmellow42
c585a5cf0b
further MFU info updates (mainly icemans)
2015-05-06 22:15:41 -04: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
iceman1001
74c7ff4770
CHG: @marshmellows changes to anntations.
2015-05-06 14:20:24 +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
f07e76c687
CHG: minor spelling
2015-05-05 00:27:34 +02: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
11b1e2e506
ADD: "HF 14A READ", got ULTRALIGHT C / EV1 annotation
2015-04-26 18:03:21 +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
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
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
Martin Holst Swende
27eabcdccb
Added brackets around crc field in protocol listings
2015-03-02 21:05:44 +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
8b9393d3bd
fixed issue #65
2015-02-12 08:21:58 +01:00
Martin Holst Swende
7d5ebac993
Merge branch 'master' into GenericTracing
...
Conflicts:
armsrc/iso14443.c
armsrc/iso14443a.c
client/cmdhf.c
client/cmdhf14b.c
2015-02-06 08:41:02 +01:00
Martin Holst Swende
92623113b4
Minor documentation on 'hf list'
2015-01-29 20:01:30 +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
383608a63a
Minor fixes to iso14443a annotations
2015-01-27 21:55:08 +01:00
Martin Holst Swende
08e8317c21
More annotations to iso14443b protocol listings
2015-01-27 16:34:45 +01:00